You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/07/16 21:35:45 UTC

svn commit: r422511 - in /tapestry/tapestry4/trunk: config/ tapestry-annotations/ tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ tapestry-examples/TimeTracker/ tapestry-examples/Vlib/ tapestry-examples/VlibBeans/ tapestry-examples/Workbenc...

Author: jkuhnert
Date: Sun Jul 16 12:35:44 2006
New Revision: 422511

URL: http://svn.apache.org/viewvc?rev=422511&view=rev
Log:
Removed deprecated methods from RequestCycle/Form

Removed:
    tapestry/tapestry4/trunk/config/build.properties.sample
    tapestry/tapestry4/trunk/config/common.properties
    tapestry/tapestry4/trunk/config/doap_Tapestry.rdf
    tapestry/tapestry4/trunk/tapestry-annotations/build.xml
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/build.xml
    tapestry/tapestry4/trunk/tapestry-examples/Vlib/build.xml
    tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/build.xml
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/build.xml
    tapestry/tapestry4/trunk/tapestry-examples/wap/build.xml
    tapestry/tapestry4/trunk/tapestry-framework/build.xml
    tapestry/tapestry4/trunk/tapestry-portlet/build.xml
Modified:
    tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IForm.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.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/FormSupportImpl.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java

Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java Sun Jul 16 12:35:44 2006
@@ -71,10 +71,9 @@
 
         cycle.setAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME,
                 linkComponent);
-
-        String actionId = cycle.getNextActionId();
-        String formName = "LinkForm" + actionId;
-
+        
+        String formName = cycle.getUniqueId("LinkForm");
+        
         boolean hasBody = getHasBody();
 
         boolean disabled = linkComponent.isDisabled();

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java Sun Jul 16 12:35:44 2006
@@ -26,7 +26,6 @@
 import org.apache.hivemind.Messages;
 import org.apache.hivemind.impl.BaseLocatable;
 import org.apache.hivemind.util.Defense;
-import org.apache.hivemind.util.PropertyUtils;
 import org.apache.tapestry.bean.BeanProvider;
 import org.apache.tapestry.engine.IPageLoader;
 import org.apache.tapestry.event.BrowserEvent;
@@ -770,30 +769,6 @@
     }
 
     /**
-     * Sets a property of a component.
-     * 
-     * @see IComponent
-     * @since 3.0
-     * @deprecated
-     */
-    public void setProperty(String propertyName, Object value)
-    {
-        PropertyUtils.write(this, propertyName, value);
-    }
-
-    /**
-     * Gets a property of a component.
-     * 
-     * @see IComponent
-     * @since 3.0
-     * @deprecated
-     */
-    public Object getProperty(String propertyName)
-    {
-        return PropertyUtils.read(this, propertyName);
-    }
-
-    /**
      * @since 4.0
      */
 
@@ -836,71 +811,6 @@
     public IComponentSpecification getSpecification()
     {
         throw new IllegalStateException(TapestryMessages.providedByEnhancement("getSpecification"));
-    }
-
-    /**
-     * Returns a localized message.
-     * 
-     * @since 3.0
-     * @deprecated To be removed in 4.1. Use {@link #getMessages()} instead.
-     */
-
-    public String getMessage(String key)
-    {
-        return getMessages().getMessage(key);
-    }
-
-    /**
-     * Formats a localized message string, using
-     * {@link Messages#format(java.lang.String, java.lang.Object[])}.
-     * 
-     * @param key
-     *            the key used to obtain a localized pattern
-     * @param arguments
-     *            passed to the formatter
-     * @since 3.0
-     * @deprecated To be removed in 4.1. Use {@link #getMessages()} instead.
-     */
-
-    public String format(String key, Object[] arguments)
-    {
-        return getMessages().format(key, arguments);
-    }
-
-    /**
-     * Convienience method for invoking {@link IMessages#format(String, Locale, Object)}.
-     * 
-     * @since 3.0
-     * @deprecated To be removed in 4.1. Use {@link #getMessages()} instead.
-     */
-
-    public String format(String key, Object argument)
-    {
-        return getMessages().format(key, argument);
-    }
-
-    /**
-     * Convienience method for invoking {@link Messages#format(String, Object, Object)}.
-     * 
-     * @since 3.0
-     * @deprecated To be removed in 4.1. Use {@link #getMessages()} instead.
-     */
-
-    public String format(String key, Object argument1, Object argument2)
-    {
-        return getMessages().format(key, argument1, argument2);
-    }
-
-    /**
-     * Convienience method for {@link Messages#format(String, Object, Object, Object)}.
-     * 
-     * @since 3.0
-     * @deprecated To be removed in 4.1. Use {@link #getMessages()} instead.
-     */
-
-    public String format(String key, Object argument1, Object argument2, Object argument3)
-    {
-        return getMessages().format(key, argument1, argument2, argument3);
     }
 
     /** @since 4.0 */

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java Sun Jul 16 12:35:44 2006
@@ -282,30 +282,6 @@
     void setNamespace(INamespace namespace);
 
     /**
-     * Sets a property of a component.
-     * 
-     * @param propertyName
-     *            the property name
-     * @param value
-     *            the provided value
-     * @deprecated To be removed in 4.1. Use
-     *             {@link org.apache.hivemind.util.PropertyUtils#read(java.lang.Object, java.lang.String) instead.
-     */
-    void setProperty(String propertyName, Object value);
-
-    /**
-     * Gets a property of a component.
-     * 
-     * @param propertyName
-     *            the property name
-     * @return Object the value of property
-     * @deprecated To be removed in 4.1. Use
-     *             {@link org.apache.hivemind.util.PropertyUtils#read(java.lang.Object, java.lang.String)}
-     *             instead
-     */
-    Object getProperty(String propertyName);
-
-    /**
      * Returns true if the component is currently rendering.
      * 
      * @since 4.0
@@ -341,20 +317,6 @@
      */
 
     ListenerMap getListeners();
-
-    /**
-     * Returns a localized string message. Each component has an optional set of localized message
-     * strings that are read from properties files.
-     * 
-     * @param key
-     *            the key used to locate the message
-     * @return the localized message for the key, or a placeholder if no message is defined for the
-     *         key.
-     * @since 3.0
-     * @deprecated To be removed in release 4.1. Use {@link #getMessages()} instead.
-     */
-
-    String getMessage(String key);
 
     /**
      * Returns the {@link org.apache.tapestry.spec.IContainedComponent}. This will be null for

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=422511&r1=422510&r2=422511&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 12:35:44 2006
@@ -29,16 +29,6 @@
 
 public interface IForm extends IComponent, FormBehavior
 {
-
-    /**
-     * Attribute name used with the request cycle; allows other components to locate the IForm.
-     * 
-     * @since 1.0.5
-     * @deprecated To be removed; use {@link TapestryUtils#FORM_ATTRIBUTE}instead.
-     */
-
-    String ATTRIBUTE_NAME = TapestryUtils.FORM_ATTRIBUTE;
-
     /**
      * Invoked by the {@link IRequestCycle}to allow a form that uses the direct service, to respond
      * to the form submission.

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java Sun Jul 16 12:35:44 2006
@@ -35,6 +35,7 @@
  * <li>Tracking changes to page properties, and restoring pages to prior states
  * <li>Pooling of page objects
  * </ul>
+ * 
  * <p>
  * A request cycle is broken up into two phases. The <em>rewind</em> phase is optional, as it tied
  * to {@link org.apache.tapestry.link.ActionLink}or {@link org.apache.tapestry.form.Form}
@@ -45,10 +46,12 @@
  * {@link org.apache.tapestry.components.Conditional}, etc.). Once this component is reached, it
  * can notify its {@link IActionListener}. The listener has the ability to update the state of any
  * pages and select a new result page.
+ * </p>
+ * 
  * <p>
  * Following the rewind phase is the <em>render</em> phase. During the render phase, a page is
  * actually rendered and output sent to the client web browser.
- * 
+ * </p>
  * @author Howard Lewis Ship
  */
 
@@ -84,16 +87,6 @@
     Object getAttribute(String name);
 
     /**
-     * Returns the next action id. ActionLink ids are used to identify different actions on a page
-     * (URLs that are related to dynamic page state).
-     * 
-     * @deprecated To be removed in release 4.1 with no replacement.
-     * @see #getUniqueId(String)
-     */
-
-    String getNextActionId();
-
-    /**
      * Identifies the active page, the page which will ultimately render the response.
      */
 
@@ -159,17 +152,6 @@
      */
 
     void renderPage(ResponseBuilder builder);
-
-    /**
-     * Rewinds a page and executes some form of action when the component with the specified action
-     * id is reached.
-     * 
-     * @see IAction
-     * @see org.apache.tapestry.link.ActionLink
-     * @deprecated To be removed in 4.1 with no replacement.
-     */
-
-    void rewindPage(String targetActionId, IComponent targetComponent);
 
     /**
      * Allows a temporary object to be stored in the request cycle, which allows otherwise unrelated

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java Sun Jul 16 12:35:44 2006
@@ -82,14 +82,6 @@
     }
 
     /**
-     * @deprecated Use {@link #getInvoker()} instead.
-     */
-    public IComponent getInserter()
-    {
-        return _invoker;
-    }
-
-    /**
      * Returns the object which invoked this Block's
      * {@link #renderForComponent(IMarkupWriter, IRequestCycle, IComponent)} method. This is often
      * used to access the informal parameters of a {@link RenderBlock} component.

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java Sun Jul 16 12:35:44 2006
@@ -104,8 +104,6 @@
 
     private Map _attributes = new HashMap();
 
-    private int _actionId;
-
     private int _targetActionId;
 
     private IComponent _targetComponent;
@@ -207,12 +205,6 @@
         return _attributes.get(name);
     }
 
-    /** @deprecated */
-    public String getNextActionId()
-    {
-        return Integer.toHexString(++_actionId);
-    }
-
     public IPage getPage()
     {
         return _page;
@@ -313,9 +305,6 @@
         if (!_rewinding)
             return false;
 
-        if (_actionId != _targetActionId)
-            return false;
-
         // OK, we're there, is the page is good order?
 
         if (component == _targetComponent)
@@ -343,8 +332,6 @@
     public void renderPage(ResponseBuilder builder)
     {
         _rewinding = false;
-        _actionId = -1;
-        _targetActionId = 0;
 
         try
         {
@@ -377,8 +364,6 @@
 
     private void reset()
     {
-        _actionId = 0;
-        _targetActionId = 0;
         _attributes.clear();
         _idAllocator.clear();
     }
@@ -399,16 +384,7 @@
     {
         IPage page = form.getPage();
         _rewinding = true;
-
-        // Fake things a little for getNextActionId() / isRewound()
-        // This used to be more involved (and include service parameters, and a parameter
-        // to this method), when the actionId was part of the Form name. That's not longer
-        // necessary (no service parameters), and we can fake things here easily enough with
-        // fixed actionId of 0.
-
-        _targetActionId = 0;
-        _actionId = -1;
-
+        
         _targetComponent = form;
 
         try
@@ -446,63 +422,6 @@
             reset();
             _rewinding = false;
         }
-    }
-
-    /**
-     * Rewinds the page by invoking {@link IPage#renderPage(ResponseBuilder, IRequestCycle)}.
-     * <p>
-     * The process is expected to end with a {@link RenderRewoundException}. If the entire page is
-     * renderred without this exception being thrown, it means that the target action id was not
-     * valid, and a {@link ApplicationRuntimeException}is thrown.
-     * <p>
-     * This clears all attributes.
-     * 
-     * @deprecated To be removed in 4.1 with no replacement.
-     */
-
-    public void rewindPage(String targetActionId, IComponent targetComponent)
-    {
-        _rewinding = true;
-
-        _actionId = -1;
-        
-        // Parse the action Id as hex since that's whats generated
-        // by getNextActionId()
-        _targetActionId = Integer.parseInt(targetActionId, 16);
-        _targetComponent = targetComponent;
-        
-        try
-        {
-            _page.renderPage(getResponseBuilder(), this);
-            
-            // Shouldn't get this far, because the target component should
-            // throw the RenderRewoundException.
-
-            throw new StaleLinkException(_page, targetActionId, targetComponent.getExtendedId());
-        }
-        catch (RenderRewoundException ex)
-        {
-            // This is acceptible and expected.
-        }
-        catch (ApplicationRuntimeException ex)
-        {
-            // ApplicationRuntimeExceptions don't need to be wrapped.
-            throw ex;
-        }
-        catch (Throwable ex)
-        {
-            // But wrap other exceptions in a RequestCycleException ... this
-            // will ensure that some of the context is available.
-
-            throw new ApplicationRuntimeException(ex.getMessage(), _page, null, ex);
-        }
-        finally
-        {
-            _rewinding = false;
-
-            reset();
-        }
-
     }
 
     public void setAttribute(String name, Object value)

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java Sun Jul 16 12:35:44 2006
@@ -15,6 +15,7 @@
 package org.apache.tapestry.error;
 
 import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.hivemind.util.PropertyUtils;
 import org.apache.tapestry.IPage;
 import org.apache.tapestry.IRequestCycle;
 import org.apache.tapestry.services.ResponseRenderer;
@@ -39,9 +40,9 @@
         try
         {
             IPage exceptionPage = cycle.getPage(_exceptionPageName);
-
-            exceptionPage.setProperty("exception", cause);
-
+            
+            PropertyUtils.write(exceptionPage, "exception", cause);
+            
             cycle.activate(exceptionPage);
 
             _responseRenderer.renderResponse(cycle);

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=422511&r1=422510&r2=422511&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 12:35:44 2006
@@ -80,19 +80,6 @@
     private IRender _renderInformalParameters;
 
     /**
-     * Returns the currently active {@link IForm}, or null if no form is active. This is a
-     * convienience method, the result will be null, or an instance of {@link IForm}, but not
-     * necessarily a <code>Form</code>.
-     * 
-     * @deprecated Use {@link TapestryUtils#getForm(IRequestCycle, IComponent)} instead.
-     */
-
-    public static IForm get(IRequestCycle cycle)
-    {
-        return (IForm) cycle.getAttribute(ATTRIBUTE_NAME);
-    }
-
-    /**
      * Indicates to any wrapped form components that they should respond to the form submission.
      * 
      * @throws ApplicationRuntimeException
@@ -202,10 +189,8 @@
 
     protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
     {
-        String actionId = cycle.getNextActionId();
-
         _formSupport = newFormSupport(writer, cycle);
-
+        
         if (isRewinding())
         {
             String submitType = _formSupport.rewind();
@@ -221,15 +206,15 @@
 
         // Note: not safe to invoke getNamespace() in Portlet world
         // except during a RenderRequest.
-
+        
         String baseName = constructFormNameForDirectService(cycle);
         
         _name = baseName + getResponse().getNamespace();
         
         if (_renderInformalParameters == null)
             _renderInformalParameters = new RenderInformalParameters();
-
-        ILink link = getLink(cycle, actionId);
+        
+        ILink link = getLink(cycle);
         
         _formSupport.render(getMethod(), _renderInformalParameters, link, getScheme(), getPort());
     }
@@ -256,18 +241,6 @@
     }
 
     /**
-     * Construct a form name for use with the action service. This implementation returns "Form"
-     * appended with the actionId.
-     * 
-     * @since 4.0
-     */
-
-    protected String constructFormNameForActionService(String actionId)
-    {
-        return "Form" + actionId;
-    }
-
-    /**
      * Constructs a form name for use with the direct service. This implementation bases the form
      * name on the form component's id (but ensures it is unique). Remember that Tapestry assigns an
      * "ugly" id if an explicit component id is not provided.
@@ -323,12 +296,12 @@
     }
     
     /**
-     * Builds the EngineServiceLink for the form, using either the direct or action service.
+     * Builds the EngineServiceLink for the form.
      * 
      * @since 1.0.3
      */
 
-    private ILink getLink(IRequestCycle cycle, String actionId)
+    private ILink getLink(IRequestCycle cycle)
     {
         Object parameter = new DirectServiceParameter(this);
         return getDirectService().getLink(true, parameter);

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java Sun Jul 16 12:35:44 2006
@@ -390,7 +390,7 @@
     public String getElementId(IFormComponent component, String baseId)
     {
         // $ is not a valid character in an XML/XHTML id, so convert it to an underscore.
-
+        
         String filteredId = TapestryUtils.convertTapestryIdToNMToken(baseId);
 
         String result = _elementIdAllocator.allocateId(filteredId);
@@ -404,7 +404,7 @@
             }
 
             String expected = (String) _allocatedIds.get(_allocatedIdIndex);
-
+            
             if (!result.equals(expected))
                 throw new StaleLinkException(FormMessages.formIdMismatch(
                         _form,
@@ -589,11 +589,11 @@
         // The other case, _allocatedIdIndex > expected, is
         // checked for inside getElementId(). Remember that
         // _allocatedIdIndex is incremented after allocating.
-
+        
         if (_allocatedIdIndex < expected)
         {
             String nextExpectedId = (String) _allocatedIds.get(_allocatedIdIndex);
-
+            
             throw new StaleLinkException(FormMessages.formTooFewIds(_form, expected
                     - _allocatedIdIndex, nextExpectedId), _form);
         }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/TestComponentMessageAccess.java Sun Jul 16 12:35:44 2006
@@ -51,7 +51,7 @@
 
         replay();
 
-        assertEquals("flintstone", ac.getMessage("fred"));
+        assertEquals("flintstone", ac.getMessages().getMessage("fred"));
 
         verify();
     }
@@ -67,7 +67,7 @@
 
         replay();
 
-        assertEquals("Fred Flintstone", ac.format("fred", "flintstone"));
+        assertEquals("Fred Flintstone", ac.getMessages().format("fred", "flintstone"));
 
         verify();
 
@@ -75,7 +75,7 @@
 
         replay();
 
-        assertEquals("flintstone family", ac.format("fred", "wilma", "dino"));
+        assertEquals("flintstone family", ac.getMessages().format("fred", "wilma", "dino"));
 
         verify();
 
@@ -83,7 +83,7 @@
 
         replay();
 
-        assertEquals("flintstone family 2", ac.format("fred", "wilma", "dino", "pebbles"));
+        assertEquals("flintstone family 2", ac.getMessages().format("fred", "wilma", "dino", "pebbles"));
 
         verify();
 
@@ -94,7 +94,7 @@
 
         replay();
 
-        assertEquals("flintstone family 3", ac.format("fred", arguments));
+        assertEquals("flintstone family 3", ac.getMessages().format("fred", arguments));
 
         verify();
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestBlock.java Sun Jul 16 12:35:44 2006
@@ -51,7 +51,6 @@
             public void render(IMarkupWriter pwriter, IRequestCycle pcycle)
             {
                 assertSame(block.getInvoker(), invoker);
-                assertSame(block.getInserter(), invoker);
             }
         };
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java Sun Jul 16 12:35:44 2006
@@ -17,6 +17,7 @@
 import static org.testng.AssertJUnit.assertSame;
 
 import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.hivemind.util.PropertyUtils;
 import org.apache.tapestry.IPage;
 import org.apache.tapestry.IRequestCycle;
 import org.apache.tapestry.html.BasePage;
@@ -57,7 +58,7 @@
 
         verify();
 
-        assertSame(cause, page.getProperty("exception"));
+        assertSame(cause, PropertyUtils.read(page, "exception"));
     }
 
     public void testFailure() throws Exception
@@ -96,7 +97,7 @@
         }
 
         verify();
-
-        assertSame(cause, page.getProperty("exception"));
+        
+        assertSame(cause, PropertyUtils.read(page, "exception"));
     }
-}
\ No newline at end of file
+}

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=422511&r1=422510&r2=422511&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 12:35:44 2006
@@ -55,11 +55,6 @@
         return newMock(FormSupport.class);
     }
 
-    protected void trainGetNextActionId(IRequestCycle cycle, String actionId)
-    {
-        expect(cycle.getNextActionId()).andReturn(actionId);
-    }
-
     protected void trainGetUniqueId(IRequestCycle cycle, String baseId, String uniqueId)
     {
         expect(cycle.getUniqueId(baseId)).andReturn(uniqueId);
@@ -95,8 +90,6 @@
                 "delegate", delegate });
 
         trainStoreForm(cycle, form);
-
-        trainGetNextActionId(cycle, "7");
         
         trainIsRewinding(support, true);
         
@@ -146,8 +139,6 @@
                 "post", "delegate", delegate });
 
         trainStoreForm(cycle, form);
-
-        trainGetNextActionId(cycle, "7");
         
         trainIsRewinding(support, false);
         
@@ -193,8 +184,6 @@
                 "post", "delegate", delegate, "scheme", "https", "port", new Integer(443) });
         
         trainStoreForm(cycle, form);
-        
-        trainGetNextActionId(cycle, "7");
         
         trainIsRewinding(support, false);
         

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java Sun Jul 16 12:35:44 2006
@@ -19,6 +19,7 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
+import org.apache.hivemind.util.PropertyUtils;
 import org.apache.tapestry.IBinding;
 import org.apache.tapestry.IForm;
 import org.apache.tapestry.IMarkupWriter;
@@ -265,7 +266,7 @@
 
         component.render(writer, cycle);
 
-        assertNull(component.getProperty("value"));
+        assertNull(PropertyUtils.read(component, "value"));
 
         verify();
     }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java?rev=422511&r1=422510&r2=422511&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java Sun Jul 16 12:35:44 2006
@@ -19,6 +19,7 @@
 import static org.testng.AssertJUnit.assertSame;
 
 import org.apache.hivemind.Location;
+import org.apache.hivemind.util.PropertyUtils;
 import org.apache.tapestry.BindingException;
 import org.apache.tapestry.IBinding;
 import org.apache.tapestry.IForm;
@@ -137,7 +138,7 @@
 
         verify();
 
-        assertSame(translatedValue, component.getProperty("value"));
+        assertSame(translatedValue, PropertyUtils.read(component, "value"));
     }
 
     public void testRewindNoValidator()