You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bw...@apache.org on 2006/05/09 00:04:53 UTC
svn commit: r405192 [2/2] - in /tapestry/tapestry4/trunk:
contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/
framework/src/documentation/content/xdocs/tapestry/ComponentReference/
framework/src/java/org/apache/tapestry/compone...
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Form.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Form.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Form.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Form.xml Mon May 8 15:04:50 2006
@@ -151,6 +151,18 @@
often used to switch to "https" for secure portions of an application (such as a login page), before
switching back to standard "http" for the majority of an application. </td>
</tr>
+ <tr>
+ <td>port</td>
+ <td>Integer</td>
+ <td>in</td>
+ <td>no</td>
+ <td/>
+ <td> The required port (80, 443, 8080. 8443, typically) for the URL. This will force the creation of an
+ absolute URL when the current request's scheme does not match the value for this parameter. This is most
+ often used in conjunction with scheme to switch to "https:443"/"https:8443" for secure portions of an
+ application (such as a login page), before switching back to standard "http:80"/"http:80" for the majority
+ of an application. </td>
+ </tr>
</table>
<p> Body: <strong>allowed</strong>
</p>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml Mon May 8 15:04:50 2006
@@ -63,7 +63,7 @@
<tr>
<td>format</td>
<td>
- <link href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/Format.html">Format</link>
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/Format.html">Format</link>
</td>
<td>in</td>
<td>no</td>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/LinkSubmit.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/LinkSubmit.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/LinkSubmit.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/LinkSubmit.xml Mon May 8 15:04:50 2006
@@ -77,6 +77,41 @@
If specified, the listener is notified. This notification occurs as the component is rewinded, i.e., prior to the Form's listener. In addition, the selected property (if bound) will be updated before the listener is notified.
</td>
</tr>
+ <tr>
+ <td>action</td>
+ <td>&IActionListener;</td>
+ <td>in</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ A listener that is notified if this component is triggered
+ just before the form's listener, after all components
+ enclosed by the Form have had a chance to update their properties.
+ </td>
+ </tr>
+ <tr>
+ <td>parameters</td>
+ <td>Object</td>
+ <td>in</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Parameter(s) gathered at the time the link is triggered,
+ supplied as listener parameters in the IRequestCycle
+ available to the listener.
+ <p>
+ If the parameter is a Collection, it will be converted to
+ an Object array (to match the IRequestCycle getListenerParameters()
+ signature).
+ </p>
+ <p>
+ Allows deferred listeners
+ (defer = true) access to any rewind state not conveniently
+ placed using tag/selected (e.g. when there are multiple objects
+ to select as might happen with a nested Foreach).
+ </p>
+ </td>
+ </tr>
</table>
<p>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/PageLink.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/PageLink.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/PageLink.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/PageLink.xml Mon May 8 15:04:50 2006
@@ -110,6 +110,19 @@
</tr>
<tr>
+ <td>port</td>
+ <td>Integer</td>
+ <td>in</td>
+ <td>no</td>
+ <td/>
+ <td> The required port (80, 443, 8080. 8443, typically) for the URL. This will force the creation of an
+ absolute URL when the current request's scheme does not match the value for this parameter. This is most
+ often used in conjunction with scheme to switch to "https:443"/"https:8443" for secure portions of an
+ application (such as a login page), before switching back to standard "http:80"/"http:80" for the majority
+ of an application. </td>
+ </tr>
+
+ <tr>
<td>target</td>
<td>String</td>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Radio.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Radio.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Radio.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Radio.xml Mon May 8 15:04:50 2006
@@ -34,7 +34,7 @@
<p>Generally the &PropertySelection; component is used in preference to
the Radio and &RadioGroup;, except in special cases.</p>
<p>
- <strong>See also: <link href="&apiroot;/components/Radio.html">org.apache.tapestry.components.Radio</link>, &Form;, &Option;, &PropertySelection;, &RadioGroup;, &Select;</strong>
+ <strong>See also: <link href="&apiroot;/form/Radio.html">org.apache.tapestry.form.Radio</link>, &Form;, &Option;, &PropertySelection;, &RadioGroup;, &Select;</strong>
</p>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RadioGroup.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RadioGroup.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RadioGroup.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RadioGroup.xml Mon May 8 15:04:50 2006
@@ -40,7 +40,7 @@
</warning>
<p>
- <strong>See also: <link href="&apiroot;/components/RadioGroup.html">org.apache.tapestry.components.RadioGroup</link>, &Option;, &PropertySelection;, &Radio;, &Select;</strong>
+ <strong>See also: <link href="&apiroot;/form/RadioGroup.html">org.apache.tapestry.form.RadioGroup</link>, &Option;, &PropertySelection;, &Radio;, &Select;</strong>
</p>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RenderBlock.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RenderBlock.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RenderBlock.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/RenderBlock.xml Mon May 8 15:04:50 2006
@@ -108,7 +108,7 @@
<source><![CDATA[
<html jwcid="@Shell" title="TabPanel Test">
<body>
- <span jwcid="@TabPanel" blockNames="ognl:{'berlin', 'rome', 'tokyo'}" selectColor="#FFFF00" unSelectColor="#CCFFFF" borderColor="#00CC33"/>
+ <span jwcid="@TabPanel" blockIds="ognl:{'berlin', 'rome', 'tokyo'}" selectColor="#FFFF00" unSelectColor="#CCFFFF" borderColor="#00CC33"/>
<span jwcid="berlin@Block">
<h1>Berlin</h1>
@@ -270,7 +270,7 @@
String selectedId = getSelectedBlockId();
if (selectedId == null)
- selectedId = (String) getBlockNames().get(0);
+ selectedId = (String) getBlockIds().get(0);
return (Block) getContainer().getComponent(selectedId);
}
@@ -280,7 +280,7 @@
String selectedId = getSelectedBlockId();
if (selectedId == null)
- selectedId = (String) getBlockNames().get(0);
+ selectedId = (String) getBlockIds().get(0);
return getBlockId().equals(selectedId);
}
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Script.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Script.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Script.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Script.xml Mon May 8 15:04:50 2006
@@ -185,7 +185,9 @@
Input symbols:
component: the component input field to give focus
-->
-
+
+<script>
+
<input-symbol key="component" class="org.apache.tapestry.form.AbstractFormComponent" required="yes"/>
<let key="formObject">
@@ -196,11 +198,9 @@
${formObject}.${component.name}
</let>
-<script>
-
<body>
function setFocus() {
- var inputField = ${componentObject.name};
+ var inputField = ${componentObject};
if (inputField.type != "hidden") {
if (inputField.disabled != true) {
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/ServiceLink.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/ServiceLink.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/ServiceLink.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/ServiceLink.xml Mon May 8 15:04:50 2006
@@ -53,13 +53,13 @@
<tr>
<td>service</td>
- <td>&IEngineService;</td>
+ <td>String</td>
<td>in</td>
<td>yes</td>
<td></td>
<td>
- The &IEngineService; to invoke.
+ The name of the &IEngineService; to invoke.
</td>
</tr>
<tr>
@@ -115,7 +115,19 @@
</td>
</tr>
-
+ <tr>
+ <td>port</td>
+ <td>Integer</td>
+ <td>in</td>
+ <td>no</td>
+ <td/>
+ <td> The required port (80, 443, 8080. 8443, typically) for the URL. This will force the creation of an
+ absolute URL when the current request's scheme does not match the value for this parameter. This is most
+ often used in conjunction with scheme to switch to "https:443"/"https:8443" for secure portions of an
+ application (such as a login page), before switching back to standard "http:80"/"http:80" for the majority
+ of an application. </td>
+ </tr>
+
<tr>
<td>renderer</td>
<td>&ILinkRenderer;</td>
Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/TextField.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/TextField.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/TextField.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/TextField.xml Mon May 8 15:04:50 2006
@@ -99,9 +99,6 @@
Reserved parameters: name, type, value
</p>
-<p>A TextField may be decorated by the Form's validation delegate, but does not have a validator, so is limited in editting properties types
- beyond string. In most cases, the &ValidField; component is preferred. </p>
-
</section>
<section>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Foreach.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Foreach.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Foreach.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Foreach.java Mon May 8 15:04:50 2006
@@ -34,6 +34,7 @@
* each successive index into the source (starting with zero).
*
* @author Howard Lewis Ship
+ * @deprecated As of release 4.0, replaced by {@link ForBean}
*/
public abstract class Foreach extends AbstractComponent
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBlock.jwc
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBlock.jwc?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBlock.jwc (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBlock.jwc Mon May 8 15:04:50 2006
@@ -23,6 +23,11 @@
allow-body="no"
allow-informal-parameters="yes">
+ <description>
+ Renders the body of a Block component, which may be selected dynamically.
+ The Block may be on the same page as the RenderBlock or on another page entirely.
+ </description>
+
<parameter name="block" required="yes"/>
</component-specification>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBody.jwc
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBody.jwc?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBody.jwc (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/RenderBody.jwc Mon May 8 15:04:50 2006
@@ -22,4 +22,12 @@
<component-specification
class="org.apache.tapestry.components.RenderBody"
allow-body="no"
- allow-informal-parameters="no"/>
+ allow-informal-parameters="no">
+
+ <description>
+ Renders the body (static HTML and components) wrapped by the container of the
+ RenderBody component. Components which have HTML templates and can wrap other
+ elements should include exactly one RenderBody component in their template.
+ </description>
+
+</component-specification>
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/EngineServiceLink.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/EngineServiceLink.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/EngineServiceLink.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/EngineServiceLink.java Mon May 8 15:04:50 2006
@@ -39,7 +39,9 @@
public class EngineServiceLink implements ILink
{
private static final int DEFAULT_HTTP_PORT = 80;
-
+
+ private static final int DEFAULT_HTTPS_PORT = 443;
+
private final IRequestCycle _cycle;
private final String _servletPath;
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ExternalService.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ExternalService.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ExternalService.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ExternalService.java Mon May 8 15:04:50 2006
@@ -119,6 +119,11 @@
/** @since 4.0 */
private LinkFactory _linkFactory;
+ /**
+ * {@inheritDoc}
+ *
+ * @return The URL for the service. The URL will always be encoded when it is returned.
+ */
public ILink getLink(boolean post, Object parameter)
{
Defense.isAssignable(parameter, ExternalServiceParameter.class, "parameter");
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.jwc
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.jwc?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.jwc (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/DatePicker.jwc Mon May 8 15:04:50 2006
@@ -21,6 +21,11 @@
<component-specification class="org.apache.tapestry.form.DatePicker" allow-body="no">
+ <description>
+ Provides a form Date field component for selecting dates.
+ DatePicker presents a drop down monthly calendar for users to select dates from.
+ </description>
+
<parameter name="value" required="yes"/>
<parameter name="disabled"/>
<parameter name="includeWeek"/>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/FormSupport.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/FormSupport.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/FormSupport.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/FormSupport.java Mon May 8 15:04:50 2006
@@ -43,6 +43,10 @@
* the desired scheme for the generated URL, typically "http" or "https". If
* non-null, and the scheme does not match the current request's scheme, then an
* absolute URL with the specified scheme will be generated, rather than a URI.
+ * @param port
+ * the desired port for the generated URL, typically "80", "443". If
+ * non-null, and the port does not match the current request's port, then an
+ * absolute URL with the specified port will be generated, rather than a URI.
*/
void render(String method, IRender informalParametersRenderer, ILink link, String scheme, Integer port);
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Required.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Required.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Required.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Required.java Mon May 8 15:04:50 2006
@@ -22,6 +22,7 @@
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
+import org.apache.tapestry.multipart.UploadPart;
import org.apache.tapestry.valid.ValidationConstants;
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
@@ -54,7 +55,8 @@
{
if ((object == null)
|| (String.class.isInstance(object) && (((String) object).length() == 0))
- || (Collection.class.isInstance(object) && ((Collection) object).isEmpty()))
+ || (Collection.class.isInstance(object) && ((Collection) object).isEmpty())
+ || (UploadPart.class.isInstance(object) && ((UploadPart) object).getSize() < 1))
{
String message = buildMessage(messages, field);
throw new ValidatorException(message, ValidationConstraint.REQUIRED);
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Body.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Body.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Body.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Body.java Mon May 8 15:04:50 2006
@@ -129,8 +129,11 @@
* components wrapped by the <code>Body</code> to locate it and access the services it
* provides.
*
+ * @param cycle Request cycle in which the Body was stored
+ * @return Body wrapping the components for the specified request cycle
+ *
* @deprecated To be removed in 4.1. Use
- * {@link org.apache.tapestry.TapestryUtils#getPageRenderSupport(IRequestCycle)}
+ * {@link org.apache.tapestry.TapestryUtils#getOptionalPageRenderSupport(IRequestCycle)}
* instead.
*/
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java Mon May 8 15:04:50 2006
@@ -38,6 +38,8 @@
public class MultipartDecoderImpl extends AbstractMultipartDecoder implements
ServletMultipartDecoder
{
+ /* maximum size of file allowed to be uploaded */
+ protected long _maxSize = 10000000;
public HttpServletRequest decode(HttpServletRequest request)
{
@@ -68,9 +70,21 @@
new File(_repositoryPath));
ServletFileUpload upload = new ServletFileUpload(factory);
- if (_encoding != null) upload.setHeaderEncoding(_encoding);
+ // set maximum file upload size
+ upload.setSizeMax(_maxSize);
+
+ if (_encoding != null)
+ upload.setHeaderEncoding(_encoding);
return upload;
}
+ /**
+ * Sets the maximum size that an uploaded file will be allowed to have.
+ * @param maxSize The maximum size, in bytes.
+ */
+ public void setMaxSize(long maxSize)
+ {
+ _maxSize = maxSize;
}
+}
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/ServletMultipartDecoder.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/ServletMultipartDecoder.java?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/ServletMultipartDecoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/multipart/ServletMultipartDecoder.java Mon May 8 15:04:50 2006
@@ -26,6 +26,7 @@
* {@link javax.servlet.http.HttpServletRequest} implementation that will
* allow access to the form fields submitted in the request (but omits
* uploaded files.
+ * @param request The incoming servlet request
*/
HttpServletRequest decode(HttpServletRequest request);
Added: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_da.properties
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_da.properties?rev=405192&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_da.properties (added)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_da.properties Mon May 8 15:04:50 2006
@@ -0,0 +1,44 @@
+# Copyright 2005 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+field-is-required=Du skal udfylde feltet {0}.
+field-too-short=Du skal indtaste mindst {0} tegn i feltet {1}.
+
+invalid-date-format=Ugyldigt datoformat i feltet {0}. Formatet er {1}.
+invalid-int-format={0} skal v\u00e6re et helt tal.
+invalid-format={0} er ikke i et genkendeligt format.
+invalid-numeric-format={0} skal v\u00e6re en numerisk v\u00e6rdi.
+
+date-too-early={0} skal v\u00e6re p\u00e5 eller efter {1}.
+date-too-late={0} skal v\u00e6re p\u00e5 eller f\u00f8r {1}.
+
+number-too-small={0} m\u00e5 ikke v\u00e6re mindre end {1}.
+number-too-large={0} m\u00e5 ikke v\u00e6re st\u00f8rre end {1}.
+
+number-range={0} skal v\u00e6re mellem {1} og {2}.
+
+invalid-email-format=Ugyldigt e-mailformat i feltet {0}. Formatet er bruger@dom\u00e6ne.
+
+pattern-not-matched={0} opfylder ikke det kr\u00e6vede m\u00f8nster {1}.
+
+invalid-url-format = Ugyldig URL.
+disallowed-protocol = Ulovlig protokol - protokolen skal v\u00e6re {0}.
+
+### 4.0 ###
+
+field-too-long=Du m\u00e5 ikke indtaste mere end {0} tegn i feltet {1}.
+
+regex-mismatch={0} er ugyldig(t).
+
+invalid-field-equality={0} skal {1,choice,0#v\u00e6re forskellig fra|1#stemme overens med} {2}.
Added: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_nl.properties
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_nl.properties?rev=405192&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_nl.properties (added)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_nl.properties Mon May 8 15:04:50 2006
@@ -0,0 +1,44 @@
+# Copyright 2005 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+field-is-required=U dient een waarde in te voeren voor {0}.
+field-too-short=U dient minimaal {0} karakters in te voeren voor {1}.
+
+invalid-date-format=Datumformaat is niet juist voor {0}. Het formaat is {1}.
+invalid-int-format={0} moet een geheel getal zijn.
+invalid-format={0} is van een onbekend formaat.
+invalid-numeric-format={0} moet een numerieke waarde zijn.
+
+date-too-early={0} moet op of na {1} vallen.
+date-too-late={0} moet op of voor {1} vallen.
+
+number-too-small={0} mag niet kleiner zijn dan {1}.
+number-too-large={0} mag niet groter zijn dan {1}.
+
+number-range={0} moet liggen tussen {1} en {2}.
+
+invalid-email-format=Ongeldig emailformaat voor {0}. Het formaat is gebruiker@host.
+
+pattern-not-matched={0} voldoet niet aan het vereiste patroon {1}.
+
+invalid-url-format = Ongeldige URL.
+disallowed-protocol = Niet toegestaan protocol - protocol moet {0} zijn.
+
+### 4.0 ###
+
+field-too-long=U mag niet meer dan {0} karakters invoeren voor {1}.
+
+regex-mismatch={0} is ongeldig.
+
+invalid-field-equality={0} moet {1,choice,0#afwijkend van|1#hetzelfde als} {2} zijn.
Modified: tapestry/tapestry4/trunk/src/documentation/content/xdocs/links.ent
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/src/documentation/content/xdocs/links.ent?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/documentation/content/xdocs/links.ent (original)
+++ tapestry/tapestry4/trunk/src/documentation/content/xdocs/links.ent Mon May 8 15:04:50 2006
@@ -93,7 +93,7 @@
<!ENTITY ITemplateSourceDelegate '<link href="&apiroot;/engine/ITemplateSourceDelegate.html">ITemplateSourceDelegate</link>'>
<!ENTITY IValidator '<link href="&apiroot;/valid/IValidator.html">IValidator</link>'>
<!ENTITY IValidationDelegate '<link href="&apiroot;/valid/IValidationDelegate.html">IValidationDelegate</link>'>
-<!ENTITY IUploadFile '<link href="&apiroot;/IUploadFile.html">IUploadFile</link>'>
+<!ENTITY IUploadFile '<link href="&apiroot;/request/IUploadFile.html">IUploadFile</link>'>
<!ENTITY ListenerMap '<link href="&apiroot;/listener/ListenerMap.html">ListenerMap</link>'>
<!ENTITY PageAttachListener '<link href="&apiroot;/event/PageAttachListener.html">PageAttachListener</link>'>
@@ -182,7 +182,11 @@
<!-- Links to contrib Component Reference -->
+<!ENTITY CheckboxGroup '<link href="site:CheckboxGroup">CheckboxGroup</link>'>
<!ENTITY Choose '<link href="site:Choose">Choose</link>'>
+<!ENTITY ControlCheckbox '<link href="site:ControlCheckbox">ControlCheckbox</link>'>
+<!ENTITY ControlledCheckbox '<link href="site:ControlledCheckbox">ControlledCheckbox</link>'>
+<!ENTITY DumpObject '<link href="site:DumpObject">DumpObject</link>'>
<!ENTITY MultiplePropertySelection '<link href="site:MultiplePropertySelection">MultiplePropertySelection</link>'>
<!ENTITY Otherwise '<link href="site:Otherwise">Otherwise</link>'>
<!ENTITY Palette '<link href="site:Palette">Palette</link>'>
@@ -197,6 +201,15 @@
<!ENTITY TableRows '<link href="site:TableRows">TableRows</link>'>
<!ENTITY TableValues '<link href="site:TableValues">TableValues</link>'>
<!ENTITY TableView '<link href="site:TableView">TableView</link>'>
+<!ENTITY Timeout '<link href="site:Timeout">Timeout</link>'>
+<!ENTITY Tree '<link href="site:Tree">Tree</link>'>
+<!ENTITY TreeDataView '<link href="site:TreeDataView">TreeDataView</link>'>
+<!ENTITY TreeNodeView '<link href="site:TreeNodeView">TreeNodeView</link>'>
+<!ENTITY TreeTable '<link href="site:TreeTable">TreeTable</link>'>
+<!ENTITY TreeTableDataView '<link href="site:TreeTableDataView">TreeTableDataView</link>'>
+<!ENTITY TreeTableNodeViewDelegator '<link href="site:TreeTableNodeViewDelegator">TreeTableNodeViewDelegator</link>'>
+<!ENTITY TreeView '<link href="site:TreeView">TreeView</link>'>
+<!ENTITY XTile '<link href="site:XTile">XTile</link>'>
<!-- External links -->
Modified: tapestry/tapestry4/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/src/documentation/content/xdocs/site.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/documentation/content/xdocs/site.xml (original)
+++ tapestry/tapestry4/trunk/src/documentation/content/xdocs/site.xml Mon May 8 15:04:50 2006
@@ -38,7 +38,7 @@
<dev label="Developers" href="dev.html"/>
<dependencies label="Dependencies" href="dependencies.html"/>
<downloads label="Downloads" href="downloads.html"/>
- <olddoc label="3.0.3 Documentation" href="http://jakarta.apache.org/tapestry/3.0.3/"/>
+ <olddoc label="3.0.4 Documentation" href="http://jakarta.apache.org/tapestry/3.0.4/"/>
</project>
@@ -138,7 +138,11 @@
<index label="Overview" href="index.html"/>
<ComponentReference label="Components" href="ComponentReference/">
+ <CheckboxGroup label="CheckboxGroup" href="CheckboxGroup.html"/>
<Choose label="Choose" href="Choose.html"/>
+ <ControlCheckbox label="ControlCheckbox" href="ControlCheckbox.html"/>
+ <ControlledCheckbox label="ControlledCheckbox" href="ControlledCheckbox.html"/>
+ <DumpObject label="DumpObject" href="DumpObject.html"/>
<DateField label="DateField" href="DateField.html"/>
<FormConditional label="FormConditional" href="FormConditional.html"/>
<FormTable label="FormTable" href="FormTable.html"/>
@@ -156,6 +160,7 @@
<TablePages label="TablePages" href="TablePages.html"/>
<TableValues label="TableValues" href="TableValues.html"/>
<TableView label="TableView" href="TableView.html"/>
+ <Timeout label="Timeout" href="Timeout.html"/>
<Tree label="Tree" href="Tree.html"/>
<TreeDataView label="TreeDataView" href="TreeDataView.html"/>
<TreeNodeView label="TreeNodeView" href="TreeNodeView.html"/>
@@ -165,6 +170,7 @@
<TreeView label="TreeView" href="TreeView.html"/>
<ValidatingTextField label="ValidatingTextField" href="ValidatingTextField.html"/>
<When label="When" href="When.html"/>
+ <XTile label="XTile" href="XTile.html"/>
</ComponentReference>
<reports label="Reports">
@@ -217,7 +223,8 @@
</info>
<related label="Related Projects">
- <appfuse label="AppFuse" href="https://appfuse.dev.java.net/"/>
+ <appfuse label="AppFuse" href="https://appfuse.dev.java.net/"/>
+ <item label="Cognition Framework" href="http://www.cognitionframework.org"/>
<item label="HiveMind" href="http://jakarta.apache.org/hivemind/"/>
<item label="Spindle" href="http://spindle.sourceforge.net/"/>
<item label="Tacos" href="http://tacos.sourceforge.net"/>
Added: tapestry/tapestry4/trunk/src/documentation/resources/images/favicon.ico
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/src/documentation/resources/images/favicon.ico?rev=405192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry4/trunk/src/documentation/resources/images/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: tapestry/tapestry4/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/src/documentation/skinconf.xml?rev=405192&r1=405191&r2=405192&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/documentation/skinconf.xml (original)
+++ tapestry/tapestry4/trunk/src/documentation/skinconf.xml Mon May 8 15:04:50 2006
@@ -81,7 +81,7 @@
<host-logo></host-logo>
<!-- relative url of a favicon file, normally favicon.ico -->
- <favicon-url>favicon.ico</favicon-url>
+ <favicon-url>images/favicon.ico</favicon-url>
<!-- The following are used to construct a copyright statement -->
<year>2006</year>