You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/16 17:36:32 UTC
svn commit: r422446 - in /tapestry/tapestry4/trunk:
src/site/xdoc/components/ tapestry-framework/src/descriptor/META-INF/
tapestry-framework/src/java/org/apache/tapestry/
tapestry-framework/src/java/org/apache/tapestry/engine/
tapestry-framework/src/ja...
Author: jkuhnert
Date: Sun Jul 16 08:36:31 2006
New Revision: 422446
URL: http://svn.apache.org/viewvc?rev=422446&view=rev
Log:
Found bug in Form where it had to check for a parameter of direct=true in order to determine the right service to call.
Fixed by removing the ActionService.
Removed:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IAction.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/ActionService.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/ActionServiceParameter.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ActionLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
Modified:
tapestry/tapestry4/trunk/src/site/xdoc/components/PageLink.xml
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.services.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IPage.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/Go.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSelectOption.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLComponents.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context17/Home.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.page
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Home.wml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Rewind.wml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Stale.wml
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/PageLink.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/PageLink.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/PageLink.xml (original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/PageLink.xml Sun Jul 16 08:36:31 2006
@@ -89,7 +89,7 @@
</td>
</tr>
<tr>
- <td>disable</td>
+ <td>disabled</td>
<td>boolean</td>
<td>in</td>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.services.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.services.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.services.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.services.xml Sun Jul 16 08:36:31 2006
@@ -51,7 +51,6 @@
<contribution configuration-id="FactoryServices">
<service name="home" object="service:Home" />
- <service name="action" object="service:Action" />
<service name="direct" object="service:Direct" />
<service name="page" object="service:Page" />
<service name="reset" object="service:Reset" />
@@ -103,17 +102,6 @@
<set-object property="responseRenderer" value="infrastructure:responseRenderer" />
<set-object property="linkFactory" value="infrastructure:linkFactory" />
<set-object property="pageName" value="app-property:org.apache.tapestry.home-page" />
- </construct>
- </invoke-factory>
- </service-point>
-
- <service-point id="Action" interface="IEngineService">
- <invoke-factory>
- <construct class="ActionService">
- <set-object property="responseRenderer" value="infrastructure:responseRenderer" />
- <set-object property="request" value="infrastructure:request" />
- <set-object property="linkFactory" value="infrastructure:linkFactory" />
- <set-object property="requestCycle" value="infrastructure:requestCycle" />
</construct>
</invoke-factory>
</service-point>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java Sun Jul 16 08:36:31 2006
@@ -27,7 +27,7 @@
* @since 1.0.2
*/
-public interface IForm extends IAction, FormBehavior
+public interface IForm extends IComponent, FormBehavior
{
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IPage.java?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IPage.java Sun Jul 16 08:36:31 2006
@@ -28,7 +28,7 @@
/**
* A root level component responsible for generating an entire a page within the application.
* <p>
- * Pages are created dynamically from thier class names (part of the
+ * Pages are created dynamically from their class names (part of the
* {@link org.apache.tapestry.spec.IComponentSpecification}).
*
* @see org.apache.tapestry.engine.IPageSource
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java Sun Jul 16 08:36:31 2006
@@ -26,7 +26,6 @@
import org.apache.tapestry.RenderRewoundException;
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.TapestryUtils;
-import org.apache.tapestry.engine.ActionServiceParameter;
import org.apache.tapestry.engine.DirectServiceParameter;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
@@ -117,24 +116,6 @@
public abstract IEngineService getDirectService();
/**
- * Injected.
- *
- * @since 4.0
- */
-
- public abstract IEngineService getActionService();
-
- /**
- * Returns true if this Form is configured to use the direct service.
- * <p>
- * This is derived from the direct parameter, and defaults to true if not bound.
- *
- * @since 1.0.2
- */
-
- public abstract boolean isDirect();
-
- /**
* Returns true if the stateful parameter is bound to a true value. If stateful is not bound,
* also returns the default, true.
*
@@ -241,11 +222,10 @@
// Note: not safe to invoke getNamespace() in Portlet world
// except during a RenderRequest.
- String baseName = isDirect() ? constructFormNameForDirectService(cycle)
- : constructFormNameForActionService(actionId);
-
+ String baseName = constructFormNameForDirectService(cycle);
+
_name = baseName + getResponse().getNamespace();
-
+
if (_renderInformalParameters == null)
_renderInformalParameters = new RenderInformalParameters();
@@ -350,17 +330,8 @@
private ILink getLink(IRequestCycle cycle, String actionId)
{
- if (isDirect())
- {
- Object parameter = new DirectServiceParameter(this);
- return getDirectService().getLink(true, parameter);
- }
-
- // I'd love to pull out support for the action service entirely!
-
- Object parameter = new ActionServiceParameter(this, actionId);
-
- return getActionService().getLink(true, parameter);
+ Object parameter = new DirectServiceParameter(this);
+ return getDirectService().getLink(true, parameter);
}
/** Injected. */
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.jwc?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.jwc Sun Jul 16 08:36:31 2006
@@ -73,13 +73,6 @@
</description>
</parameter>
- <parameter name="direct" default-value="true">
- <description>
- If true (the default), then the more efficient direct service is used.
- If false, then the action service is used.
- </description>
- </parameter>
-
<parameter name="delegate" default-value="bean:defaultDelegate">
<description>
Specifies the delegate to be used by fields to track input errors. If not specified, the
@@ -124,7 +117,6 @@
<reserved-parameter name="id"/>
<inject property="directService" object="engine-service:direct"/>
- <inject property="actionService" object="engine-service:action"/>
<inject property="response" object="infrastructure:response"/>
<inject property="listenerInvoker" object="infrastructure:listenerInvoker"/>
</component-specification>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/Go.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/Go.jwc?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/Go.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/Go.jwc Sun Jul 16 08:36:31 2006
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2004, 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.
+ Copyright 2004, 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.
-->
<!DOCTYPE component-specification PUBLIC
@@ -21,11 +21,9 @@
<component-specification class="org.apache.tapestry.wml.Go">
- <description>
- The go element declares a go task, indicating navigation to a URI.
- </description>
+ <description>The go element declares a go task, indicating navigation to a URI.</description>
- <bean name="delegate" class="org.apache.tapestry.valid.ValidationDelegate" property="delegate"/>
+ <bean name="delegate" class="org.apache.tapestry.valid.ValidationDelegate" property="delegate" />
<parameter name="method" default-value="literal:post">
<description>
@@ -33,71 +31,61 @@
</description>
</parameter>
-<parameter name="success">
- <description>
- Object invoked when the form is submitted normally (not a cancel or a refresh) and
- the validation delegate contains no errors.
- </description>
-</parameter>
-
- <parameter name="cancel">
- <description>
- Object invoked when the form is cancelled (a special type of form submission).
- The cancel listener (if any) overrides the standard listener. Other properties
- will not be affected by the rewind.
- </description>
- </parameter>
-
- <parameter name="refresh">
- <description>
- Object invoked when the form is refreshed (a special type of form submission).
- The refresh listener (if any) overrides the standard listener.
- Other properties managed by enclosed components will be updated.
- </description>
- </parameter>
-
- <parameter name="listener">
+ <parameter name="success">
<description>
- Default listener used when no other listener is invoked.
+ Object invoked when the form is submitted normally (not a cancel or a refresh) and the
+ validation delegate contains no errors.
</description>
</parameter>
+ <parameter name="cancel">
+ <description>
+ Object invoked when the form is cancelled (a special type of form submission). The
+ cancel listener (if any) overrides the standard listener. Other properties will not be
+ affected by the rewind.
+ </description>
+ </parameter>
- <parameter name="stateful" default-value="true">
+ <parameter name="refresh">
<description>
- If true (the default), then an active session is required when the Go
- is submitted, if a session was active when the Go was rendered.
+ Object invoked when the form is refreshed (a special type of form submission). The
+ refresh listener (if any) overrides the standard listener. Other properties managed by
+ enclosed components will be updated.
</description>
</parameter>
- <parameter name="direct" default-value="true">
+ <parameter name="listener">
+ <description>Default listener used when no other listener is invoked.</description>
+ </parameter>
+
+
+ <parameter name="stateful" default-value="true">
<description>
- If true (the default), then the more efficient direct service is used.
- If false, then the action service is used.
+ If true (the default), then an active session is required when the Go is submitted, if a
+ session was active when the Go was rendered.
</description>
</parameter>
-
+
<parameter name="scheme">
<description>
- Forces the link to be generated as an absolute URL with the given scheme
- (unless the scheme matches the scheme for the current request).
+ Forces the link to be generated as an absolute URL with the given scheme (unless the
+ scheme matches the scheme for the current request).
</description>
- </parameter>
-
+ </parameter>
+
<parameter name="port">
<description>
- Forces the link to be generated as an absolute URL with the given port
- (unless the port matches the port for the current request).
+ Forces the link to be generated as an absolute URL with the given port (unless the port
+ matches the port for the current request).
</description>
</parameter>
-
- <reserved-parameter name="href"/>
- <reserved-parameter name="name"/>
- <inject property="directService" object="engine-service:direct"/>
- <inject property="actionService" object="engine-service:action"/>
- <inject property="response" object="infrastructure:response"/>
- <inject property="listenerInvoker" object="infrastructure:listenerInvoker"/>
-
+ <reserved-parameter name="href" />
+ <reserved-parameter name="name" />
+
+ <inject property="directService" object="engine-service:direct" />
+ <inject property="response" object="infrastructure:response" />
+ <inject property="listenerInvoker" object="infrastructure:listenerInvoker" />
+
</component-specification>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml Sun Jul 16 08:36:31 2006
@@ -143,9 +143,9 @@
<!-- Click the dummy form (using action service). -->
<request>
- <parameter name="service" value="action"/>
+ <parameter name="service" value="direct"/>
<parameter name="page" value="Home"/>
- <parameter name="action" value="1"/>
+ <parameter name="direct" value="1"/>
<parameter name="component" value="dummy"/>
<parameter name="formids" value=""/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSelectOption.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSelectOption.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSelectOption.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSelectOption.xml Sun Jul 16 08:36:31 2006
@@ -290,7 +290,7 @@
<assert-output name="Second Form">
<![CDATA[
-<form method="post" action="/selopt/app" name="Form1" id="Form1">
+<form method="post" action="/selopt/app" name="Form_0" id="Form_0" direct="false">
]]>
</assert-output>
</request>
@@ -298,8 +298,8 @@
<!-- Submit the second form. -->
<request>
- <parameter name="service" value="action"/>
- <parameter name="action" value="1"/>
+ <parameter name="service" value="direct"/>
+ <parameter name="direct" value="1"/>
<parameter name="session" value="1"/>
<parameter name="page" value="Four"/>
<parameter name="component" value="$Form_0"/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLComponents.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLComponents.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLComponents.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLComponents.xml Sun Jul 16 08:36:31 2006
@@ -111,11 +111,9 @@
]]>
<match>u</match>
<match>formids</match>
- <match>action</match>
<match>component</match>
<match>page</match>
<match>service</match>
- <match>reservedids</match>
<match>submitmode</match>
<match>submitname</match>
<match>l</match>
@@ -129,9 +127,7 @@
<match>0</match>
<match>go</match>
<match>Home</match>
- <match>action</match>
- <match>action</match>
- <match></match>
+ <match>direct</match>
<match></match>
<match>$(username)</match>
<match>$(l)</match>
@@ -140,12 +136,12 @@
</request>
<request>
- <parameter name="service" value="action"/>
+ <parameter name="service" value="direct"/>
<parameter name="page" value="Home"/>
- <parameter name="action" value="0"/>
+ <parameter name="direct" value="0"/>
<parameter name="component" value="go"/>
<parameter name="formids" value="u,l"/>
- <parameter name="reservedids" value="action"/>
+ <parameter name="reservedids" value="direct"/>
<parameter name="u" value="newbie"/>
<parameter name="l" value="0"/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml Sun Jul 16 08:36:31 2006
@@ -65,70 +65,12 @@
</request>
<request>
- <parameter name="service" value="page"/>
+ <parameter name="service" value="direct"/>
<parameter name="page" value="Rewind"/>
-
- <assert-output name="Card">
- <![CDATA[
- <card id="Postfield">
- ]]>
- </assert-output>
-
- <assert-output-matches name="Go Parameter Names" subgroup="1">
- <![CDATA[
- <postfield name="(.*?)".*?/>
- ]]>
- <match>u</match>
- <match>formids</match>
- <match>component</match>
- <match>page</match>
- <match>service</match>
- <match>submitmode</match>
- <match>submitname</match>
-
- <match>formids</match>
- <match>action</match>
- <match>component</match>
- <match>page</match>
- <match>service</match>
- <match>reservedids</match>
- <match>submitmode</match>
- <match>submitname</match>
- <match>v</match>
- </assert-output-matches>
-
- <assert-output-matches name="Go Parameter Values" subgroup="1">
- <![CDATA[
- <postfield .*?value="(.*?)"/>
- ]]>
- <match>u</match>
- <match>g</match>
- <match>Rewind</match>
- <match>direct</match>
- <match></match>
- <match></match>
- <match>$(u)</match>
-
- <match>v</match>
- <match>1</match>
- <match>h</match>
- <match>Rewind</match>
- <match>action</match>
- <match>action</match>
- <match></match>
- <match></match>
- <match>$(v)</match>
- </assert-output-matches>
-
- </request>
-
- <request>
- <parameter name="service" value="action"/>
- <parameter name="page" value="Rewind"/>
- <parameter name="action" value="1"/>
+ <parameter name="direct" value="1"/>
<parameter name="component" value="h"/>
<parameter name="formids" value="v"/>
- <parameter name="reservedids" value="action"/>
+ <parameter name="reservedids" value="direct"/>
<parameter name="v" value="VVV"/>
<assert-output name="Card">
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml Sun Jul 16 08:36:31 2006
@@ -71,8 +71,8 @@
<request>
- <parameter name="service" value="action"/>
- <parameter name="action" value="0"/>
+ <parameter name="service" value="direct"/>
+ <parameter name="direct" value="0"/>
<parameter name="page" value="Select"/>
<parameter name="component" value="go"/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml Sun Jul 16 08:36:31 2006
@@ -48,13 +48,6 @@
]]>
</assert-output>
-
- <assert-output name="ActionLink URL">
- <![CDATA[
- href="/mock/app?action=0&component=actionLink&page=Stale&service=action"
- ]]>
- </assert-output>
-
<assert-output-matches name="Go Parameter Names" subgroup="1">
<![CDATA[
<postfield name="(.*?)".*?/>
@@ -89,20 +82,6 @@
<assert-output name="StaleSession (DirectLink)">
- <![CDATA[
- <card id="StaleSession" title="StaleSession">
- ]]>
- </assert-output>
- </request>
-
- <request>
- <parameter name="service" value="action"/>
- <parameter name="session" value="T"/>
- <parameter name="page" value="Stale"/>
- <parameter name="action" value="0"/>
- <parameter name="component" value="actionLink"/>
-
- <assert-output name="StaleSession (ActionLink)">
<![CDATA[
<card id="StaleSession" title="StaleSession">
]]>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context17/Home.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context17/Home.html?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context17/Home.html (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context17/Home.html Sun Jul 16 08:36:31 2006
@@ -12,7 +12,7 @@
<br/>
-<form jwcid="@Form" direct="ognl:false"/>
+<form jwcid="@Form" />
</body>
</html>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java Sun Jul 16 08:36:31 2006
@@ -90,7 +90,7 @@
ListenerInvoker invoker = newListenerInvoker();
Form form = newInstance(FormFixture.class, new Object[]
- { "id", "myform", "direct", true, "expectedWriter", writer, "expectedRequestCycle", cycle,
+ { "id", "myform", "expectedWriter", writer, "expectedRequestCycle", cycle,
"formSupport", support, "listener", listener, "listenerInvoker", invoker,
"delegate", delegate });
@@ -141,7 +141,7 @@
IValidationDelegate delegate = newDelegate();
Form form = newInstance(FormFixture.class, new Object[]
- { "id", "myform", "direct", true, "expectedWriter", writer, "expectedRequestCycle", cycle,
+ { "id", "myform", "expectedWriter", writer, "expectedRequestCycle", cycle,
"formSupport", support, "response", response, "directService", direct, "method",
"post", "delegate", delegate });
@@ -188,7 +188,7 @@
IValidationDelegate delegate = newDelegate();
Form form = newInstance(FormFixture.class, new Object[]
- { "id", "myform", "direct", true, "expectedWriter", writer, "expectedRequestCycle", cycle,
+ { "id", "myform", "expectedWriter", writer, "expectedRequestCycle", cycle,
"formSupport", support, "response", response, "directService", direct, "method",
"post", "delegate", delegate, "scheme", "https", "port", new Integer(443) });
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.html?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.html (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.html Sun Jul 16 08:36:31 2006
@@ -6,9 +6,6 @@
A <a jwcid="directLink">DirectLink</a> that will trigger StaleSessionException.
<p>
-A <a jwcid="actionLink">ActionLink</a> that will trigger StaleSessionException.
-
-<p>
A
<form jwcid="form">
<input type="submit" value="Form"/>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.page?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.page (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/Stale.page Sun Jul 16 08:36:31 2006
@@ -29,10 +29,6 @@
<binding name="listener" expression="listeners.noop"/>
</component>
- <component id="actionLink" type="ActionLink">
- <binding name="listener" expression="listeners.noop"/>
- </component>
-
<component id="form" type="Form">
<binding name="listener" expression="listeners.noop"/>
</component>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Home.wml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Home.wml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Rewind.wml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Rewind.wml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Stale.wml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/wml/Stale.wml?rev=422446&r1=422445&r2=422446&view=diff
==============================================================================
Binary files - no diff available.