JBoss Rich Faces SVN: r9693 - trunk/ui/pickList/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-07-18 12:19:42 -0400 (Fri, 18 Jul 2008)
New Revision: 9693
Modified:
trunk/ui/pickList/src/main/templates/htmlPickList.jspx
Log:
RF-3897
Modified: trunk/ui/pickList/src/main/templates/htmlPickList.jspx
===================================================================
--- trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-07-18 16:12:06 UTC (rev 9692)
+++ trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-07-18 16:19:42 UTC (rev 9693)
@@ -16,6 +16,7 @@
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
+ /org/richfaces/renderkit/html/scripts/utils.js,
scripts/ShuttleUtils.js
scripts/SelectItem.js,
scripts/PickListSI.js,
16 years, 2 months
JBoss Rich Faces SVN: r9692 - trunk/docs/cdkguide/en/src/main/docbook.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-07-18 12:12:06 -0400 (Fri, 18 Jul 2008)
New Revision: 9692
Modified:
trunk/docs/cdkguide/en/src/main/docbook/master.xml
Log:
'Renderer' section was added
Modified: trunk/docs/cdkguide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/cdkguide/en/src/main/docbook/master.xml 2008-07-18 15:40:23 UTC (rev 9691)
+++ trunk/docs/cdkguide/en/src/main/docbook/master.xml 2008-07-18 16:12:06 UTC (rev 9692)
@@ -84,13 +84,19 @@
<keyword>renderer</keyword>
<keyword>UI</keyword>
<keyword>CDK</keyword>
- <keyword>Guide</keyword>
+ <keyword>Guide</keyword>
</keywordset>
</sectioninfo>
<title>Creating a Renderer</title>
<para>
- Renderer
+ Renderer is responsible for the JSF component representation. It generates the appropriate client-side markup,
+ such as HTML, WML, XUL, etc. Renderer is also responsible for the converting information coming from the client to the proper type
+ for the component (for example, a string value from the request is converted to a strongly type <code>Date</code> object).
</para>
+ <para>
+ You could actually implement the renderer-specific component subclass that exposes
+ client-side attributes such as style, disabled, tooltip, etc.
+ </para>
&template;
&skin;
</section>
16 years, 2 months
JBoss Rich Faces SVN: r9691 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-07-18 11:40:23 -0400 (Fri, 18 Jul 2008)
New Revision: 9691
Modified:
trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
Log:
https://jira.jboss.org/jira/browse/RF-3890
Info about flash module is added
Modified: trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2008-07-18 15:40:13 UTC (rev 9690)
+++ trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2008-07-18 15:40:23 UTC (rev 9691)
@@ -157,7 +157,7 @@
<itemizedlist>
<listitem>
<para>
- By <property> file types</property>, use <emphasis><property> "acceptedTypes"</property></emphasis> attribute
+ On <property> file types</property>, use <emphasis><property> "acceptedTypes"</property></emphasis> attribute
to define file types accepted by component.
In the example below only files with "html" and "jpg" extensions are accepted to upload.
</para>
@@ -170,7 +170,7 @@
</listitem>
<listitem>
<para>
- By <property> file size</property>, use the <code>maxRequestSize</code> parameter(value in bytes) inside <property>Ajax4jsf Filter</property> section
+ On <property> file size</property>, use the <code>maxRequestSize</code> parameter(value in bytes) inside <property>Ajax4jsf Filter</property> section
in <property>web.xml</property>:
</para>
<programlisting role="XML"><![CDATA[...
@@ -182,11 +182,12 @@
</listitem>
<listitem>
<para>
- By <property>max files quantity</property>, use the <emphasis><property> "maxFilesQuantity"</property></emphasis> attribute
+ On <property>max files quantity</property>, use the <emphasis><property> "maxFilesQuantity"</property></emphasis> attribute
to define max number of files allowed to be uploaded. After a number of files in the list equals to the value of this attribute "Add" button is disabled and nothing could be uploaded even if you clear the whole list.
In order to upload files again you should rerender the component.
As it could be seen in the example below, only 2 files are accepted for uploading.
</para>
+
<para>
<emphasis role="bold">Example:</emphasis>
</para>
@@ -208,6 +209,25 @@
</listitem>
</itemizedlist>
+
+ <!--Flash Module-->
+ <para>
+ The <emphasis role="bold"><property><rich:fileUpload></property></emphasis> component has an embedded Flash module
+ that adds extra functionality to the component. The module is enabled with <emphasis><property> "allowFlash"</property></emphasis>
+attribute set to "true".
+ </para>
+<para>Apart from uploading files to the sever, without using AJAX, the Flash module provides a number of useful API functions that can be used to obtain information about the uploaded file. </para>
+ <para>For instance, in case it's needed to check the file type of an uploaded file, the <code>entry.Type</code> can be applied. The example below illustrates how it can be done.</para>
+
+
+ <programlisting role="XML"><![CDATA[...
+<rich:fileUpload maxFilesQuantity="2"/>
+ ...]]></programlisting>
+
+
+
+
+ <!--End of Flash Module-->
<para>The <emphasis role="bold"><property><rich:fileUpload></property></emphasis> component
provides a number of specific event attributes:
16 years, 2 months
JBoss Rich Faces SVN: r9690 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-07-18 11:40:13 -0400 (Fri, 18 Jul 2008)
New Revision: 9690
Modified:
trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
Log:
https://jira.jboss.org/jira/browse/RF-3890
Info about flash module is added
Modified: trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2008-07-18 14:27:54 UTC (rev 9689)
+++ trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2008-07-18 15:40:13 UTC (rev 9690)
@@ -28,8 +28,9 @@
<title>Key Features</title>
<itemizedlist>
<listitem><para>ProgressBar shows the status of downloads</para></listitem>
- <listitem><para>File types, file sizes and files count restrictions</para></listitem>
+ <listitem><para>Restriction on File type, file size and number of files to be uploaded</para></listitem>
<listitem><para>Multiple files upload support</para></listitem>
+ <listitem><para>Embedded Flash module</para></listitem>
<listitem><para>Possibility to cancel the request</para></listitem>
<listitem><para>One request for every upload</para></listitem>
<listitem><para>Automatic uploads</para></listitem>
16 years, 2 months
JBoss Rich Faces SVN: r9689 - in trunk/test-applications/seleniumTest/src: main/webapp/pages/dataTable and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-18 10:27:54 -0400 (Fri, 18 Jul 2008)
New Revision: 9689
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java
Log:
fix datatable test
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java 2008-07-18 13:17:21 UTC (rev 9688)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java 2008-07-18 14:27:54 UTC (rev 9689)
@@ -34,6 +34,14 @@
init();
}
+ public void reset(ActionEvent event) {
+ rows = 20;
+ column = 3;
+ begin = 1;
+ end = 10;
+ init();
+ }
+
public String getDate() {
return new Date().toLocaleString();
}
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-07-18 13:17:21 UTC (rev 9688)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-07-18 14:27:54 UTC (rev 9689)
@@ -65,7 +65,8 @@
</rich:columns>
</rich:dataTable>
<br/>
- <a4j:commandLink value="Submit" id="submit" reRender="table, date"></a4j:commandLink>
+ <a4j:commandLink value="Submit" id="submit" reRender="table, date"></a4j:commandLink><br/>
+ <a4j:commandLink value="Reset" id="reset" actionListener="#{dataTableBean.reset}"></a4j:commandLink>
</h:form>
</ui:define>
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java 2008-07-18 13:17:21 UTC (rev 9688)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java 2008-07-18 14:27:54 UTC (rev 9689)
@@ -1,5 +1,7 @@
package org.richfaces.testng;
+import javax.faces.event.ActionEvent;
+
import org.ajax4jsf.template.Template;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
@@ -17,6 +19,9 @@
String parentId = getParentId() + "_form:";
String dataTableId = parentId + "table";
+
+ reset(parentId + "reset");
+ reRenderForm();
writeStatus("Check columns count equals to 3 ");
assertColumnsCount(3, dataTableId);
@@ -47,7 +52,7 @@
insertInputValue(dataTableId, 19, getColumnId(dataTableId, 2), "777");
writeStatus("Rerender table");
- clickById("_form:submit");
+ clickById(getParentId() + "_form:submit");
waitForAjaxCompletion();
writeStatus("Check values entered ");
@@ -83,7 +88,7 @@
assertInputValue(dataTableId, 19, columnsId, "9");
writeStatus("Set columns count == 5, rows count == 10");
- changeColumnCount(10, 5, 0, 100);
+ changeColumnCount(getParentId(), 10, 5, 0, 100);
writeStatus("Check columns count equals to 5 ");
assertColumnsCount(5, dataTableId);
@@ -132,14 +137,18 @@
assertInputValue(dataTableId, 2, columnsId, "2");
assertInputValue(dataTableId, 9, columnsId, "9");
- changeColumnCount(2, 5, 2, 2);
+ changeColumnCount(getParentId(),2, 5, 2, 2);
assertColumnsCount(1, dataTableId);
assertRowsCount(4, dataTableId);
- changeColumnCount(10, 5, 10, 0);
+ changeColumnCount(getParentId(), 10, 5, 10, 0);
assertRowsCount(0, dataTableId);
}
+
+ public void reset(String id) {
+ clickAjaxCommandAndWait(id);
+ }
private String getColumnId(String tableId, int i) {
String script = "$('" + tableId + "').rows[0].cells[" + String.valueOf(i) + "].id";
@@ -149,16 +158,16 @@
return id;
}
- private void changeColumnCount(int rows, int columns, int begin, int end) {
- String script = "$('_controls:rows').value='" + String.valueOf(rows) + "';";
+ private void changeColumnCount(String parentId, int rows, int columns, int begin, int end) {
+ String script = "$('"+parentId+"_controls:rows').value='" + String.valueOf(rows) + "';";
runScript(script);
- script = "$('_controls:column').value='" + String.valueOf(columns) + "';";
+ script = "$('"+parentId+"_controls:column').value='" + String.valueOf(columns) + "';";
runScript(script);
- script = "$('_controls:begin').value='" + String.valueOf(begin) + "';";
+ script = "$('"+parentId+"_controls:begin').value='" + String.valueOf(begin) + "';";
runScript(script);
- script = "$('_controls:end').value='" + String.valueOf(end) + "';";
+ script = "$('"+parentId+"_controls:end').value='" + String.valueOf(end) + "';";
runScript(script);
- clickById("_controls:apply");
+ clickById(parentId +"_controls:apply");
waitForAjaxCompletion();
}
16 years, 2 months
JBoss Rich Faces SVN: r9688 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-18 09:17:21 -0400 (Fri, 18 Jul 2008)
New Revision: 9688
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
refactoring
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18 12:34:00 UTC (rev 9687)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18 13:17:21 UTC (rev 9688)
@@ -38,8 +38,10 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.ServletResponseWrapper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;
import org.ajax4jsf.Messages;
@@ -335,7 +337,12 @@
sessionsMap.put(uid, multipartRequest);
if (multipartRequest.parseRequest()) {
- handleRequest(multipartRequest, response, chain);
+ handleRequest(multipartRequest, new HttpServletResponseWrapper(response){
+ @Override
+ public void setContentType(String type) {
+ super.setContentType(BaseXMLFilter.TEXT_HTML + ";charset=UTF-8");
+ }
+ }, chain);
} else {
printResponse(response, "<html id=\"_richfaces_file_upload_stopped\"></html>");
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18 12:34:00 UTC (rev 9687)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18 13:17:21 UTC (rev 9688)
@@ -235,9 +235,9 @@
// TODO - for null encoding, setup only Output encoding for
// filter ?
String outputEncoding = "UTF-8";
- String contentType = getMimetype(request) + ";charset=" + outputEncoding;
+ String contentType = getMimetype() + ";charset=" + outputEncoding;
response.setContentType(contentType);
- parser = getParser(getMimetype(request), true, viewId);
+ parser = getParser(getMimetype(), true, viewId);
if (null == parser) {
throw new ServletException(Messages.getMessage(
Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType));
@@ -501,19 +501,6 @@
}
/**
- * Returns text/HTML mime type if request was sent from FileUpload.
- * Else returns mimetype defined.
- * @return Returns the mimetype.
- */
- public String getMimetype(HttpServletRequest request) {
- if (request != null && request.getParameter(Filter.FILE_UPLOAD_INDICATOR) != null
- && "true".equals(request.getParameter(Filter.FILE_UPLOAD_INDICATOR))) {
- return TEXT_HTML;
- }
- return mimetype;
- }
-
- /**
* @return Returns the forcexml.
*/
public boolean isForcexml() {
16 years, 2 months
JBoss Rich Faces SVN: r9687 - in trunk/docs: userguide/en/src/main/docbook and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-18 08:34:00 -0400 (Fri, 18 Jul 2008)
New Revision: 9687
Modified:
trunk/docs/faq/en/src/main/docbook/master.xml
trunk/docs/userguide/en/src/main/docbook/master.xml
trunk/docs/userguide/en/src/main/resources/css/html.css
Log:
https://jira.jboss.org/jira/browse/RF-3937
Modified: trunk/docs/faq/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/faq/en/src/main/docbook/master.xml 2008-07-18 12:29:10 UTC (rev 9686)
+++ trunk/docs/faq/en/src/main/docbook/master.xml 2008-07-18 12:34:00 UTC (rev 9687)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
-"../../../../../resources/support/docbook-dtd/docbookx.dtd"
+"http://www.docbook.org/xsd/4.3/docbook.xsd"
[
<!ENTITY rfcFAQ SYSTEM "module/RFCfaq.xml">
]>
Modified: trunk/docs/userguide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/master.xml 2008-07-18 12:29:10 UTC (rev 9686)
+++ trunk/docs/userguide/en/src/main/docbook/master.xml 2008-07-18 12:34:00 UTC (rev 9687)
@@ -64,9 +64,16 @@
<year>2008</year>
<holder>Red Hat</holder>
</copyright>
-<citebiblioid>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">PDF version</ulink>
+ </para>
+</abstract>
+<!--citebiblioid>
<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">PDF version</ulink>.
-</citebiblioid>
+</citebiblioid-->
</bookinfo>
<toc/>
Modified: trunk/docs/userguide/en/src/main/resources/css/html.css
===================================================================
--- trunk/docs/userguide/en/src/main/resources/css/html.css 2008-07-18 12:29:10 UTC (rev 9686)
+++ trunk/docs/userguide/en/src/main/resources/css/html.css 2008-07-18 12:34:00 UTC (rev 9687)
@@ -28,7 +28,13 @@
width:1000px;
margin:0 auto;
text-align:justify;
+
+div.abstract {
+font-size:10px;
+
}
+
+}
.docnav li.previous strong, .docnav li.next strong {
width: 200px;
height:22px;
16 years, 2 months
JBoss Rich Faces SVN: r9686 - Plan and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-07-18 08:29:10 -0400 (Fri, 18 Jul 2008)
New Revision: 9686
Added:
trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA2.xls
Log:
Added: trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA2.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA2.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Rich Faces SVN: r9685 - Plan and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-07-18 08:17:45 -0400 (Fri, 18 Jul 2008)
New Revision: 9685
Added:
trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA1.xls
trunk/test-applications/qa/Test Plan/TestPlan-RF-3.2.0.doc
Removed:
trunk/test-applications/qa/Test Plan/3.2.0/
trunk/test-applications/qa/Test Plan/ComponentsAssignment.xls
Log:
Deleted: trunk/test-applications/qa/Test Plan/ComponentsAssignment.xls
===================================================================
(Binary files differ)
Added: trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA1.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Plan/ComponentsAssignment3.2.2.BETA1.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/qa/Test Plan/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Plan/TestPlan-RF-3.2.0.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Rich Faces SVN: r9684 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-07-18 08:11:23 -0400 (Fri, 18 Jul 2008)
New Revision: 9684
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
RF-3161 - partly done for "RichFaces Architecture Overview" section.
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-18 12:10:24 UTC (rev 9683)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-18 12:11:23 UTC (rev 9684)
@@ -4333,8 +4333,8 @@
New style properties can be assigned to the selectors (the selectors listed in the XCSS files) in two ways, which are both valid, and it'up to the developer what way to choose. </para>
<itemizedlist>
<listitem><para>Applying a standard CSS coding approach, i.e. you can add css properties to the given selectors are you normally do while doing CSS coding.
- The only thing, you have to keep in mind is that the selectors must me inside
- <f:verbatim> <![CDATA[ ...]]> </f:verbatim> tags.</para>
+ The only thing, you have to keep in mind is that the selectors must be inside
+ <code><f:verbatim> <![CDATA[ ...]]> </f:verbatim></code> tags.</para>
<para>For example </para>
@@ -4355,7 +4355,7 @@
<listitem><para>
Using XCSS coding approach, the same way as XCSS files are normally formed in RichFaces.
- The XCSS tags have to be placed outside <f:verbatim> <![CDATA[ ...]]> </f:verbatim> tags.
+ The XCSS tags have to be placed outside <code><f:verbatim> <![CDATA[ ...]]> </f:verbatim></code> tags.
</para>
16 years, 2 months