You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2010/06/03 01:37:12 UTC

svn commit: r950825 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/internal/ main/java/org/apache/tapestry5/internal/services/ main/java/org/apache/tapestry5/internal/services/linktransf...

Author: hlship
Date: Wed Jun  2 23:37:12 2010
New Revision: 950825

URL: http://svn.apache.org/viewvc?rev=950825&view=rev
Log:
TAP5-1042: Add new decoding methods for link transformers, and thread those into normal execution

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/TapestryConstants.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerInterceptor.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LocalizationSetter.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImplTest.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/TapestryConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/TapestryConstants.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/TapestryConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/TapestryConstants.java Wed Jun  2 23:37:12 2010
@@ -14,6 +14,10 @@
 
 package org.apache.tapestry5;
 
+import org.apache.tapestry5.internal.structure.PageResetListener;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
+import org.apache.tapestry5.services.ComponentEventLinkEncoder;
+
 /**
  * Constants needed by end-user classes.
  * 
@@ -28,4 +32,20 @@ public class TapestryConstants
      */
     public static final String TEMPLATE_EXTENSION = "tml";
 
+    /**
+     * Name of query parameter that is placed on "loopback" links (page render links for the same
+     * page). This mostly includes the redirects sent after a component event request. Page render
+     * requests
+     * that do <em>not</em> have the LOOPBACK query parameter will trigger a {@linkplain PageResetListener reset
+     * notification} after the initialization event; the
+     * LOOPBACK
+     * prevents this reset notification.
+     * 
+     * @since 5.2.0
+     * @see ComponentEventLinkEncoder#createPageRenderLink(org.apache.tapestry5.services.PageRenderRequestParameters)
+     * @see ComponentEventLinkEncoder#decodePageRenderRequest(org.apache.tapestry5.services.Request)
+     * @see PageResetListener
+     */
+    public static final String PAGE_LOOPBACK_PARAMETER_NAME = "t:lb";
+
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java Wed Jun  2 23:37:12 2010
@@ -14,7 +14,6 @@
 
 package org.apache.tapestry5.internal;
 
-import org.apache.tapestry5.internal.structure.PageResetListener;
 import org.apache.tapestry5.ioc.util.TimeInterval;
 import org.apache.tapestry5.services.javascript.JavascriptStack;
 
@@ -52,19 +51,6 @@ public final class InternalConstants
      */
     public static final String CONTAINER_PAGE_NAME = "t:cp";
 
-    /**
-     * Name of query parameter that is placed on "loopback" links (page render links for the same
-     * page). This mostly includes the redirects sent after a component event request. Page render
-     * requests
-     * that do <em>not</em> have the LOOPBACK query parameter will trigger a {@linkplain PageResetListener reset
-     * notification} after the initialization event; the
-     * LOOPBACK
-     * prevents this reset notification.
-     * 
-     * @since 5.2.0
-     */
-    public static final String LOOPBACK = "t:lb";
-
     public static final String OBJECT_RENDER_DIV_SECTION = "t-env-data-section";
 
     public static final String MIXINS_SUBPACKAGE = "mixins";

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImpl.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImpl.java Wed Jun  2 23:37:12 2010
@@ -18,6 +18,7 @@ import org.apache.tapestry5.EventConstan
 import org.apache.tapestry5.EventContext;
 import org.apache.tapestry5.Link;
 import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.TapestryConstants;
 import org.apache.tapestry5.internal.InternalConstants;
 import org.apache.tapestry5.ioc.annotations.Symbol;
 import org.apache.tapestry5.ioc.internal.util.InternalUtils;
@@ -125,7 +126,7 @@ public class ComponentEventLinkEncoderIm
         Link link = new LinkImpl(builder.toString(), baseURL == null, false, response, optimizer);
 
         if (parameters.isLoopback())
-            link.addParameter(InternalConstants.LOOPBACK, "t");
+            link.addParameter(TapestryConstants.PAGE_LOOPBACK_PARAMETER_NAME, "t");
 
         return link;
     }
@@ -342,7 +343,7 @@ public class ComponentEventLinkEncoderIm
 
         String canonicalized = componentClassResolver.canonicalizePageName(pageName);
 
-        boolean loopback = request.getParameter(InternalConstants.LOOPBACK) != null;
+        boolean loopback = request.getParameter(TapestryConstants.PAGE_LOOPBACK_PARAMETER_NAME) != null;
 
         return new PageRenderRequestParameters(canonicalized, activationContext, loopback);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java Wed Jun  2 23:37:12 2010
@@ -124,7 +124,7 @@ public class LocalizationSetterImpl impl
 
     public boolean setLocaleFromLocaleName(String localeName)
     {
-        boolean supported = supportedLocaleNames.contains(localeName);
+        boolean supported = isSupportedLocaleName(localeName);
 
         if (supported)
         {
@@ -161,7 +161,7 @@ public class LocalizationSetterImpl impl
 
         while (true)
         {
-            if (supportedLocaleNames.contains(localeName))
+            if (isSupportedLocaleName(localeName))
                 return toLocale(localeName);
 
             localeName = stripTerm(localeName);
@@ -185,17 +185,21 @@ public class LocalizationSetterImpl impl
         return supportedLocales;
     }
 
+    public boolean isSupportedLocaleName(String localeName)
+    {
+        return supportedLocaleNames.contains(localeName);
+    }
+
     public SelectModel getSupportedLocalesModel()
     {
         List<OptionModel> options = CollectionFactory.newList();
-        
+
         for (Locale l : supportedLocales)
         {
             options.add(new OptionModelImpl(l.getDisplayName(l), l));
         }
-        
+
         return new SelectModelImpl(null, options);
     }
-    
-    
+
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java Wed Jun  2 23:37:12 2010
@@ -18,6 +18,7 @@ import org.apache.tapestry5.Link;
 import org.apache.tapestry5.ioc.annotations.Primary;
 import org.apache.tapestry5.services.ComponentEventRequestParameters;
 import org.apache.tapestry5.services.PageRenderRequestParameters;
+import org.apache.tapestry5.services.Request;
 import org.apache.tapestry5.services.linktransform.ComponentEventLinkTransformer;
 import org.apache.tapestry5.services.linktransform.LinkTransformer;
 import org.apache.tapestry5.services.linktransform.PageRenderLinkTransformer;
@@ -41,9 +42,19 @@ public class LinkTransformerImpl impleme
         return or(componentEventLinkTransformer.transformComponentEventLink(defaultLink, parameters), defaultLink);
     }
 
-    public Link tranformPageRenderLink(Link defaultLink, PageRenderRequestParameters parameters)
+    public Link transformPageRenderLink(Link defaultLink, PageRenderRequestParameters parameters)
     {
-        return or(pageRenderLinkTransformer.tranformPageRenderLink(defaultLink, parameters), defaultLink);
+        return or(pageRenderLinkTransformer.transformPageRenderLink(defaultLink, parameters), defaultLink);
+    }
+
+    public ComponentEventRequestParameters decodeComponentEventRequest(Request request)
+    {
+        return componentEventLinkTransformer.decodeComponentEventRequest(request);
+    }
+
+    public PageRenderRequestParameters decodePageRenderRequest(Request request)
+    {
+        return pageRenderLinkTransformer.decodePageRenderRequest(request);
     }
 
     private Link or(Link left, Link right)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerInterceptor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerInterceptor.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerInterceptor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerInterceptor.java Wed Jun  2 23:37:12 2010
@@ -47,17 +47,27 @@ public class LinkTransformerInterceptor 
 
     public Link createPageRenderLink(PageRenderRequestParameters parameters)
     {
-        return linkTransformer.tranformPageRenderLink(delegate.createPageRenderLink(parameters), parameters);
+        return linkTransformer.transformPageRenderLink(delegate.createPageRenderLink(parameters), parameters);
     }
 
     public ComponentEventRequestParameters decodeComponentEventRequest(Request request)
     {
-        return delegate.decodeComponentEventRequest(request);
+        ComponentEventRequestParameters parameters = linkTransformer.decodeComponentEventRequest(request);
+
+        if (parameters == null)
+            parameters = delegate.decodeComponentEventRequest(request);
+
+        return parameters;
     }
 
     public PageRenderRequestParameters decodePageRenderRequest(Request request)
     {
-        return delegate.decodePageRenderRequest(request);
+        PageRenderRequestParameters parameters = linkTransformer.decodePageRenderRequest(request);
+
+        if (parameters == null)
+            parameters = delegate.decodePageRenderRequest(request);
+
+        return parameters;
     }
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LocalizationSetter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LocalizationSetter.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LocalizationSetter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LocalizationSetter.java Wed Jun  2 23:37:12 2010
@@ -63,6 +63,15 @@ public interface LocalizationSetter
     List<Locale> getSupportedLocales();
 
     /**
+     * Checks to see if the indicated locale name is a supported locale name (that may have been
+     * incorporated into a request path). This is an important part of
+     * {@linkplain ComponentEventLinkEncoder#decodePageRenderRequest(Request) decoding a request}.
+     * 
+     * @since 5.2.0
+     */
+    boolean isSupportedLocaleName(String localeName);
+
+    /**
      * Returns the supported locales packaged as a model. The label for each locale comes from
      * {@link Locale#getDisplayName(Locale)} (in that locale).
      * 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java Wed Jun  2 23:37:12 2010
@@ -4,7 +4,7 @@
 // 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
+// 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,
@@ -15,14 +15,15 @@
 package org.apache.tapestry5.services;
 
 import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.TapestryConstants;
 import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.structure.PageResetListener;
 import org.apache.tapestry5.ioc.internal.util.Defense;
 
 /**
  * Used with {@link org.apache.tapestry5.services.PageRenderRequestHandler} and
  * {@link org.apache.tapestry5.services.PageRenderRequestFilter} to define the logical page name and
- * activation context for the
- * request.
+ * activation context for the request.
  */
 public class PageRenderRequestParameters
 {
@@ -30,6 +31,7 @@ public class PageRenderRequestParameters
 
     private final EventContext activationContext;
 
+    /** @since 5.2.0 */
     private final boolean loopback;
 
     /** @deprecated Use {@link #PageRenderRequestParameters(String, EventContext, boolean)  */
@@ -38,8 +40,8 @@ public class PageRenderRequestParameters
         this(logicalPageName, activationContext, false);
     }
 
-    public PageRenderRequestParameters(String logicalPageName, EventContext activationContext,
-            boolean loopback)
+    /** @since 5.2.0 */
+    public PageRenderRequestParameters(String logicalPageName, EventContext activationContext, boolean loopback)
     {
         Defense.notNull(logicalPageName, "logicalPageName");
         Defense.notNull(activationContext, "activationContext");
@@ -50,8 +52,8 @@ public class PageRenderRequestParameters
     }
 
     /**
-     * Returns a {@linkplain ComponentClassResolver#canonicalizePageName(String) canonicalized}
-     * version of the page name.
+     * Returns a {@linkplain ComponentClassResolver#canonicalizePageName(String) canonicalized} version of the page
+     * name.
      */
     public String getLogicalPageName()
     {
@@ -82,6 +84,8 @@ public class PageRenderRequestParameters
      * Is this request a loopback (a request for the same page that rendered it in the first place)?
      * 
      * @since 5.2.0
+     * @see TapestryConstants#PAGE_LOOPBACK_PARAMETER_NAME
+     * @see PageResetListener
      */
     public boolean isLoopback()
     {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/ComponentEventLinkTransformer.java Wed Jun  2 23:37:12 2010
@@ -15,12 +15,17 @@
 package org.apache.tapestry5.services.linktransform;
 
 import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.services.ComponentEventDispatcher;
 import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
 import org.apache.tapestry5.services.ComponentEventRequestParameters;
+import org.apache.tapestry5.services.LocalizationSetter;
+import org.apache.tapestry5.services.Request;
 
 /**
  * Allows for selective replacement of the default {@link Link} used to represent a component event request.
  * This is a service, but also the contribution to the service, as a chain of command.
+ * <p>
+ * This transformer follows the same pattern as {@link PageRenderLinkTransformer}.
  * 
  * @since 5.2.0
  */
@@ -37,4 +42,19 @@ public interface ComponentEventLinkTrans
      * @return a replacement Link, or null
      */
     Link transformComponentEventLink(Link defaultLink, ComponentEventRequestParameters parameters);
+
+    /**
+     * Attempts to decode the page render request, to perform the opposite action for
+     * {@link #transformComponentEventLink(Link, ComponentEventRequestParameters)}. The transformer
+     * is also responsible for identifying the locale in the request (as part of the path, or as a
+     * query parameter or cookie) and setting the locale for the request.
+     * <p>
+     * This method will be invoked from the {@link ComponentEventDispatcher} and a non-null value returned from this
+     * method will prevent the default {@link ComponentEventLinkEncoder#decodeComponentEventRequest(Request)} method
+     * from being invoked.
+     * 
+     * @return decoded parameters, or null to proceed normally
+     * @see LocalizationSetter#setLocaleFromLocaleName(String)
+     */
+    ComponentEventRequestParameters decodeComponentEventRequest(Request request);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/PageRenderLinkTransformer.java Wed Jun  2 23:37:12 2010
@@ -15,12 +15,22 @@
 package org.apache.tapestry5.services.linktransform;
 
 import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.services.PageRenderDispatcher;
 import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
+import org.apache.tapestry5.services.ComponentEventLinkEncoder;
+import org.apache.tapestry5.services.LocalizationSetter;
 import org.apache.tapestry5.services.PageRenderRequestParameters;
+import org.apache.tapestry5.services.Request;
 
 /**
  * Allows the default {@link Link} for a page render request to be replaced.
  * This is a service, but also the contribution to the service, as a chain of command.
+ * <p>
+ * A contributed implementation of this interface is expected to identify which requests it wants to transform. The
+ * {@link #transformPageRenderLink(Link, PageRenderRequestParameters)} method can return a {@link Link} that is allowed
+ * to differ from Tapestry normal default. Later, when that request is triggered,
+ * {@link #decodePageRenderRequest(Request)} is required to reverse the operation, identifying the original parameters
+ * so that request handling can continue.
  * 
  * @since 5.2.0
  */
@@ -36,5 +46,20 @@ public interface PageRenderLinkTransform
      *            that define the request
      * @return replacement Link, or null
      */
-    Link tranformPageRenderLink(Link defaultLink, PageRenderRequestParameters parameters);
+    Link transformPageRenderLink(Link defaultLink, PageRenderRequestParameters parameters);
+
+    /**
+     * Attempts to decode the page render request, to perform the opposite action for
+     * {@link #transformPageRenderLink(Link, PageRenderRequestParameters)}. The transformer
+     * is also responsible for identifying the locale in the request (as part of the path, or as a
+     * query parameter or cookie) and setting the locale for the request.
+     * <p>
+     * This method will be invoked from the {@link PageRenderDispatcher} and a non-null value returned from this method
+     * will prevent the default {@link ComponentEventLinkEncoder#decodePageRenderRequest(Request)} method from being
+     * invoked.
+     * 
+     * @return decoded parameters, or null to proceed normally
+     * @see LocalizationSetter#setLocaleFromLocaleName(String)
+     */
+    PageRenderRequestParameters decodePageRenderRequest(Request request);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImplTest.java?rev=950825&r1=950824&r2=950825&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventLinkEncoderImplTest.java Wed Jun  2 23:37:12 2010
@@ -15,8 +15,8 @@
 package org.apache.tapestry5.internal.services;
 
 import org.apache.tapestry5.Link;
+import org.apache.tapestry5.TapestryConstants;
 import org.apache.tapestry5.internal.EmptyEventContext;
-import org.apache.tapestry5.internal.InternalConstants;
 import org.apache.tapestry5.internal.test.InternalBaseTestCase;
 import org.apache.tapestry5.ioc.services.TypeCoercer;
 import org.apache.tapestry5.services.ComponentClassResolver;
@@ -213,7 +213,7 @@ public class ComponentEventLinkEncoderIm
     {
         Request request = mockRequest();
 
-        train_getParameter(request, InternalConstants.LOOPBACK, isLoopback ? "t" : null);
+        train_getParameter(request, TapestryConstants.PAGE_LOOPBACK_PARAMETER_NAME, isLoopback ? "t" : null);
 
         return request;
     }