JBoss Rich Faces SVN: r7088 - in trunk/samples: richfaces-demo and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-03-22 12:13:49 -0400 (Sat, 22 Mar 2008)
New Revision: 7088
Modified:
trunk/samples/pom.xml
trunk/samples/richfaces-demo/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-2415
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-03-22 15:06:58 UTC (rev 7087)
+++ trunk/samples/pom.xml 2008-03-22 16:13:49 UTC (rev 7088)
@@ -70,11 +70,6 @@
<version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.14</version>
@@ -380,21 +375,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces}</version>
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2008-03-22 15:06:58 UTC (rev 7087)
+++ trunk/samples/richfaces-demo/pom.xml 2008-03-22 16:13:49 UTC (rev 7088)
@@ -187,12 +187,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.1</version>
16 years, 9 months
JBoss Rich Faces SVN: r7087 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits@lists.jboss.org
Author: vsukhov
Date: 2008-03-22 11:06:58 -0400 (Sat, 22 Mar 2008)
New Revision: 7087
Modified:
trunk/docs/userguide/en/src/main/resources/images/comboBox3.png
trunk/docs/userguide/en/src/main/resources/images/comboBox4.png
Log:
http://jira.jboss.com/jira/browse/RF-1216 updated screenshots for selectfirstonupdate and directinputsuggestions attributes
Modified: trunk/docs/userguide/en/src/main/resources/images/comboBox3.png
===================================================================
(Binary files differ)
Modified: trunk/docs/userguide/en/src/main/resources/images/comboBox4.png
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r7086 - in trunk: docs/userguide/en/src/main/resources/images and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: vsukhov
Date: 2008-03-22 11:05:02 -0400 (Sat, 22 Mar 2008)
New Revision: 7086
Added:
trunk/docs/userguide/en/src/main/resources/images/fileUpload11.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
Log:
http://jira.jboss.com/jira/browse/RF-1207 I've added some information about form encoding Table with attributes corrected
Modified: trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2008-03-21 18:50:32 UTC (rev 7085)
+++ trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2008-03-22 15:05:02 UTC (rev 7086)
@@ -126,7 +126,7 @@
<para>As it could be seen in the example above, only files with "html" extension are accepted to upload.</para>
<para>The <emphasis>
- <property> "autoclear"</property></emphasis> attribute is used to remove automatically files from list after upload completed.</para>
+ <property> "autoclear"</property></emphasis> attribute is used to remove automatically files from the list after upload completed.</para>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -135,10 +135,10 @@
<rich:fileUpload uploadData="#{bean.data}" addControlLabel="myLabel" autoclear="true"
acceptedTypes="html"/>
...]]></programlisting>
- <para>As it could be seen in the example above, files removes from list after upload completed.</para>
+ <para>As it could be seen in the example above, files are removed from the list after upload completed.</para>
<para>The <emphasis>
<property> "maxFilesQuantity"</property></emphasis> defines max number of files allowed for upload.
- After number of files in the list is equals to this attribute – add button is disabled.
+ After a number of files in the list equals to this attribute – add button is disabled.
The add button is not available until all list items are uploaded.
</para>
<para>
@@ -175,7 +175,7 @@
...]]></programlisting>
<para>The <emphasis>
<property> "immediateUpload"</property></emphasis> attribute allows files to be uploaded immediately after they have been added into list.
- If you set this attribute to true files immediately uploads after they have been added into list, all next files automatically uploads one by one.
+ If you set this attribute to true files immediately uploads after they have been added into the list, all next files automatically uploads one by one.
If you cancel uploading – next files aren't start uploading till you press the general upload button or clear the list.
</para>
@@ -186,6 +186,39 @@
<rich:fileUpload uploadData="#{bean.data}" addControlLabel="myLabel" autoclear="true" maxFilesQuantity="2" fileUploadListener="#{bean.listener}"
acceptedTypes="html" immediateUpload="true"/>
...]]></programlisting>
+ <para>In order to encode form around <emphasis role="bold">
+ <property><rich:fileUpload></property>
+ </emphasis> component you could confine this area by <emphasis role="bold">
+ <property><h:form></property>
+ </emphasis>/<emphasis role="bold">
+ <property></h:form></property></emphasis> tags.
+ </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<h:form>
+ <rich:fileUpload uploadData="#{bean.data}" addControlLabel="myLabel" autoclear="true" maxFilesQuantity="2" fileUploadListener="#{bean.listener}"
+ acceptedTypes="html" immediateUpload="true"/>
+ <a4j:commandLink style="font-weight: bold; width: 200px;" value="Show files uploaded:" reRender="files_list">
+ <h:dataTable value="#{bean.fileList}" var="file" id="files_list" style="width: 500px">
+ <h:column>
+ <h:outputText value="#{file.fileName}"></h:outputText>
+ </h:column>
+ </h:dataTable>
+</h:form>
+...]]></programlisting>
+ <para>This is a result:</para>
+ <figure>
+ <title><emphasis role="bold">
+ <property><rich:fileUpload></property>
+ </emphasis>at server-side</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/fileUpload11.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<para>The <emphasis role="bold">
<property><rich:fileUpload></property>
</emphasis> provides using a number of handlers. The <emphasis>
@@ -194,7 +227,7 @@
<property> "onuploadcanceled"</property></emphasis> is called after upload was canceled via cancel control. The <emphasis>
<property> "onerror"</property></emphasis> is called if the file upload was interrupted according to any errors.</para>
<para>
- There are a number of facets providing for this component:
+ There is a number of facets providing for this component:
<emphasis>
<property> "header"</property></emphasis>
@@ -208,8 +241,7 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<rich:fileUpload uploadData="#{bean.data}" addControlLabel="myLabel" autoclear="true" maxFilesQuantity="2" fileUploadListener="#{bean.listener}"
- acceptedTypes="html">
+<rich:fileUpload uploadData="#{bean.data}" addControlLabel="myLabel" autoclear="true" maxFilesQuantity="2" fileUploadListener="#{bean.listener}">
<f:facet name="label">
<h:outputText value="{_KB}KB from {KB}KB uploaded --- {mm}:{ss}"></h:outputText>
</f:facet>
@@ -760,7 +792,7 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="CSS"><![CDATA[...
-..upload_list_decor{
+.upload_list_decor{
background-color:#ecf4fe;
}
...]]></programlisting>
Added: trunk/docs/userguide/en/src/main/resources/images/fileUpload11.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/fileUpload11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-21 18:50:32 UTC (rev 7085)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-22 15:05:02 UTC (rev 7086)
@@ -242,17 +242,17 @@
<property>
<name>addControlLabel</name>
<classname>java.lang.String</classname>
- <description>Defines a label for an add control</description>
+ <description>Defines a label for an add button</description>
</property>
<property>
<name>uploadControlLabel</name>
<classname>java.lang.String</classname>
- <description>Defines a label for an upload control</description>
+ <description>Defines a label for an upload button</description>
</property>
<property>
<name>stopControlLabel</name>
<classname>java.lang.String</classname>
- <description>Defines a label for a stop control</description>
+ <description>Defines a label for a stop button</description>
</property>
<property>
<name>cancelEntryControlLabel</name>
@@ -267,7 +267,7 @@
<property>
<name>clearAllControlLabel</name>
<classname>java.lang.String</classname>
- <description>Defines a label for a clearAll control</description>
+ <description>Defines a label for a clearAll button</description>
</property>
<property>
<name>stopEntryControlLabel</name>
16 years, 9 months
JBoss Rich Faces SVN: r7085 - in trunk/test-applications/facelets/src/main: java/rich and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ayanul
Date: 2008-03-21 14:50:32 -0400 (Fri, 21 Mar 2008)
New Revision: 7085
Added:
trunk/test-applications/facelets/src/main/java/skinning/
trunk/test-applications/facelets/src/main/java/skinning/Skinning.java
trunk/test-applications/facelets/src/main/webapp/Skinning/
trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skinning.xml
Modified:
trunk/test-applications/facelets/src/main/java/rich/RichBean.java
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml
Log:
+add skinning
Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-03-21 18:41:08 UTC (rev 7084)
+++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-03-21 18:50:32 UTC (rev 7085)
@@ -69,6 +69,7 @@
map.add("FileUpload", add("/FileUpload/FileUpload", new boolean [] {false, false, false}));
map.add("InplaceSelect", add("/InplaceSelect/InplaceSelect", new boolean [] {false, false, false}));
map.add("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, false, false}));
+ map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false}));
Iterator<String> iterator = map.getSet().iterator();
while(iterator.hasNext()){
list.add(new SelectItem(iterator.next()));
Added: trunk/test-applications/facelets/src/main/java/skinning/Skinning.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/skinning/Skinning.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/skinning/Skinning.java 2008-03-21 18:50:32 UTC (rev 7085)
@@ -0,0 +1,211 @@
+package skinning;
+
+public class Skinning {
+ private String selectSkinning;
+ private String skinning;
+ private String skinningClass;
+ private String commandButton;
+ private String commandLink;
+ private String dataTable;
+ private String inputSecret;
+ private String inputText;
+ private String inputTextarea;
+ private String outputLink;
+ private String outputText;
+ private String panelGrid;
+ private String selectBooleanCheckbox;
+ private String selectManyCheckbox;
+ private String selectManyListBox;
+ private String selectManyMenu;
+ private String selectOneListbox;
+ private String selectOneMenu;
+ private String selectOneRadio;
+
+ public Skinning() {
+ commandButton = "rich-button";
+ commandLink = "rich-link";
+ dataTable = "rich-isindex";
+ inputSecret = "rich-button";
+ inputText = "rich-input";
+ inputTextarea = "rich-textarea";
+ commandLink = "rich-link";
+ outputLink = "rich-link";
+ outputText = "rich-legend";
+ panelGrid = "rich-fieldset";
+ selectBooleanCheckbox = "rich-select";
+ selectManyCheckbox = "rich-select";
+ selectManyListBox = "rich-select";
+ selectManyMenu = "rich-select";
+ selectOneListbox = "rich-select";
+ selectOneMenu = "rich-select";
+ selectOneRadio = "rich-select";
+ skinning = "disable";
+ skinningClass = "disable";
+ selectSkinning = "none";
+ }
+
+ public String getCommandButton() {
+ return commandButton;
+ }
+
+ public void setCommandButton(String commandButton) {
+ this.commandButton = commandButton;
+ }
+
+ public String getCommandLink() {
+ return commandLink;
+ }
+
+ public void setOmmandLink(String commandLink) {
+ this.commandLink = commandLink;
+ }
+
+ public String getDataTable() {
+ return dataTable;
+ }
+
+ public void setDataTable(String dataTable) {
+ this.dataTable = dataTable;
+ }
+
+ public String getInputSecret() {
+ return inputSecret;
+ }
+
+ public void setInputSecret(String inputSecret) {
+ this.inputSecret = inputSecret;
+ }
+
+ public String getInputText() {
+ return inputText;
+ }
+
+ public void setInputText(String inputText) {
+ this.inputText = inputText;
+ }
+
+ public String getInputTextarea() {
+ return inputTextarea;
+ }
+
+ public void setInputTextarea(String inputTextarea) {
+ this.inputTextarea = inputTextarea;
+ }
+
+ public String getOutputLink() {
+ return outputLink;
+ }
+
+ public void setOutputLink(String outputLink) {
+ this.outputLink = outputLink;
+ }
+
+ public String getOutputText() {
+ return outputText;
+ }
+
+ public void setOutputText(String outputText) {
+ this.outputText = outputText;
+ }
+
+ public String getPanelGrid() {
+ return panelGrid;
+ }
+
+ public void setPanelGrid(String panelGrid) {
+ this.panelGrid = panelGrid;
+ }
+
+ public String getSelectBooleanCheckbox() {
+ return selectBooleanCheckbox;
+ }
+
+ public void setSelectBooleanCheckbox(String selectBooleanCheckbox) {
+ this.selectBooleanCheckbox = selectBooleanCheckbox;
+ }
+
+ public String getSelectManyListBox() {
+ return selectManyListBox;
+ }
+
+ public void setSelectManyListBox(String selectManyListBox) {
+ this.selectManyListBox = selectManyListBox;
+ }
+
+ public String getSelectManyMenu() {
+ return selectManyMenu;
+ }
+
+ public void setSelectManyMenu(String selectManyMenu) {
+ this.selectManyMenu = selectManyMenu;
+ }
+
+ public String getSelectOneListbox() {
+ return selectOneListbox;
+ }
+
+ public void setSelectOneListbox(String selectOneListbox) {
+ this.selectOneListbox = selectOneListbox;
+ }
+
+ public String getSelectOneMenu() {
+ return selectOneMenu;
+ }
+
+ public void setSelectOneMenu(String selectOneMenu) {
+ this.selectOneMenu = selectOneMenu;
+ }
+
+ public String getSelectOneRadio() {
+ return selectOneRadio;
+ }
+
+ public void setSelectOneRadio(String selectOneRadio) {
+ this.selectOneRadio = selectOneRadio;
+ }
+
+ public String getSelectManyCheckbox() {
+ return selectManyCheckbox;
+ }
+
+ public void setSelectManyCheckbox(String selectManyCheckbox) {
+ this.selectManyCheckbox = selectManyCheckbox;
+ }
+
+ public void setCommandLink(String commandLink) {
+ this.commandLink = commandLink;
+ }
+
+ public String getSelectSkinning() {
+ return selectSkinning;
+ }
+
+ public String getSkinning() {
+ return skinning;
+ }
+
+ public void setSkinning(String skinning) {
+ this.skinning = skinning;
+ }
+
+ public String getSkinningClass() {
+ return skinningClass;
+ }
+
+ public void setSkinningClass(String skinningClass) {
+ this.skinningClass = skinningClass;
+ }
+
+ public void setSelectSkinning(String selectSkinning) {
+ if (selectSkinning.equals("SKINNING")) {
+ setSkinning("enable");
+ } else if (selectSkinning.equals("SKINNING_CLASSES")) {
+ setSkinning("disable");
+ setSkinningClass("enable");
+ } else {
+ setSkinning("disable");
+ setSkinningClass("disable");
+ }
+ this.selectSkinning = selectSkinning;
+ }
+}
Added: trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml 2008-03-21 18:50:32 UTC (rev 7085)
@@ -0,0 +1,116 @@
+<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="skinningSubviewID">
+ <h:panelGrid columns="2" border="2" >
+ <h:outputText value="styleClass"></h:outputText>
+ <h:outputText value="components"></h:outputText>
+
+ <h:panelGroup>
+ <h:outputText value="commandButton "></h:outputText>
+ <h:inputText value="#{skinning.commandButton}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:commandButton value="commandButton"
+ styleClass="#{skinning.commandButton}"></h:commandButton>
+
+ <h:panelGroup>
+ <h:outputText value="commandLink "></h:outputText>
+ <h:inputText value="#{skinning.commandLink}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:commandLink value="commandLink"
+ styleClass="#{skinning.commandLink}"></h:commandLink>
+
+ <h:panelGroup>
+ <h:outputText value="inputSecret "></h:outputText>
+ <h:inputText value="#{skinning.inputSecret}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:inputSecret value="secret" styleClass="#{skinning.inputSecret}"></h:inputSecret>
+
+ <h:panelGroup>
+ <h:outputText value="inputText "></h:outputText>
+ <h:inputText value="#{skinning.inputText}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:inputText value="inputText" styleClass="#{skinning.inputText}"></h:inputText>
+
+ <h:panelGroup>
+ <h:outputText value="inputTextarea "></h:outputText>
+ <h:inputText value="#{skinning.inputTextarea}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:inputTextarea rows="4" cols="5" value="inputTextarea"
+ styleClass="#{skinning.inputTextarea}"></h:inputTextarea>
+
+ <h:panelGroup>
+ <h:outputText value="outputLink "></h:outputText>
+ <h:inputText value="#{skinning.outputLink}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:outputLink styleClass="#{skinning.outputLink}"></h:outputLink>
+
+ <h:panelGroup>
+ <h:outputText value="outputText "></h:outputText>
+ <h:inputText value="#{skinning.outputText}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:outputText value="outputText" styleClass="#{skinning.outputText}"></h:outputText>
+
+ <h:panelGroup>
+ <h:outputText value="panelGrid "></h:outputText>
+ <h:inputText value="#{skinning.outputText}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:panelGrid columns="1" styleClass="#{skinning.outputText}">
+ <h:panelGroup>
+ <h:outputText value="panelGrid"></h:outputText>
+ </h:panelGroup>
+ </h:panelGrid>
+
+ <h:panelGroup>
+ <h:outputText value="selectBooleanCheckbox "></h:outputText>
+ <h:inputText value="#{skinning.selectBooleanCheckbox}"
+ onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:selectBooleanCheckbox value="true"
+ styleClass="#{skinning.selectBooleanCheckbox}"></h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="false"
+ styleClass="#{skinning.selectBooleanCheckbox}"></h:selectBooleanCheckbox>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText value="selectManyCheckbox "></h:outputText>
+ <h:inputText value="#{skinning.selectManyCheckbox}"
+ onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}">
+ <f:selectItems value="#{combobox.selectItem}" />
+ </h:selectManyCheckbox>
+
+ <h:panelGroup>
+ <h:outputText value="selectManyMenu "></h:outputText>
+ <h:inputText value="#{skinning.selectManyMenu}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:selectManyMenu styleClass="#{skinning.selectManyMenu}">
+ <f:selectItems value="#{combobox.selectItem}" />
+ </h:selectManyMenu>
+
+ <h:panelGroup>
+ <h:outputText value="selectOneListbox "></h:outputText>
+ <h:inputText value="#{skinning.selectOneListbox}"
+ onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:selectOneListbox styleClass="#{skinning.selectOneListbox}">
+ <f:selectItems value="#{combobox.selectItem}" />
+ </h:selectOneListbox>
+
+ <h:panelGroup>
+ <h:outputText value="selectOneMenu "></h:outputText>
+ <h:inputText value="#{skinning.selectOneMenu}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:selectOneMenu styleClass="#{skinning.selectOneMenu}">
+ <f:selectItems value="#{combobox.selectItem}" />
+ </h:selectOneMenu>
+
+ <h:panelGroup>
+ <h:outputText value="selectOneRadio"></h:outputText>
+ <h:inputText value="#{skinning.selectOneRadio}" onchange="submit();"></h:inputText>
+ </h:panelGroup>
+ <h:selectOneRadio styleClass="#{skinning.selectOneRadio}">
+ <f:selectItems value="#{combobox.selectItem}" />
+ </h:selectOneRadio>
+
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skinning.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skinning.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Skinning.xml 2008-03-21 18:50:32 UTC (rev 7085)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>skinning</managed-bean-name>
+ <managed-bean-class>skinning.Skinning</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-03-21 18:41:08 UTC (rev 7084)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-03-21 18:50:32 UTC (rev 7085)
@@ -7,7 +7,15 @@
<param-name>org.ajax4jsf.SKIN</param-name>
<param-value>#{skinBean.skin}</param-value>
</context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
+ <param-value>#{skinning.skinningClass}</param-value>
+ </context-param>
<context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>#{skinning.skinning}</param-value>
+ </context-param>
+ <context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
@@ -33,7 +41,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,!
/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,!
/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-03-21 18:41:08 UTC (rev 7084)
+++ trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2008-03-21 18:50:32 UTC (rev 7085)
@@ -32,6 +32,11 @@
<h:selectOneMenu binding="#{skinBean.component}" onblur="submit();">
<a4j:support action="#{skinBean.change}" event="onchange" />
</h:selectOneMenu>
+ <h:selectOneMenu value="#{skinning.selectSkinning}" onblur="submit();">
+ <f:selectItem itemLabel="none" itemValue="none"/>
+ <f:selectItem itemLabel="skinning" itemValue="SKINNING"/>
+ <f:selectItem itemLabel="skinningClass" itemValue="SKINNING_CLASSES"/>
+ </h:selectOneMenu>
</h:panelGrid>
<h:panelGrid columns="1">
16 years, 9 months
JBoss Rich Faces SVN: r7084 - trunk/framework/test/src/main/java/org/ajax4jsf/tests.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-03-21 14:41:08 -0400 (Fri, 21 Mar 2008)
New Revision: 7084
Modified:
trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
Log:
Missing initialization parameter causing JSF RI failed with NPE has been added
Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
===================================================================
--- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-03-21 18:20:16 UTC (rev 7083)
+++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-03-21 18:41:08 UTC (rev 7084)
@@ -55,7 +55,6 @@
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser;
-import org.ajax4jsf.webapp.ConfigurableXMLFilter;
import org.ajax4jsf.webapp.WebXml;
import org.apache.shale.test.base.AbstractJsfTestCase;
import org.apache.shale.test.mock.MockApplication;
@@ -132,6 +131,7 @@
// Setup FacesContext with necessary init parameters.
this.servletContext.addInitParameter(SkinFactory.SKIN_PARAMETER, getSkinName());
+ this.servletContext.addInitParameter("com.sun.faces.externalizeJavaScript", "true");
// setup VCP renderKit, create renderers.
@@ -220,9 +220,6 @@
facesContext.setExternalContext(externalContext);
elContext = facesContext.getELContext();
expressionFactory = application.getExpressionFactory();
-
-
-
}
protected WebClient createWebClient() {
16 years, 9 months
JBoss Rich Faces SVN: r7083 - trunk/samples/richfaces-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2008-03-21 14:20:16 -0400 (Fri, 21 Mar 2008)
New Revision: 7083
Modified:
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
Log:
fix paint2d sample
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-03-21 18:08:52 UTC (rev 7082)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-03-21 18:20:16 UTC (rev 7083)
@@ -154,7 +154,7 @@
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>color</property-name>
- <property-class>int</property-class>
+ <property-class>long</property-class>
<value>1000</value>
</managed-property>
<managed-property>
16 years, 9 months
JBoss Rich Faces SVN: r7082 - trunk/ui/combobox/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: vsukhov
Date: 2008-03-21 14:08:52 -0400 (Fri, 21 Mar 2008)
New Revision: 7082
Modified:
trunk/ui/combobox/src/main/config/component/combobox.xml
Log:
http://jira.jboss.com/jira/browse/RF-1216 I've corrected the decription of attributes
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-03-21 18:08:17 UTC (rev 7081)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-03-21 18:08:52 UTC (rev 7082)
@@ -32,64 +32,60 @@
<property>
<name>suggestionValues</name>
<classname>java.lang.Object</classname>
+ <description>Defines the suggestion collection</description>
</property>
<property>
<name>enableManualInput</name>
<classname>boolean</classname>
- <description>enabled for keybord input</description>
+ <description>enabled for keybord input, if "false" keybord input will be locked</description>
<defaultvalue>true</defaultvalue>
</property>
<property>
<name>filterNewValues</name>
<classname>java.lang.Boolean</classname>
- <description></description>
+ <description>Defines the appearance of values in the list</description>
<defaultvalue>true</defaultvalue>
</property>
<property>
<name>directInputSuggestions</name>
<classname>java.lang.Boolean</classname>
- <description>not implemented</description>
+ <description>Defines the first value from the suggested in input field</description>
<defaultvalue>false</defaultvalue>
</property>
<property>
<name>selectFirstOnUpdate</name>
<classname>java.lang.Boolean</classname>
- <description></description>
+ <description>Defines if the first value from suggested is selected in popup list</description>
<defaultvalue>true</defaultvalue>
</property>
<property>
<name>showDelay</name>
<classname>java.lang.Integer</classname>
- <description></description>
+ <description>Delay between event and popup list showing</description>
<defaultvalue><![CDATA[0]]></defaultvalue>
</property>
<property>
<name>hideDelay</name>
<classname>java.lang.Integer</classname>
- <description></description>
+ <description>Delay between losing focus and popup list closing</description>
<defaultvalue><![CDATA[0]]></defaultvalue>
</property>
<property>
<name>width</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Width of the component</description>
<defaultvalue><![CDATA["150"]]></defaultvalue>
</property>
+
<property>
- <name>width</name>
- <classname>java.lang.String</classname>
- <description></description>
- <defaultvalue><![CDATA["150"]]></defaultvalue>
- </property>
- <property>
<name>listWidth</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Defines width of file popup list</description>
</property>
<property>
<name>listHeight</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Defines height of file popup list</description>
<defaultvalue>"200px"</defaultvalue>
</property>
<property>
@@ -101,7 +97,7 @@
<property>
<name>onlistcall</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>A JavaScript event handler called on a list call operation</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
@@ -119,118 +115,118 @@
<property>
<name>buttonIcon</name>
<classname>java.lang.String</classname>
- <description>URI</description>
+ <description>Defines icon for the button element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>buttonIconDisabled</name>
<classname>java.lang.String</classname>
- <description>URI</description>
+ <description>Defines disabled icon for the button element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>buttonIconInactive</name>
<classname>java.lang.String</classname>
- <description>URI</description>
+ <description>Defines inactive icon for the button element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>defaultLabel</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Defines default label for the input field element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>listStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to popup list</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>listClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the popup list</description>
</property>
<property>
<name>inputStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to input field</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>inputClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the input field</description>
</property>
<property>
<name>inputDisabledStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to disabled input</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>inputDisabledClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the disabled input</description>
</property>
<property>
<name>inputInactiveStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to inactive input</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>inputInactiveClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the inactive input</description>
</property>
<property>
<name>itemClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the items</description>
</property>
<property>
<name>itemSelectedClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the selected item</description>
</property>
<property>
<name>buttonStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to button</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>buttonClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the button</description>
</property>
<property>
<name>buttonDisabledStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to disabled button</description>
</property>
<property>
<name>buttonDisabledClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the disabled button</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>buttonInactiveStyle</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style rules to be applied to inactive button</description>
</property>
<property>
<name>buttonInactiveClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Style Class attribute for the inactive button</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>style</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>CSS style(s) is/are to be applied when this component is rendered</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property hidden="true">
@@ -240,9 +236,40 @@
<property>
<name>styleClass</name>
<classname>java.lang.String</classname>
- <description></description>
+ <description>Corresponds to the HTML class attribute</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
+ </property>
+ <property>
+ <name>converterMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the converter message,
+ replacing any message that comes from the converter
+ </description>
+ </property>
+ <property>
+ <name>requiredMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the validation message for
+ the "required" facility, if the "required" facility is
+ used
+ </description>
+ </property>
+ <property>
+ <name>validatorMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the validator message,
+ replacing any message that comes from the validator
+ </description>
+ </property>
+
+
+
&html_input_attributes;
&html_input_events;
16 years, 9 months
JBoss Rich Faces SVN: r7081 - trunk/ui/componentControl/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-21 14:08:17 -0400 (Fri, 21 Mar 2008)
New Revision: 7081
Modified:
trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
Log:
changed everything to JSF 1.2
Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
===================================================================
--- trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 17:58:37 UTC (rev 7080)
+++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 18:08:17 UTC (rev 7081)
@@ -95,7 +95,7 @@
ScriptUtils.addEncodedString(result, name);
result.append(": ");
- result.append(ScriptUtils.toScript(escape ? value : new JSFunction("Richfaces.delayedEval", value)));
+ result.append(ScriptUtils.toScript(escape ? value : new JSReference(value.toString())));
shouldClose = true;
}
16 years, 9 months
JBoss Rich Faces SVN: r7080 - trunk/ui/componentControl/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-21 13:58:37 -0400 (Fri, 21 Mar 2008)
New Revision: 7080
Modified:
trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
Log:
Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
===================================================================
--- trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 17:50:52 UTC (rev 7079)
+++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 17:58:37 UTC (rev 7080)
@@ -6,15 +6,15 @@
import java.util.Iterator;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import org.ajax4jsf.Messages;
import org.ajax4jsf.component.AjaxSupport;
-import org.ajax4jsf.component.EventValueBinding;
+import org.ajax4jsf.component.EventValueExpression;
import org.ajax4jsf.component.JavaScriptParameter;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSReference;
@@ -95,7 +95,7 @@
ScriptUtils.addEncodedString(result, name);
result.append(": ");
- result.append(ScriptUtils.toScript(escape ? value : new JSReference(value.toString())));
+ result.append(ScriptUtils.toScript(escape ? value : new JSFunction("Richfaces.delayedEval", value)));
shouldClose = true;
}
@@ -103,7 +103,7 @@
return result.toString();
}
-
+
public abstract String getEvent();
public abstract void setEvent(String event);
@@ -158,12 +158,12 @@
if (event != null && event.length() != 0) {
if (attachTo == null || attachTo.length() == 0) {
- parent.setValueBinding(event, new EventValueBinding(this));
+ parent.setValueExpression(event, new EventValueExpression(this));
} else {
- ValueBinding vb = parent.getValueBinding(event);
- if (vb instanceof EventValueBinding) {
+ ValueExpression vb = parent.getValueExpression(event);
+ if (vb instanceof EventValueExpression) {
//TODO check if that's EventValueBinding for us
- parent.setValueBinding(event, null);
+ parent.setValueExpression(event, null);
}
}
}
16 years, 9 months
JBoss Rich Faces SVN: r7079 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-03-21 13:50:52 -0400 (Fri, 21 Mar 2008)
New Revision: 7079
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
http://jira.jboss.com/jira/browse/RF-1360
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-03-21 17:49:12 UTC (rev 7078)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-03-21 17:50:52 UTC (rev 7079)
@@ -250,6 +250,7 @@
// if content not
// supported by tidy.
String contentType = servletResponseWrapper.getContentType();
+ String contentTypeCharset = contentType;
if (log.isDebugEnabled()) {
log.debug("create HTML/XML parser for content type: "
+ contentType);
@@ -257,13 +258,12 @@
// if(contentType == null){
// contentType = request.getContentType();
// }
- if (contentType != null) {
- if (contentType.indexOf("charset") < 0
+ if (contentTypeCharset != null) {
+ if (contentTypeCharset.indexOf("charset") < 0
&& null != characterEncoding) {
- contentType += ";charset=" + characterEncoding;
+ contentTypeCharset += ";charset=" + characterEncoding;
}
- parser = getParser(contentType, false, viewId);
- response.setContentType(contentType);
+ parser = getParser(contentTypeCharset, false, viewId);
}
// null or unsupported content type
if (null == parser) {
@@ -273,10 +273,18 @@
}
try {
if (servletResponseWrapper.isUseWriter()) {
+ if (contentTypeCharset != null) {
+ response.setContentType(contentTypeCharset);
+ }
+
output = createResponseWriter(response,
characterEncoding);
servletResponseWrapper.sendContent(output);
} else if (servletResponseWrapper.isUseStream()) {
+ if (contentType != null) {
+ response.setContentType(contentType);
+ }
+
ServletOutputStream out = response.getOutputStream();
servletResponseWrapper.sendContent(out);
}
@@ -285,6 +293,11 @@
}
return;
}
+
+ if (contentTypeCharset != null) {
+ response.setContentType(contentTypeCharset);
+ }
+
output = createResponseWriter(response, characterEncoding);
parser.setInputEncoding(characterEncoding);
16 years, 9 months