You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/16 03:55:34 UTC
svn commit: r656921 [2/3] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/annotations/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src/main...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.corelib.pages;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.annotations.ContentType;
import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -28,7 +28,7 @@
/**
* Responsible for reporting runtime exceptions. This page is quite verbose and is usually overridden in a production
- * application. When {@link TapestryConstants#PRODUCTION_MODE_SYMBOL} is "true", it is very abbreviated.
+ * application. When {@link org.apache.tapestry.SymbolConstants#PRODUCTION_MODE} is "true", it is very abbreviated.
*
* @see org.apache.tapestry.corelib.components.ExceptionDisplay
*/
@@ -45,12 +45,12 @@
private Request request;
@Inject
- @Symbol(TapestryConstants.PRODUCTION_MODE_SYMBOL)
+ @Symbol(SymbolConstants.PRODUCTION_MODE)
@Property(write = false)
private boolean productionMode;
@Inject
- @Symbol(TapestryConstants.TAPESTRY_VERSION_SYMBOL)
+ @Symbol(SymbolConstants.TAPESTRY_VERSION)
@Property(write = false)
private String tapestryVersion;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java Thu May 15 18:55:31 2008
@@ -59,7 +59,7 @@
{
if (field == null) return;
- if (inError(field)) element.addClassName(TapestryConstants.ERROR_CLASS);
+ if (inError(field)) element.addClassName(CSSClassConstants.ERROR);
}
@Override
@@ -90,6 +90,6 @@
private void addErrorClassToCurrentElement()
{
- markupWriter.getElement().addClassName(TapestryConstants.ERROR_CLASS);
+ markupWriter.getElement().addClassName(CSSClassConstants.ERROR);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java Thu May 15 18:55:31 2008
@@ -84,8 +84,8 @@
/**
* Request attribute that stores a {@link org.apache.tapestry.internal.structure.Page} instance that will be
- * rendered as the {@linkplain org.apache.tapestry.TapestryConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL
- * immediate mode response}.
+ * rendered as the {@linkplain org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate
+ * mode response}.
*/
public static final String IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE = "tapestry.immediate-response-page";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java Thu May 15 18:55:31 2008
@@ -17,7 +17,7 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.annotations.Symbol;
@@ -78,7 +78,7 @@
public AssetBindingFactory(AssetSource source,
- @Symbol(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL)
+ @Symbol(SymbolConstants.FORCE_ABSOLUTE_URIS)
boolean forceAbsoluteURIs)
{
this.source = source;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
/**
@@ -55,7 +55,7 @@
// If no nested component id, then must append the action; the ':' and the action become the
// delimiter between the page name and the event context.
- if (!hasComponentId || !eventType.equals(TapestryConstants.ACTION_EVENT))
+ if (!hasComponentId || !eventType.equals(EventConstants.ACTION))
{
builder.append(":");
builder.append(eventType);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.ContentType;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
@@ -65,7 +65,7 @@
ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(resultProcessor);
- activePage.getRootElement().triggerContextEvent(TapestryConstants.ACTIVATE_EVENT,
+ activePage.getRootElement().triggerContextEvent(EventConstants.ACTIVATE,
parameters.getPageActivationContext(), callback);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java Thu May 15 18:55:31 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
@@ -58,7 +57,7 @@
// Remember that the request path does not include the context path, so we can simply start
// looking for the asset path prefix right off the bat.
- if (!path.startsWith(TapestryConstants.ASSET_PATH_PREFIX)) return false;
+ if (!path.startsWith(RequestConstants.ASSET_PATH_PREFIX)) return false;
// ClassLoaders like their paths to start with a leading slash.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java Thu May 15 18:55:31 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
import org.apache.tapestry.services.Request;
@@ -99,7 +98,7 @@
private String toCompleteClientURI(String resourcePath)
{
StringBuilder builder = new StringBuilder(request.getContextPath());
- builder.append(TapestryConstants.ASSET_PATH_PREFIX);
+ builder.append(RequestConstants.ASSET_PATH_PREFIX);
for (String pathPrefix : sortedPathPrefixes)
{
@@ -122,7 +121,7 @@
public String toResourcePath(String clientURL)
{
- String basePath = clientURL.substring(TapestryConstants.ASSET_PATH_PREFIX.length());
+ String basePath = clientURL.substring(RequestConstants.ASSET_PATH_PREFIX.length());
for (String alias : sortedAliases)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.Link;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.corelib.data.InsertPosition;
import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.json.JSONArray;
@@ -24,13 +24,13 @@
public class ClientBehaviorSupportImpl implements ClientBehaviorSupport
{
- private final PageRenderSupport pageRenderSupport;
+ private final RenderSupport renderSupport;
private final JSONObject validations = new JSONObject();
- public ClientBehaviorSupportImpl(PageRenderSupport pageRenderSupport)
+ public ClientBehaviorSupportImpl(RenderSupport renderSupport)
{
- this.pageRenderSupport = pageRenderSupport;
+ this.renderSupport = renderSupport;
}
public void addZone(String clientId, String showFunctionName, String updateFunctionName)
@@ -49,13 +49,13 @@
if (spec.length() == 0)
{
- pageRenderSupport.addInit(functionName, clientId);
+ renderSupport.addInit(functionName, clientId);
return;
}
spec.put("element", clientId);
- pageRenderSupport.addInit(functionName, spec);
+ renderSupport.addInit(functionName, spec);
}
@@ -70,7 +70,7 @@
spec.put(linkId);
spec.put(elementId);
- pageRenderSupport.addInit("linkZone", spec);
+ renderSupport.addInit("linkZone", spec);
}
public void addFormFragment(String clientId, String showFunctionName, String hideFunctionName)
@@ -97,7 +97,7 @@
// Always has at least two properties.
- pageRenderSupport.addInit("formInjector", spec);
+ renderSupport.addInit("formInjector", spec);
}
@@ -125,7 +125,7 @@
}
/**
- * Invoked at the end of rendering to commit (to the {@link org.apache.tapestry.PageRenderSupport}) any accumulated
+ * Invoked at the end of rendering to commit (to the {@link org.apache.tapestry.RenderSupport}) any accumulated
* validations.
*/
public void commit()
@@ -138,7 +138,7 @@
parameters.put(field);
parameters.put(specs);
- pageRenderSupport.addInit("validate", parameters);
+ renderSupport.addInit("validate", parameters);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java Thu May 15 18:55:31 2008
@@ -80,7 +80,7 @@
return bindingSource.newBinding(
"default " + parameterName,
containerResources,
- TapestryConstants.PROP_BINDING_PREFIX,
+ BindingConstants.PROP,
componentId);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java Thu May 15 18:55:31 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.services;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.EventContext;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.EmptyEventContext;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.TapestryInternalUtils;
@@ -118,7 +118,7 @@
// The event type is often omitted, and defaults to "action".
- if (eventType == null) eventType = TapestryConstants.ACTION_EVENT;
+ if (eventType == null) eventType = EventConstants.ACTION;
if (nestedComponentId == null) nestedComponentId = "";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.*;
@@ -53,7 +53,7 @@
// If activating the page returns a "navigational result", then don't trigger the action
// on the component.
- activePage.getRootElement().triggerContextEvent(TapestryConstants.ACTIVATE_EVENT,
+ activePage.getRootElement().triggerContextEvent(EventConstants.ACTIVATE,
parameters.getPageActivationContext(), callback);
if (callback.isAborted()) return;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.*;
@@ -54,7 +54,7 @@
{
// We don't have a context to provide but this still nags me as not the right thing to do.
- page.getRootElement().triggerEvent(TapestryConstants.ACTIVATE_EVENT, new Object[0], null);
+ page.getRootElement().triggerEvent(EventConstants.ACTIVATE, new Object[0], null);
renderer.renderPageResponse(page);
return;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java Thu May 15 18:55:31 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
/**
- * Alternative implementation, used when {@link org.apache.tapestry.TapestryConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL}
+ * Alternative implementation, used when {@link org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS}
* is set to true.
*/
public class ImmediateActionRenderResponseGenerator implements ActionRenderResponseGenerator
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.internal.structure.PageResourcesSource;
import org.apache.tapestry.internal.structure.PageResourcesSourceImpl;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
@@ -91,7 +91,7 @@
*/
public static ActionRenderResponseGenerator buildActionRenderResponseGenerator(
- @Symbol(TapestryConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL)
+ @Symbol(SymbolConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS)
boolean immediateMode,
ObjectLocator locator)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.ComponentEventCallback;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.Link;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.internal.structure.ComponentPageElement;
@@ -240,7 +240,7 @@
ComponentPageElement rootElement = page.getRootElement();
- rootElement.triggerEvent(TapestryConstants.PASSIVATE_EVENT, null, callback);
+ rootElement.triggerEvent(EventConstants.PASSIVATE, null, callback);
return toContextStrings(context.toArray());
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ContentType;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.MetaDataLocator;
@@ -34,7 +34,7 @@
{
ComponentResources pageResources = page.getRootComponent().getComponentResources();
- String contentTypeString = metaDataLocator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
+ String contentTypeString = metaDataLocator.findMeta(MetaDataConstants.RESPONSE_CONTENT_TYPE, pageResources,
String.class);
ContentType contentType = new ContentType(contentTypeString);
@@ -45,7 +45,7 @@
if (encoding == null)
{
encoding = metaDataLocator
- .findMeta(TapestryConstants.RESPONSE_ENCODING, pageResources, String.class);
+ .findMeta(MetaDataConstants.RESPONSE_ENCODING, pageResources, String.class);
contentType.setParameter(InternalConstants.CHARSET_CONTENT_TYPE_PARAMETER, encoding);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java Thu May 15 18:55:31 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Binding;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
-import static org.apache.tapestry.TapestryConstants.PROP_BINDING_PREFIX;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.ExpansionToken;
import org.apache.tapestry.internal.structure.*;
@@ -125,7 +125,7 @@
String expansion = expression.substring(expansionx + 2, endx);
final Binding binding = bindingSource.newBinding("attribute expansion", resources, resources,
- PROP_BINDING_PREFIX, expansion, location);
+ BindingConstants.PROP, expansion, location);
final StringProvider provider = new StringProvider()
{
@@ -174,7 +174,7 @@
public PageElement newExpansionElement(ComponentResources componentResources, ExpansionToken token)
{
Binding binding = bindingSource.newBinding("expansion", componentResources, componentResources,
- PROP_BINDING_PREFIX, token.getExpression(), token.getLocation());
+ BindingConstants.PROP, token.getExpression(), token.getLocation());
return new ExpansionPageElement(binding, typeCoercer);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java Thu May 15 18:55:31 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Binding;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.bindings.LiteralBinding;
import org.apache.tapestry.internal.parser.*;
import org.apache.tapestry.internal.structure.*;
@@ -166,7 +166,7 @@
// Meta default of literal for the template.
String defaultBindingPrefix = determineDefaultBindingPrefix(component, name,
- TapestryConstants.LITERAL_BINDING_PREFIX);
+ BindingConstants.LITERAL);
Binding binding = findBinding(loadingElement, component, name, token.getValue(), defaultBindingPrefix,
token.getLocation());
@@ -213,7 +213,7 @@
String value = model.getParameterValue(name);
String defaultBindingPrefix = determineDefaultBindingPrefix(newComponent, name,
- TapestryConstants.PROP_BINDING_PREFIX);
+ BindingConstants.PROP);
Binding binding = findBinding(loadingComponent, newComponent, name, value, defaultBindingPrefix,
newComponent.getLocation());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.ComponentEventResultProcessor;
import org.apache.tapestry.services.PageRenderRequestHandler;
@@ -49,7 +49,7 @@
ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(resultProcessor);
- page.getRootElement().triggerContextEvent(TapestryConstants.ACTIVATE_EVENT, parameters.getActivationContext(),
+ page.getRootElement().triggerContextEvent(EventConstants.ACTIVATE, parameters.getActivationContext(),
callback);
// The handler will have asked the result processor to send a response.
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java (from r654390, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java&r1=654390&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.ioc.internal.util.Defense;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
@@ -29,7 +29,7 @@
import java.util.Arrays;
import java.util.List;
-public class PageRenderSupportImpl implements PageRenderSupport
+public class RenderSupportImpl implements RenderSupport
{
private final IdAllocator idAllocator;
@@ -53,8 +53,8 @@
* @param coreScripts core scripts (evaluated as classpaths scripts) that are added to any page that includes a
* script link or script block
*/
- public PageRenderSupportImpl(DocumentLinker linker, SymbolSource symbolSource,
- AssetSource assetSource, String... coreScripts)
+ public RenderSupportImpl(DocumentLinker linker, SymbolSource symbolSource,
+ AssetSource assetSource, String... coreScripts)
{
this(linker, symbolSource, assetSource, new IdAllocator(), coreScripts);
}
@@ -69,8 +69,8 @@
* script link or script block
*/
- public PageRenderSupportImpl(DocumentLinker linker, SymbolSource symbolSource,
- AssetSource assetSource, IdAllocator idAllocator, String... coreScripts)
+ public RenderSupportImpl(DocumentLinker linker, SymbolSource symbolSource,
+ AssetSource assetSource, IdAllocator idAllocator, String... coreScripts)
{
this.linker = linker;
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestConstants.java (from r649848, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryConstants.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestConstants.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestConstants.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryConstants.java&r1=649848&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestConstants.java Thu May 15 18:55:31 2008
@@ -12,139 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry.internal.services;
/**
- * Collection of common constant values used throughout Tapestry.
+ * Constants used when processing requests from the client web browser.
*/
-public final class TapestryConstants
+public final class RequestConstants
{
- /**
- * Default client event name, "action", used in most situations.
- */
- public static final String ACTION_EVENT = "action";
-
- /**
- * Event triggered when a page is activated (for rendering). The component event handler will be passed the context
- * provided by the passivate event.
- */
- public static final String ACTIVATE_EVENT = "activate";
-
- /**
- * Event triggered when a link for a page is generated. The event handler for the page may provide an object, or an
- * array of objects, as the context for the page. These values will become part of the page's context, and will be
- * provided back when the page is activated.
- */
- public static final String PASSIVATE_EVENT = "passivate";
/**
* Request path prefix that identifies an internal (on the classpath) asset.
*/
public static final String ASSET_PATH_PREFIX = "/assets/";
- /**
- * Binding expression prefix used for literal strings.
- */
- public static final String LITERAL_BINDING_PREFIX = "literal";
-
- /**
- * Binding expression prefix used to bind to a property of the component.
- */
- public static final String PROP_BINDING_PREFIX = "prop";
-
- public static final String NULLFIELDSTRATEGY_BINDING_PREFIX = "nullfieldstrategy";
-
- public static final String COMPONENT_BINDING_PREFIX = "component";
-
- public static final String MESSAGE_BINDING_PREFIX = "message";
- public static final String VALIDATE_BINDING_PREFIX = "validate";
-
- public static final String TRANSLATE_BINDING_PREFIX = "translate";
-
- public static final String BLOCK_BINDING_PREFIX = "block";
-
- public static final String ASSET_BINDING_PREFIX = "asset";
-
- public static final String VAR_BINDING_PREFIX = "var";
-
- /**
- * Meta data key applied to pages that sets the response content type. A factory default provides the value
- * "text/html" when not overridden.
- */
- public static final String RESPONSE_CONTENT_TYPE = "tapestry.response-content-type";
-
- /**
- * Meta data key applied to pages that may only be accessed via secure methods (HTTPS).
- */
- public static final String SECURE_PAGE = "tapestry.secure-page";
-
- /**
- * Meta data key applied to pages that sets the response encoding. A factory default provides the value "UTF-8" when
- * not overriden. Content type may also be specified in the {@link #RESPONSE_CONTENT_TYPE content type} as parameter
- * "charset", i.e., "text/html;charset=UTF-8".
- */
- public static final String RESPONSE_ENCODING = "tapestry.response-encoding";
-
- /**
- * Indicates whether Tapestry is running in production mode or developer mode. The primary difference is how
- * exceptions are reported.
- */
- public static final String PRODUCTION_MODE_SYMBOL = "tapestry.production-mode";
-
- /**
- * CSS class name that causes a rendered element to be invisible on the client side.
- */
- public static final String INVISIBLE_CLASS = "t-invisible";
- /**
- * All purpose CSS class name for anything related to Tapestry errors.
- */
- public static final String ERROR_CLASS = "t-error";
-
-
- /**
- * Symbol which may be set to "true" to force the use of absolute URIs (not relative URIs) exclusively.
- */
- public static final String FORCE_ABSOLUTE_URIS_SYMBOL = "tapestry.force-absolute-uris";
-
-
- /**
- * If set to true, then action requests will render a page markup response immediately, rather than sending a
- * redirect to render the response.
- */
- public static final String SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL = "tapestry.suppress-redirect-from-action-requests";
-
- /**
- * The list of locales supported by the application; locales identified in the incoming request are "narrowed" to
- * one of these values.
- */
- public static final String SUPPORTED_LOCALES_SYMBOL = "tapestry.supported-locales";
-
- /**
- * Controls whether whitespace is compressed by default in templates, or left as is. The factory default is to
- * compress whitespace. This can be overridden using the xml:space attribute inside template elements.
- */
- public static final String COMPRESS_WHITESPACE_SYMBOL = "tapestry.compress-whitespace";
-
- /**
- * Time interval defining how often Tapestry will check for updates to local files (including classes). This number
- * can be raised in a production environment.
- */
- public static final String FILE_CHECK_INTERVAL_SYMBOL = "tapestry.file-check-interval";
-
- /**
- * Time interval that sets how long Tapestry will wait to obtain the exclusive lock needed to check local files.
- */
- public static final String FILE_CHECK_UPDATE_TIMEOUT_SYMBOL = "tapestry.file-check-update-timeout";
-
- /**
- * The version number of the core Tapestry framework, or UNKNOWN if the version number is not available (which
- * should only occur when developing Tapestry).
- */
- public static final String TAPESTRY_VERSION_SYMBOL = "tapestry.version";
-
- /**
- * The page field persistence strategy that stores data in the session until the next request.
- */
- public static final String FLASH_PERSISTENCE_STRATEGY = "flash";
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ContentType;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.MetaDataLocator;
import org.apache.tapestry.services.Request;
@@ -41,14 +41,14 @@
Page page = cache.get(pageName);
ComponentResources pageResources = page.getRootElement().getComponentResources();
- String contentTypeString = locator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
+ String contentTypeString = locator.findMeta(MetaDataConstants.RESPONSE_CONTENT_TYPE, pageResources,
String.class);
ContentType contentType = new ContentType(contentTypeString);
String encoding = contentType.getParameter("charset");
if (encoding == null)
- encoding = locator.findMeta(TapestryConstants.RESPONSE_ENCODING, pageResources, String.class);
+ encoding = locator.findMeta(MetaDataConstants.RESPONSE_ENCODING, pageResources, String.class);
request.setEncoding(encoding);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizer.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizer.java Thu May 15 18:55:31 2008
@@ -20,7 +20,7 @@
* URL. Of course, you need to make sure that's turned off inside an Ajax request since the base URL of the client it
* totally unknown in that situation.
*
- * @see org.apache.tapestry.TapestryConstants#FORCE_ABSOLUTE_URIS_SYMBOL
+ * @see org.apache.tapestry.SymbolConstants#FORCE_ABSOLUTE_URIS
*/
public interface RequestPathOptimizer
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.ioc.annotations.Symbol;
import org.apache.tapestry.services.Request;
@@ -34,7 +34,7 @@
public RequestPathOptimizerImpl(Request request,
- @Symbol(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL)
+ @Symbol(SymbolConstants.FORCE_ABSOLUTE_URIS)
boolean forceAbsolute)
{
this.request = request;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Link;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.BaseURLSource;
import org.apache.tapestry.services.MetaDataLocator;
@@ -71,7 +71,7 @@
private boolean isSecure(Page page)
{
- return locator.findMeta(TapestryConstants.SECURE_PAGE,
+ return locator.findMeta(MetaDataConstants.SECURE_PAGE,
page.getRootComponent().getComponentResources(), Boolean.class);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.internal.parser.*;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import org.apache.tapestry.ioc.Location;
@@ -155,7 +155,7 @@
public TemplateParserImpl(Logger logger, Map<String, URL> configuration,
- @Symbol(TapestryConstants.COMPRESS_WHITESPACE_SYMBOL)
+ @Symbol(SymbolConstants.COMPRESS_WHITESPACE)
boolean compressWhitespaceDefault)
{
this.logger = logger;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.test;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.internal.services.ComponentInvocationMap;
import org.apache.tapestry.internal.services.CookieSink;
import org.apache.tapestry.internal.services.CookieSource;
@@ -74,6 +74,6 @@
public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
{
- configuration.add(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL, "true");
+ configuration.add(SymbolConstants.FORCE_ABSOLUTE_URIS, "true");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java Thu May 15 18:55:31 2008
@@ -16,7 +16,6 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.internal.services.ComponentResourcesOperation;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.SymbolSource;
@@ -31,7 +30,7 @@
/**
* Base class for workers that automatically inlcude assets in the page (via methods on {@link
- * org.apache.tapestry.PageRenderSupport}).
+ * org.apache.tapestry.RenderSupport}).
*/
public abstract class AbstractIncludeAssetWorker implements ComponentClassTransformWorker
{
@@ -99,7 +98,7 @@
/**
* Invoked, from the component's setup render phase, for each asset. This method must be threadsafe. Most
- * implementation pass the asset to a particular method of {@link PageRenderSupport}.
+ * implementation pass the asset to a particular method of {@link org.apache.tapestry.RenderSupport}.
*
* @param asset to be processed
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.Binding;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.annotations.Cached;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
@@ -76,7 +76,7 @@
bindingField,
bindingSourceField,
transformation.getResourcesFieldName(),
- TapestryConstants.PROP_BINDING_PREFIX,
+ BindingConstants.PROP,
once.watch());
transformation.extendMethod(TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE, body);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.annotations.ContentType;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -30,6 +30,6 @@
{
ContentType annotation = transformation.getAnnotation(ContentType.class);
- if (annotation != null) model.setMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, annotation.value());
+ if (annotation != null) model.setMeta(MetaDataConstants.RESPONSE_CONTENT_TYPE, annotation.value());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.annotations.IncludeJavaScriptLibrary;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.model.MutableComponentModel;
@@ -24,18 +24,18 @@
/**
* Recognizes the {@link org.apache.tapestry.annotations.IncludeJavaScriptLibrary} annotation, and ensures that {@link
- * org.apache.tapestry.PageRenderSupport#addScriptLink(org.apache.tapestry.Asset[])} is invoked.
+ * org.apache.tapestry.RenderSupport#addScriptLink(org.apache.tapestry.Asset[])} is invoked.
*/
public class IncludeJavaScriptLibraryWorker extends AbstractIncludeAssetWorker
{
- private final PageRenderSupport pageRenderSupport;
+ private final RenderSupport renderSupport;
- public IncludeJavaScriptLibraryWorker(AssetSource assetSource, PageRenderSupport pageRenderSupport,
+ public IncludeJavaScriptLibraryWorker(AssetSource assetSource, RenderSupport renderSupport,
SymbolSource symbolSource)
{
super(assetSource, symbolSource);
- this.pageRenderSupport = pageRenderSupport;
+ this.renderSupport = renderSupport;
}
public void transform(ClassTransformation transformation, final MutableComponentModel model)
@@ -47,6 +47,6 @@
protected void handleAsset(Asset asset)
{
- pageRenderSupport.addScriptLink(asset);
+ renderSupport.addScriptLink(asset);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.internal.transform;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.annotations.IncludeStylesheet;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.model.MutableComponentModel;
@@ -24,18 +24,18 @@
/**
* Recognizes the {@link org.apache.tapestry.annotations.IncludeStylesheet} annotation and ensures that {@link
- * org.apache.tapestry.PageRenderSupport#addStylesheetLink(org.apache.tapestry.Asset, String)} is invoked.
+ * org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset, String)} is invoked.
*/
public class IncludeStylesheetWorker extends AbstractIncludeAssetWorker
{
- private final PageRenderSupport pageRenderSupport;
+ private final RenderSupport renderSupport;
- public IncludeStylesheetWorker(AssetSource assetSource, PageRenderSupport pageRenderSupport,
+ public IncludeStylesheetWorker(AssetSource assetSource, RenderSupport renderSupport,
SymbolSource symbolSource)
{
super(assetSource, symbolSource);
- this.pageRenderSupport = pageRenderSupport;
+ this.renderSupport = renderSupport;
}
public void transform(ClassTransformation transformation, final MutableComponentModel model)
@@ -48,6 +48,6 @@
protected void handleAsset(Asset asset)
{
- pageRenderSupport.addStylesheetLink(asset, null);
+ renderSupport.addStylesheetLink(asset, null);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.annotations.ResponseEncoding;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -28,6 +28,6 @@
if (annotation == null) return;
- model.setMeta(TapestryConstants.RESPONSE_ENCODING, annotation.value());
+ model.setMeta(MetaDataConstants.RESPONSE_ENCODING, annotation.value());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.annotations.Secure;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -22,7 +22,7 @@
/**
* Recognizes the {@link org.apache.tapestry.annotations.Secure} annotation and sets the {@link
- * org.apache.tapestry.TapestryConstants#SECURE_PAGE} meta data to "true".
+ * org.apache.tapestry.MetaDataConstants#SECURE_PAGE} meta data to "true".
*/
public class SecureWorker implements ComponentClassTransformWorker
{
@@ -31,6 +31,6 @@
Secure secure = transformation.getAnnotation(Secure.class);
if (secure != null)
- model.setMeta(TapestryConstants.SECURE_PAGE, "true");
+ model.setMeta(MetaDataConstants.SECURE_PAGE, "true");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java Thu May 15 18:55:31 2008
@@ -111,7 +111,7 @@
/**
* The type of event. When not specified in the URL, a default type of "action" ({@link
- * org.apache.tapestry.TapestryConstants#ACTION_EVENT}) is provided.
+ * org.apache.tapestry.EventConstants#ACTION}) is provided.
*/
public String getEventType()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Thu May 15 18:55:31 2008
@@ -229,23 +229,23 @@
ObjectLocator locator)
{
- configuration.add(TapestryConstants.LITERAL_BINDING_PREFIX, new LiteralBindingFactory());
- configuration.add(TapestryConstants.PROP_BINDING_PREFIX, propBindingFactory);
+ configuration.add(BindingConstants.LITERAL, new LiteralBindingFactory());
+ configuration.add(BindingConstants.PROP, propBindingFactory);
- configuration.add(TapestryConstants.COMPONENT_BINDING_PREFIX, new ComponentBindingFactory());
- configuration.add(TapestryConstants.MESSAGE_BINDING_PREFIX, new MessageBindingFactory());
- configuration.add(TapestryConstants.VALIDATE_BINDING_PREFIX, locator.autobuild(ValidateBindingFactory.class));
- configuration.add(TapestryConstants.TRANSLATE_BINDING_PREFIX, locator.autobuild(TranslateBindingFactory.class));
- configuration.add(TapestryConstants.BLOCK_BINDING_PREFIX, new BlockBindingFactory());
- configuration.add(TapestryConstants.ASSET_BINDING_PREFIX, locator.autobuild(AssetBindingFactory.class));
- configuration.add(TapestryConstants.VAR_BINDING_PREFIX, new RenderVariableBindingFactory());
- configuration.add(TapestryConstants.NULLFIELDSTRATEGY_BINDING_PREFIX,
+ configuration.add(BindingConstants.COMPONENT, new ComponentBindingFactory());
+ configuration.add(BindingConstants.MESSAGE, new MessageBindingFactory());
+ configuration.add(BindingConstants.VALIDATE, locator.autobuild(ValidateBindingFactory.class));
+ configuration.add(BindingConstants.TRANSLATE, locator.autobuild(TranslateBindingFactory.class));
+ configuration.add(BindingConstants.BLOCK, new BlockBindingFactory());
+ configuration.add(BindingConstants.ASSET, locator.autobuild(AssetBindingFactory.class));
+ configuration.add(BindingConstants.VAR, new RenderVariableBindingFactory());
+ configuration.add(BindingConstants.NULLFIELDSTRATEGY,
locator.autobuild(NullFieldStrategyBindingFactory.class));
}
public static void contributeClasspathAssetAliasManager(MappedConfiguration<String, String> configuration,
- @Symbol(TapestryConstants.TAPESTRY_VERSION_SYMBOL)
+ @Symbol(SymbolConstants.TAPESTRY_VERSION)
String version,
// @Inject not needed, because this isn't a service builder method
@@ -565,11 +565,11 @@
public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, Context context,
// @Inject not needed because its a long, not a String
- @Symbol(TapestryConstants.FILE_CHECK_INTERVAL_SYMBOL)
+ @Symbol(SymbolConstants.FILE_CHECK_INTERVAL)
@IntermediateType(TimeInterval.class)
long checkInterval,
- @Symbol(TapestryConstants.FILE_CHECK_UPDATE_TIMEOUT_SYMBOL)
+ @Symbol(SymbolConstants.FILE_CHECK_UPDATE_TIMEOUT)
@IntermediateType(TimeInterval.class)
long updateTimeout,
@@ -830,12 +830,12 @@
}
/**
- * Builds a proxy to the current {@link org.apache.tapestry.PageRenderSupport} inside this thread's {@link
+ * Builds a proxy to the current {@link org.apache.tapestry.RenderSupport} inside this thread's {@link
* Environment}.
*/
- public PageRenderSupport buildPageRenderSupport()
+ public RenderSupport buildRenderSupport()
{
- return environmentalBuilder.build(PageRenderSupport.class);
+ return environmentalBuilder.build(RenderSupport.class);
}
/**
@@ -1368,15 +1368,15 @@
/**
* Adds page render filters, each of which provides an {@link org.apache.tapestry.annotations.Environmental}
* service. Filters often provide {@link Environmental} services needed by components as they render. <dl>
- * <dt>PageRenderSupport</dt> <dd>Provides {@link PageRenderSupport}</dd> <dt>ClientBehaviorSupport</dt>
- * <dd>Provides {@link org.apache.tapestry.internal.services.ClientBehaviorSupport}</dd> <dt>Heartbeat</dt>
- * <dd>Provides {@link org.apache.tapestry.services.Heartbeat}</dd> <dt>DefaultValidationDecorator</dt> <dd>Provides
- * {@link org.apache.tapestry.ValidationDecorator} (as an instance of {@link org.apache.tapestry.internal.DefaultValidationDecorator})</dd>
- * </dl>
+ * <dt>PageRenderSupport</dt> <dd>Provides {@link org.apache.tapestry.RenderSupport}</dd>
+ * <dt>ClientBehaviorSupport</dt> <dd>Provides {@link org.apache.tapestry.internal.services.ClientBehaviorSupport}</dd>
+ * <dt>Heartbeat</dt> <dd>Provides {@link org.apache.tapestry.services.Heartbeat}</dd>
+ * <dt>DefaultValidationDecorator</dt> <dd>Provides {@link org.apache.tapestry.ValidationDecorator} (as an instance
+ * of {@link org.apache.tapestry.internal.DefaultValidationDecorator})</dd> </dl>
*/
public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration,
- @Symbol(TapestryConstants.PRODUCTION_MODE_SYMBOL)
+ @Symbol(SymbolConstants.PRODUCTION_MODE)
final boolean productionMode,
@Path("${tapestry.default-stylesheet}")
@@ -1397,21 +1397,21 @@
{
DocumentLinkerImpl linker = new DocumentLinkerImpl(productionMode);
- PageRenderSupportImpl support = new PageRenderSupportImpl(linker, symbolSource, assetSource,
+ RenderSupportImpl support = new RenderSupportImpl(linker, symbolSource, assetSource,
- // Core scripts added to any page that uses scripting
+ // Core scripts added to any page that uses scripting
- "${tapestry.scriptaculous}/prototype.js",
- "${tapestry.scriptaculous}/scriptaculous.js",
- "${tapestry.scriptaculous}/effects.js",
+ "${tapestry.scriptaculous}/prototype.js",
+ "${tapestry.scriptaculous}/scriptaculous.js",
+ "${tapestry.scriptaculous}/effects.js",
- // Uses functions defined by the prior three
+ // Uses functions defined by the prior three
- "org/apache/tapestry/tapestry.js");
+ "org/apache/tapestry/tapestry.js");
support.addStylesheetLink(stylesheetAsset, null);
- environment.push(PageRenderSupport.class, support);
+ environment.push(RenderSupport.class, support);
renderer.renderMarkup(writer);
@@ -1419,7 +1419,7 @@
linker.updateDocument(writer.getDocument());
- environment.pop(PageRenderSupport.class);
+ environment.pop(RenderSupport.class);
}
};
@@ -1427,9 +1427,9 @@
{
public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer)
{
- PageRenderSupport pageRenderSupport = environment.peekRequired(PageRenderSupport.class);
+ RenderSupport renderSupport = environment.peekRequired(RenderSupport.class);
- ClientBehaviorSupportImpl clientBehaviorSupport = new ClientBehaviorSupportImpl(pageRenderSupport);
+ ClientBehaviorSupportImpl clientBehaviorSupport = new ClientBehaviorSupportImpl(renderSupport);
environment.push(ClientBehaviorSupport.class, clientBehaviorSupport);
@@ -1477,9 +1477,9 @@
};
- configuration.add("PageRenderSupport", pageRenderSupport);
- configuration.add("ClientBehaviorSupport", clientBehaviorSupport, "after:PageRenderSupport");
- configuration.add("Heartbeat", heartbeat, "after:PageRenderSupport");
+ configuration.add("RenderSupport", pageRenderSupport);
+ configuration.add("ClientBehaviorSupport", clientBehaviorSupport, "after:RenderSupport");
+ configuration.add("Heartbeat", heartbeat, "after:RenderSupport");
configuration.add("DefaultValidationDecorator", defaultValidationDecorator, "after:Heartbeat");
}
@@ -1489,7 +1489,7 @@
* to {@link #contributeMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration, org.apache.tapestry.Asset,
* org.apache.tapestry.Asset, ValidationMessagesSource, org.apache.tapestry.ioc.services.SymbolSource, AssetSource)}
* } and overlaps it to some degree. <dl> <dt> PageRenderSupport </dt> <dd>Provides {@link
- * org.apache.tapestry.PageRenderSupport}</dd> <dt>ClientBehaviorSupport</dt> <dd>Provides {@link
+ * org.apache.tapestry.RenderSupport}</dd> <dt>ClientBehaviorSupport</dt> <dd>Provides {@link
* org.apache.tapestry.internal.services.ClientBehaviorSupport}</dd> <dt>Heartbeat</dt> <dd>Provides {@link
* org.apache.tapestry.services.Heartbeat}</dd> <dt>DefaultValidationDecorator</dt> <dd>Provides {@link
* org.apache.tapestry.ValidationDecorator} (as an instance of {@link org.apache.tapestry.internal.DefaultValidationDecorator})</dd>
@@ -1536,16 +1536,16 @@
};
- PageRenderSupportImpl support = new PageRenderSupportImpl(builder, symbolSource, assetSource,
- idAllocator);
+ RenderSupportImpl support = new RenderSupportImpl(builder, symbolSource, assetSource,
+ idAllocator);
- environment.push(PageRenderSupport.class, support);
+ environment.push(RenderSupport.class, support);
renderer.renderMarkup(writer, reply);
support.commit();
- environment.pop(PageRenderSupport.class);
+ environment.pop(RenderSupport.class);
if (buffer.length() > 0)
reply.put("script", buffer.toString());
@@ -1556,9 +1556,9 @@
{
public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRenderer renderer)
{
- PageRenderSupport pageRenderSupport = environment.peekRequired(PageRenderSupport.class);
+ RenderSupport renderSupport = environment.peekRequired(RenderSupport.class);
- ClientBehaviorSupportImpl support = new ClientBehaviorSupportImpl(pageRenderSupport);
+ ClientBehaviorSupportImpl support = new ClientBehaviorSupportImpl(renderSupport);
environment.push(ClientBehaviorSupport.class, support);
@@ -1606,9 +1606,9 @@
};
- configuration.add("PageRenderSupport", pageRenderSupport);
- configuration.add("ClientBehaviorSupport", clientBehaviorSupport, "after:PageRenderSupport");
- configuration.add("Heartbeat", heartbeat, "after:PageRenderSupport");
+ configuration.add("RenderSupport", pageRenderSupport);
+ configuration.add("ClientBehaviorSupport", clientBehaviorSupport, "after:RenderSupport");
+ configuration.add("Heartbeat", heartbeat, "after:RenderSupport");
configuration.add("DefaultValidationDecorator", defaultValidationDecorator, "after:Heartbeat");
}
@@ -1625,7 +1625,7 @@
PersistentFieldStrategy clientStrategy)
{
configuration.add("session", new SessionPersistentFieldStrategy(request));
- configuration.add(TapestryConstants.FLASH_PERSISTENCE_STRATEGY, new FlashPersistentFieldStrategy(request));
+ configuration.add(PersistenceConstants.FLASH, new FlashPersistentFieldStrategy(request));
configuration.add("client", clientStrategy);
}
@@ -1727,14 +1727,14 @@
// Remember this is request-to-request time, presumably it'll take the developer more than
// one second to make a change, save it, and switch back to the browser.
- configuration.add(TapestryConstants.FILE_CHECK_INTERVAL_SYMBOL, "1 s");
- configuration.add(TapestryConstants.FILE_CHECK_UPDATE_TIMEOUT_SYMBOL, "50 ms");
+ configuration.add(SymbolConstants.FILE_CHECK_INTERVAL, "1 s");
+ configuration.add(SymbolConstants.FILE_CHECK_UPDATE_TIMEOUT, "50 ms");
// This should be overridden for particular applications.
- configuration.add(TapestryConstants.SUPPORTED_LOCALES_SYMBOL, "en,it,zh_CN");
+ configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,it,zh_CN");
- configuration.add(TapestryConstants.TAPESTRY_VERSION_SYMBOL,
- TapestryUtils.readVersionNumber(
+ configuration.add(SymbolConstants.TAPESTRY_VERSION,
+ VersionUtils.readVersionNumber(
"META-INF/maven/org.apache.tapestry/tapestry-core/pom.properties"));
configuration.add("tapestry.default-cookie-max-age", "7 d");
@@ -1749,15 +1749,15 @@
configuration.add("tapestry.page-pool.hard-limit", "20");
configuration.add("tapestry.page-pool.active-window", "10 m");
- configuration.add(TapestryConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL, "false");
+ configuration.add(SymbolConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS, "false");
- configuration.add(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL, "false");
+ configuration.add(SymbolConstants.FORCE_ABSOLUTE_URIS, "false");
- configuration.add(TapestryConstants.PRODUCTION_MODE_SYMBOL, "true");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "true");
- configuration.add(TapestryConstants.COMPRESS_WHITESPACE_SYMBOL, "true");
+ configuration.add(SymbolConstants.COMPRESS_WHITESPACE, "true");
- configuration.add(TapestryConstants.SECURE_PAGE, "false");
+ configuration.add(MetaDataConstants.SECURE_PAGE, "false");
// This is designed to make it easy to keep synchronized with script.aculo.ous. As we
// support a new version, we create a new folder, and update the path entry. We can then
@@ -1776,8 +1776,8 @@
configuration.add(PersistentFieldManagerImpl.META_KEY, PersistentFieldManagerImpl.DEFAULT_STRATEGY);
- configuration.add(TapestryConstants.RESPONSE_CONTENT_TYPE, "text/html");
- configuration.add(TapestryConstants.RESPONSE_ENCODING, "UTF-8");
+ configuration.add(MetaDataConstants.RESPONSE_CONTENT_TYPE, "text/html");
+ configuration.add(MetaDataConstants.RESPONSE_ENCODING, "UTF-8");
}
@@ -1969,9 +1969,9 @@
/**
* Contributes filters: <dl> <dt>Ajax</dt> <dd>Determines if the request is Ajax oriented, and redirects to an
* alternative handler if so</dd> <dt>ImmediateRender</dt> <dd>When {@linkplain
- * TapestryConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL immediate action response rendering} is enabled,
- * generates the markup response (instead of a page redirect response, which is the normal behavior) </dd>
- * <dt>Secure</dt> <dd>Sends a redirect if an non-secure request accesses a secure page</dd></dl>
+ * org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate action response rendering}
+ * is enabled, generates the markup response (instead of a page redirect response, which is the normal behavior)
+ * </dd> <dt>Secure</dt> <dd>Sends a redirect if an non-secure request accesses a secure page</dd></dl>
*/
public void contributeComponentEventRequestHandler(OrderedConfiguration<ComponentEventRequestFilter> configuration,
final RequestSecurityManager requestSecurityManager,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Thu May 15 18:55:31 2008
@@ -953,9 +953,9 @@
return newMock(FieldValidationSupport.class);
}
- protected final PageRenderSupport mockPageRenderSupport()
+ protected final RenderSupport mockRenderSupport()
{
- return newMock(PageRenderSupport.class);
+ return newMock(RenderSupport.class);
}
protected final void train_getInheritInformalParameters(EmbeddedComponentModel model, boolean inherits)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js Thu May 15 18:55:31 2008
@@ -42,7 +42,7 @@
if ((typeof Prototype == 'undefined') || (typeof Element == 'undefined') || (typeof Element.Methods == 'undefined') || (convertVersionString(Prototype.Version) < convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
throw("script.aculo.us requires the Prototype JavaScript framework >= " + Scriptaculous.REQUIRED_PROTOTYPE);
-// Tapestry turns off this mechanism, and replaces it with PageRenderSupport.addScriptLink().
+// Tapestry turns off this mechanism, and replaces it with RenderSupport.addScriptLink().
// $A(document.getElementsByTagName("script")).findAll(function(s)
// {
// return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt Thu May 15 18:55:31 2008
@@ -48,9 +48,9 @@
the JavaScript libraries.
Most of this is accomplished via the
- {{{../../apidocs/org/apache/tapestry/PageRenderSupport.html}PageRenderSupport}} object.
+ {{{../../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}} object.
- PageRenderSupport include a number of methods that will be used by components, or event by
+ RenderSupport include a number of methods that will be used by components, or event by
services that are called from components.
* addScriptLink()
@@ -76,11 +76,11 @@
private Asset dragDropLibrary;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
void setupRender()
{
- pageRenderSupport.addScriptLink(dragDropLibrary);
+ renderSupport.addScriptLink(dragDropLibrary);
}
+---+
@@ -88,10 +88,10 @@
The Asset is injected, using the $\{tapestry.scriptaculous\} symbol to reference the location
of the Scriptaculous library.
- The PageRenderSupport is accessed as an Environmental service.
+ The RenderSupport is accessed as an Environmental service.
The setupRender() method (the name is specifically linked to a
- {{{rendering.html}render phase}}) is the correct place to inform the PageRenderSupport service that
+ {{{rendering.html}render phase}}) is the correct place to inform the RenderSupport service that
the library is needed.
@@ -108,35 +108,35 @@
for arguments. This saves you the trouble of calling String.format() yourself. In any case, the
formatting JavaScript is added to the script block.
-* Injecting PageRenderSupport
+* Injecting RenderSupport
- PageRenderSupport is an <environmental> object, so you will normally inject it via the
+ RenderSupport is an <environmental> object, so you will normally inject it via the
{{{../../apidocs/org/apache/tapestry/annotations/Environmental.html}Environmental}} annotation:
+---+
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
+---+
Environmental only works inside components and occasionally a service may want to
- inject PageRenderSupport. Fortunately, a proxy of PageRenderSupport has been set up. The upshot of which
+ inject RenderSupport. Fortunately, a proxy of RenderSupport has been set up. The upshot of which
is, you may also:
+---+
@Inject
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
+----+
... or, in a service implementation constructor:
+---+
- public MyServiceImpl(PageRenderSupport support)
+ public MyServiceImpl(RenderSupport support)
{
. . .
}
+---+
- Inside a component, you should use Environmental, to highlight the fact that PageRenderSupport (like most
+ Inside a component, you should use Environmental, to highlight the fact that RenderSupport (like most
environmental objects) is only available during rendering, not during action requests.
IncludeJavaScriptLibrary Annotation
@@ -155,8 +155,8 @@
}
+---+
- This saves you the effort of injecting the asset and making the call to PageRenderSupport.
- Chances are you will <still> inject PageRenderSupport so as to add some initialization JavaScript.
+ This saves you the effort of injecting the asset and making the call to RenderSupport.
+ Chances are you will <still> inject RenderSupport so as to add some initialization JavaScript.
Ajax Components and Mixins
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt Thu May 15 18:55:31 2008
@@ -28,7 +28,7 @@
is used to dynamically connect to a Environmental service provided by an enclosing component.
A very common Environmental is
- {{{../../apidocs/org/apache/tapestry/PageRenderSupport.html}PageRenderSupport}}, used
+ {{{../../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}}, used
when generating {{{ajax.html}client-side JavaScript}}.
+---+
@@ -37,11 +37,11 @@
private Asset dragDropLibrary;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
void setupRender()
{
- pageRenderSupport.addScriptLink(_dragDropLibrary);
+ renderSupport.addScriptLink(_dragDropLibrary);
}
+---+
@@ -97,7 +97,7 @@
Notice that when pushing a value into the Environment, you identify its type as well as the
instance. Environment maintains a number of stacks, one for each type. Thus, pushing a TabModel into
- the environment won't disturb the PageRenderSupport or other environmentals already there.
+ the environment won't disturb the RenderSupport or other environmentals already there.
What's important here is that the code that pushes a environmental onto a stack should also pop it off.
@@ -125,13 +125,13 @@
it using the peek() method.
If this is something that will occur frequently, it is possible to create a service implementation
- that is "backed" by the Environment. For example, PageRenderSupport is accessible as a normal injection, because
+ that is "backed" by the Environment. For example, RenderSupport is accessible as a normal injection, because
a service is built for it in TapestryModule:
+---+
- public PageRenderSupport buildPageRenderSupport(EnvironmentalShadowBuilder builder)
+ public RenderSupport buildRenderSupport(EnvironmentalShadowBuilder builder)
{
- return builder.build(PageRenderSupport.class);
+ return builder.build(RenderSupport.class);
}
+----+