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 [1/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...
Author: hlship
Date: Thu May 15 18:55:31 2008
New Revision: 656921
URL: http://svn.apache.org/viewvc?rev=656921&view=rev
Log:
TAPESTR-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/BindingConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/CSSClassConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/EventConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupUtils.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MetaDataConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PersistenceConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/RenderSupport.java
- copied, changed from r649837, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/SymbolConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/VersionUtils.java
- copied, changed from r650576, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderSupportImpl.java
- copied, changed from r654390, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestConstants.java
- copied, changed from r649848, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/MarkupUtilsTest.java
- copied, changed from r650576, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/VersionUtilsTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderSupportImplTest.java
- copied, changed from r649837, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractComponentEventLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/EventLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormFragment.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Zone.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/Autocomplete.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/TriggerFragment.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ContentTypeWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ResponseEncodingWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/SecureWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/AnyTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/ImmediateModeTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestSecurityManagerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java Thu May 15 18:55:31 2008
@@ -29,8 +29,8 @@
* Returns a URL that can be passed, unchanged, to the client in order for it to access the resource. The same value
* is returned from <code>toString()</code>.
* <p/>
- * Note that the returned value may be {@linkplain org.apache.tapestry.TapestryConstants#FORCE_ABSOLUTE_URIS_SYMBOL
- * request dependent}. You may cache instances of Asset, but do not cache the client URL path as it may change.
+ * Note that the returned value may be {@linkplain SymbolConstants#FORCE_ABSOLUTE_URIS request dependent}. You may
+ * cache instances of Asset, but do not cache the client URL path as it may change.
*/
String toClientURL();
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/BindingConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/BindingConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/BindingConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/BindingConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,34 @@
+package org.apache.tapestry;
+
+/**
+ * Constants for the built-in binding prefixes. These are often used with the {@link
+ * org.apache.tapestry.annotations.Parameter#defaultPrefix()} annotation attribute.
+ */
+public class BindingConstants
+{
+ /**
+ * Binding expression prefix used for literal strings.
+ */
+ public static final String LITERAL = "literal";
+ /**
+ * Binding expression prefix used to bind to a property of the component. When {@link
+ * org.apache.tapestry.annotations.Parameter#defaultPrefix()} is not specified, the default is PROP.
+ */
+ public static final String PROP = "prop";
+
+ public static final String NULLFIELDSTRATEGY = "nullfieldstrategy";
+
+ public static final String COMPONENT = "component";
+
+ public static final String MESSAGE = "message";
+
+ public static final String VALIDATE = "validate";
+
+ public static final String TRANSLATE = "translate";
+
+ public static final String BLOCK = "block";
+
+ public static final String ASSET = "asset";
+
+ public static final String VAR = "var";
+}
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/CSSClassConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/CSSClassConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/CSSClassConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/CSSClassConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,16 @@
+package org.apache.tapestry;
+
+/**
+ * Constants used when rendering a CSS class attribute.
+ */
+public class CSSClassConstants
+{
+ /**
+ * CSS class name that causes a rendered element to be invisible on the client side.
+ */
+ public static final String INVISIBLE = "t-invisible";
+ /**
+ * All purpose CSS class name for anything related to Tapestry errors.
+ */
+ public static final String ERROR = "t-error";
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java Thu May 15 18:55:31 2008
@@ -23,7 +23,7 @@
* <p/>
* Some components must be configured to provide a client id. In many cases, the client id matches the component's
* {@linkplain ComponentResourcesCommon#getId() component id}, typically passed through {@link
- * PageRenderSupport#allocateClientId(String)} to ensure uniqueness.
+ * RenderSupport#allocateClientId(String)} to ensure uniqueness.
*/
public interface ClientElement
{
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/EventConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/EventConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/EventConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/EventConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,23 @@
+package org.apache.tapestry;
+
+/**
+ * Constant values for common event names fired by Tapestry components.
+ */
+public class EventConstants
+{
+ /**
+ * Default client event name, "action", used in most situations.
+ */
+ public static final String ACTION = "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 = "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 = "passivate";
+}
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupUtils.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupUtils.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupUtils.java Thu May 15 18:55:31 2008
@@ -0,0 +1,118 @@
+// Copyright 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Copyright 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry;
+
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Utility methods related to generating markup.
+ */
+public class MarkupUtils
+{
+ static final char APOS = '\'';
+ static final char QUOTE = '"';
+ static final char SLASH = '\\';
+
+ /**
+ * Quotes the provided value as a JavaScript string literal. The input value is surrounded by single quotes and any
+ * interior backslash, single or double quotes are escaped (a preceding backslash is added).
+ *
+ * @param text
+ * @return quoted text
+ */
+ public static String quote(String text)
+ {
+ StringBuilder result = new StringBuilder(text.length() * 2);
+
+ result.append(APOS);
+
+ for (char ch : text.toCharArray())
+ {
+ switch (ch)
+ {
+ case APOS:
+ case QUOTE:
+ case SLASH:
+
+ result.append(SLASH);
+
+ default:
+ result.append(ch);
+ break;
+ }
+ }
+
+ result.append(APOS);
+
+ return result.toString();
+ }
+
+ /**
+ * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
+ * when setting the CSS class attribute of an element.
+ */
+ public static String join(String... values)
+ {
+ List<String> list = CollectionFactory.newList(values);
+
+ return sortAndJoin(list);
+ }
+
+ /**
+ * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
+ * when setting the CSS class attribute of an element.
+ */
+ public static String join(List<String> values)
+ {
+ List<String> copy = CollectionFactory.newList(values);
+
+ return sortAndJoin(copy);
+ }
+
+ static String sortAndJoin(List<String> list)
+ {
+ Collections.sort(list);
+
+ StringBuilder builder = new StringBuilder(10 * list.size());
+
+ String sep = "";
+
+ for (String name : list)
+ {
+ builder.append(sep);
+ builder.append(name);
+
+ sep = " ";
+ }
+
+ return builder.toString();
+ }
+}
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MetaDataConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MetaDataConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MetaDataConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MetaDataConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,25 @@
+package org.apache.tapestry;
+
+/**
+ * Meta-data keys that are applied to components and pages.
+ *
+ * @see org.apache.tapestry.services.MetaDataLocator
+ */
+public class MetaDataConstants
+{
+ /**
+ * 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";
+}
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PersistenceConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PersistenceConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PersistenceConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PersistenceConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,14 @@
+package org.apache.tapestry;
+
+/**
+ * Constants for persistent field strategies.
+ *
+ * @see org.apache.tapestry.annotations.Persist#value()
+ */
+public class PersistenceConstants
+{
+ /**
+ * The page field persistence strategy that stores data in the session until the next request.
+ */
+ public static final String FLASH = "flash";
+}
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/RenderSupport.java (from r649837, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/RenderSupport.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/RenderSupport.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java&r1=649837&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/RenderSupport.java Thu May 15 18:55:31 2008
@@ -24,7 +24,7 @@
* important for JavaScript generation) as well as accumulating JavaScript to be sent to the client. PageRenderSupport
* also allows for the incremental addition of stylesheets.
*/
-public interface PageRenderSupport
+public interface RenderSupport
{
/**
* Allocates a unique id based on the component's id. In some cases, the return value will not precisely match the
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/SymbolConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/SymbolConstants.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/SymbolConstants.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/SymbolConstants.java Thu May 15 18:55:31 2008
@@ -0,0 +1,48 @@
+package org.apache.tapestry;
+
+/**
+ * Defines the names of symbols used to configure Tapestry.
+ *
+ * @see org.apache.tapestry.ioc.services.SymbolSource
+ */
+public class SymbolConstants
+{
+ /**
+ * 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 = "tapestry.production-mode";
+ /**
+ * 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 = "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 = "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 = "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 = "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 = "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 = "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 = "tapestry.version";
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java Thu May 15 18:55:31 2008
@@ -74,7 +74,7 @@
/**
* Hook used by components to allow the validator to contribute additional attribute or (more often) client-side
- * JavaScript (via the {@link PageRenderSupport}).
+ * JavaScript (via the {@link RenderSupport}).
*
* @param field the field which is currently being rendered
* @param constraintValue the value used to constrain input
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/VersionUtils.java (from r650576, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/VersionUtils.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/VersionUtils.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java&r1=650576&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/VersionUtils.java Thu May 15 18:55:31 2008
@@ -14,100 +14,16 @@
package org.apache.tapestry;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
import java.util.Properties;
/**
- * Utilities often needed when building Tapestry applications.
+ * Utility methods related to managing framework version numbers.
*/
-public class TapestryUtils
+public class VersionUtils
{
- private static final char APOS = '\'';
-
- private static final char QUOTE = '"';
-
- private static final char SLASH = '\\';
-
- /**
- * Quotes the provided value as a JavaScript string literal. The input value is surrounded by single quotes and any
- * interior backslash, single or double quotes are escaped (a preceding backslash is added).
- *
- * @param text
- * @return quoted text
- */
- public static String quote(String text)
- {
- StringBuilder result = new StringBuilder(text.length() * 2);
-
- result.append(APOS);
-
- for (char ch : text.toCharArray())
- {
- switch (ch)
- {
- case APOS:
- case QUOTE:
- case SLASH:
-
- result.append(SLASH);
-
- default:
- result.append(ch);
- break;
- }
- }
-
- result.append(APOS);
-
- return result.toString();
- }
-
- /**
- * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
- * when setting the CSS class attribute of an element.
- */
- public static String join(String... values)
- {
- List<String> list = CollectionFactory.newList(values);
-
- return sortAndJoin(list);
- }
-
- /**
- * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
- * when setting the CSS class attribute of an element.
- */
- public static String join(List<String> values)
- {
- List<String> copy = CollectionFactory.newList(values);
-
- return sortAndJoin(copy);
- }
-
- private static String sortAndJoin(List<String> list)
- {
- Collections.sort(list);
-
- StringBuilder builder = new StringBuilder(10 * list.size());
-
- String sep = "";
-
- for (String name : list)
- {
- builder.append(sep);
- builder.append(name);
-
- sep = " ";
- }
-
- return builder.toString();
- }
/**
* Reads a version number from a properties file on the classpath. These files are generally created by Maven. For
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java Thu May 15 18:55:31 2008
@@ -19,7 +19,7 @@
/**
* An annotation on a page component used to identify the content type the page returns. An alternative to the {@link
- * org.apache.tapestry.annotations.Meta} annotation with the {@link org.apache.tapestry.TapestryConstants#RESPONSE_CONTENT_TYPE}
+ * org.apache.tapestry.annotations.Meta} annotation with the {@link org.apache.tapestry.MetaDataConstants#RESPONSE_CONTENT_TYPE}
* key.
*
* @see org.apache.tapestry.annotations.ResponseEncoding
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java Thu May 15 18:55:31 2008
@@ -25,7 +25,7 @@
* This saves the work of injecting the asset into a field and injecting the PageRenderSupport environmental service,
* and invoking the method.
* <p/>
- * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.PageRenderSupport#addStylesheetLink(org.apache.tapestry.Asset,
+ * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset,
* String)} directly.
*
* @see org.apache.tapestry.annotations.Path
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.annotations;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -52,8 +52,10 @@
/**
* The event type to match. The handler will only be invoked if the client event type matches the value. The default
* value is "action". Matching is case-insensitive.
+ *
+ * @see org.apache.tapestry.EventConstants
*/
- String value() default TapestryConstants.ACTION_EVENT;
+ String value() default EventConstants.ACTION;
/**
* The local id of the component from which the event originates. If not specified, then the default is to match any
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.annotations;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.services.BindingFactory;
import java.lang.annotation.Documented;
@@ -64,8 +64,10 @@
* is <em>rarely</em> a reason to override this. Typically, non-standard default binding prefixes are paired with
* specific {@link BindingFactory} implementations, and used with parameters whose name reflects the binding
* prefix.
+ *
+ * @see org.apache.tapestry.BindingConstants
*/
- String defaultPrefix() default TapestryConstants.PROP_BINDING_PREFIX;
+ String defaultPrefix() default BindingConstants.PROP;
/**
* Used to mark a parameter as requiring earlier initialization than other parameters. This is used when default
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java Thu May 15 18:55:31 2008
@@ -20,7 +20,7 @@
/**
* An annotation on a page component used to identify the respones encoding (the character set of the text sent in the
* response). An alternative to the {@link org.apache.tapestry.annotations.Meta} annotation with the {@link
- * org.apache.tapestry.TapestryConstants#RESPONSE_ENCODING} key.
+ * org.apache.tapestry.MetaDataConstants#RESPONSE_ENCODING} key.
*
* @see org.apache.tapestry.annotations.ContentType
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Secure.java Thu May 15 18:55:31 2008
@@ -23,7 +23,7 @@
/**
* A marker annotation that indicates that the page in question may only be accessed via HTTPS.
*
- * @see org.apache.tapestry.TapestryConstants#SECURE_PAGE
+ * @see org.apache.tapestry.MetaDataConstants#SECURE_PAGE
*/
@Target(TYPE)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractComponentEventLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractComponentEventLink.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractComponentEventLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractComponentEventLink.java Thu May 15 18:55:31 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.corelib.base;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.Link;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.internal.services.ClientBehaviorSupport;
@@ -40,7 +40,7 @@
/**
* Binding the zone parameter turns the link into a an Ajax control that causes the related zone to be updated.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String zone;
@Environmental
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java Thu May 15 18:55:31 2008
@@ -37,7 +37,7 @@
* id, first by looking for a message key named "id-label" (substituting the component's actual id), then by
* converting the actual id to a presentable string (for example, "userId" to "User Id").
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String label;
/**
@@ -108,7 +108,7 @@
* times, a suffix will be appended to the to id to ensure uniqueness. The uniqued value may be accessed via the
* {@link #getClientId() clientId property}.
*/
- @Parameter(value = "prop:componentResources.id", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "prop:componentResources.id", defaultPrefix = BindingConstants.LITERAL)
private String clientId;
private String assignedClientId;
@@ -119,7 +119,7 @@
private FormSupport formSupport;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Inject
private ComponentResources resources;
@@ -149,7 +149,7 @@
// exceptions, including a form that renders inside a loop, or a form inside a component
// that is used multiple times.
- assignedClientId = pageRenderSupport.allocateClientId(id);
+ assignedClientId = renderSupport.allocateClientId(id);
String controlName = formSupport.allocateControlName(id);
formSupport.storeAndExecute(this, new SetupAction(controlName));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractLink.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractLink.java Thu May 15 18:55:31 2008
@@ -15,7 +15,6 @@
package org.apache.tapestry.corelib.base;
import org.apache.tapestry.*;
-import static org.apache.tapestry.TapestryConstants.LITERAL_BINDING_PREFIX;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SetupRender;
import org.apache.tapestry.annotations.SupportsInformalParameters;
@@ -35,7 +34,7 @@
/**
* An anchor value to append to the generated URL (the hash separator will be added automatically).
*/
- @Parameter(defaultPrefix = LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String anchor;
/**
@@ -49,7 +48,7 @@
private ComponentResources resources;
@Inject
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
private Link link;
@@ -121,7 +120,7 @@
String.format("Client id for %s is not available as it did not render yet (or was disabled).",
resources.getCompleteId()));
- clientId = pageRenderSupport.allocateClientId(resources);
+ clientId = renderSupport.allocateClientId(resources);
element.forceAttributes("id", clientId);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java Thu May 15 18:55:31 2008
@@ -65,7 +65,7 @@
* The object that will perform input validation (which occurs after translation). The translate binding prefix is
* generally used to provide this object in a declarative fashion.
*/
- @Parameter(defaultPrefix = TapestryConstants.VALIDATE_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.VALIDATE)
@SuppressWarnings("unchecked")
private FieldValidator<Object> validate;
@@ -83,7 +83,7 @@
* replace the nulls with some other value. The default strategy leaves nulls alone. Another built-in strategy,
* zero, replaces nulls with the value 0.
*/
- @Parameter(defaultPrefix = TapestryConstants.NULLFIELDSTRATEGY_BINDING_PREFIX, value = "default")
+ @Parameter(defaultPrefix = BindingConstants.NULLFIELDSTRATEGY, value = "default")
private NullFieldStrategy nulls;
@Environmental
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.corelib.components;
import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.Link;
-import static org.apache.tapestry.TapestryConstants.ACTION_EVENT;
import org.apache.tapestry.corelib.base.AbstractComponentEventLink;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -30,7 +30,7 @@
protected Link createLink(Object[] contextArray)
{
- return resources.createActionLink(ACTION_EVENT, false, contextArray);
+ return resources.createActionLink(EventConstants.ACTION, false, contextArray);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java Thu May 15 18:55:31 2008
@@ -26,13 +26,13 @@
@SupportsInformalParameters
public class Any implements ClientElement
{
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String element;
/**
* The desired client id, which defaults to the components id.
*/
- @Parameter(value = "prop:componentResources.id", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "prop:componentResources.id", defaultPrefix = BindingConstants.LITERAL)
private String clientId;
private Element anyElement;
@@ -43,7 +43,7 @@
private ComponentResources resources;
@Inject
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
String defaultElement()
{
@@ -71,7 +71,7 @@
{
if (uniqueId == null)
{
- uniqueId = pageRenderSupport.allocateClientId(clientId);
+ uniqueId = renderSupport.allocateClientId(clientId);
anyElement.forceAttributes("id", clientId);
}
@@ -83,9 +83,9 @@
writer.end(); // the element
}
- void inject(PageRenderSupport support, ComponentResources resources, String element, String clientId)
+ void inject(RenderSupport support, ComponentResources resources, String element, String clientId)
{
- this.pageRenderSupport = support;
+ this.renderSupport = support;
this.resources = resources;
this.element = element;
this.clientId = clientId;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.corelib.components;
import org.apache.tapestry.Binding;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.SupportsInformalParameters;
@@ -68,14 +68,14 @@
* case-insensitive.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String include;
/**
* A comma-separated list of property names to be removed from the {@link BeanModel}. The names are
* case-insensitive.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String exclude;
/**
@@ -83,7 +83,7 @@
* names are case insensitive. Any properties not indicated in the list will be appended to the end of the display
* order.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String reorder;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java Thu May 15 18:55:31 2008
@@ -47,7 +47,7 @@
/**
* The text label for the submit button of the form, by default "Create/Update".
*/
- @Parameter(value = "message:submit-label", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "message:submit-label", defaultPrefix = BindingConstants.LITERAL)
@Property
private String submitLabel;
@@ -68,7 +68,7 @@
* case-insensitive.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String include;
/**
@@ -76,7 +76,7 @@
* The names are case-insensitive.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String exclude;
/**
@@ -85,7 +85,7 @@
* order.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String reorder;
/**
@@ -98,7 +98,7 @@
* Binding the zone parameter will cause the form submission to be handled as an Ajax request that updates the
* indicated zone. Often a BeanEditForm will update the same zone that contains it.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String zone;
@Component(parameters = { "clientValidation=inherit:clientValidation", "zone=inherit:zone" })
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java Thu May 15 18:55:31 2008
@@ -15,9 +15,9 @@
package org.apache.tapestry.corelib.components;
import org.apache.tapestry.Binding;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.Property;
@@ -62,14 +62,14 @@
* case-insensitive.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String include;
/**
* A comma-separated list of property names to be removed from the {@link org.apache.tapestry.beaneditor.BeanModel}.
* The names are case-insensitive.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String exclude;
/**
@@ -77,7 +77,7 @@
* names are case insensitive. Any properties not indicated in the list will be appended to the end of the display
* order.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String reorder;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java Thu May 15 18:55:31 2008
@@ -56,11 +56,11 @@
@SuppressWarnings("unchecked")
private FieldValidator<Object> validate = NOOP_VALIDATOR;
- @Parameter(defaultPrefix = TapestryConstants.ASSET_BINDING_PREFIX, value = "datefield.gif")
+ @Parameter(defaultPrefix = BindingConstants.ASSET, value = "datefield.gif")
private Asset icon;
@Environmental
- private PageRenderSupport support;
+ private RenderSupport support;
@Environmental
private ValidationTracker tracker;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java Thu May 15 18:55:31 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.corelib.components;
+import org.apache.tapestry.CSSClassConstants;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.ValidationTracker;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
@@ -42,7 +42,7 @@
* The CSS class for the div element rendered by the component. The default value is "t-error".
*/
@Parameter(name = "class")
- private String className = TapestryConstants.ERROR_CLASS;
+ private String className = CSSClassConstants.ERROR;
// Allow null so we can generate a better error message if missing
@Environmental(false)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/EventLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/EventLink.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/EventLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/EventLink.java Thu May 15 18:55:31 2008
@@ -14,9 +14,9 @@
package org.apache.tapestry.corelib.components;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Link;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.corelib.base.AbstractComponentEventLink;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -38,7 +38,7 @@
* org.apache.tapestry.corelib.components.ActionLink} triggers an "action" event on itself, and EventLink component
* triggers any arbitrary event on <em>its container</em>.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String event;
@Inject
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java Thu May 15 18:55:31 2008
@@ -133,7 +133,7 @@
* Binding the zone parameter will cause the form submission to be handled as an Ajax request that updates the
* indicated zone. Often a Form will update the same zone that contains it.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String zone;
@Inject
@@ -143,7 +143,7 @@
private ComponentResources resources;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Inject
private Request request;
@@ -151,7 +151,7 @@
@Inject
private ComponentSource source;
- @Persist(TapestryConstants.FLASH_PERSISTENCE_STRATEGY)
+ @Persist(PersistenceConstants.FLASH)
private ValidationTracker defaultTracker;
@Inject
@@ -207,7 +207,7 @@
throw new RuntimeException(ex);
}
- name = pageRenderSupport.allocateClientId(resources);
+ name = renderSupport.allocateClientId(resources);
formSupport = new FormSupportImpl(name, actions, clientBehaviorSupport, clientValidation);
@@ -228,7 +228,7 @@
resources.triggerEvent(PREPARE, contextArray, null);
- Link link = resources.createActionLink(TapestryConstants.ACTION_EVENT, true, contextArray);
+ Link link = resources.createActionLink(EventConstants.ACTION, true, contextArray);
// Save the form element for later, in case we want to write an encoding type attribute.
@@ -239,7 +239,7 @@
resources.renderInformalParameters(writer);
- div = writer.element("div", "class", TapestryConstants.INVISIBLE_CLASS);
+ div = writer.element("div", "class", CSSClassConstants.INVISIBLE);
for (String parameterName : link.getParameterNames())
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormFragment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormFragment.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormFragment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormFragment.java Thu May 15 18:55:31 2008
@@ -57,21 +57,21 @@
* Name of a function on the client-side Tapestry.ElementEffect object that is invoked to make the fragment visible.
* If not specified, then the default "slidedown" function is used.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
/**
* Name of a function on the client-side Tapestry.ElementEffect object that is invoked when the fragment is to be
* hidden. If not specified, the default "slideup" function is used.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String hide;
@Inject
private Environment environment;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Inject
@@ -138,14 +138,14 @@
String id = resources.getId();
controlName = formSupport.allocateControlName(id);
- clientId = pageRenderSupport.allocateClientId(id);
+ clientId = renderSupport.allocateClientId(id);
Element element = writer.element("div", "id", clientId);
resources.renderInformalParameters(writer);
if (!visible)
- element.addClassName(TapestryConstants.INVISIBLE_CLASS);
+ element.addClassName(CSSClassConstants.INVISIBLE);
writer.element("input",
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java Thu May 15 18:55:31 2008
@@ -53,26 +53,26 @@
@Parameter
private List<?> context;
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX, value = "above")
+ @Parameter(defaultPrefix = BindingConstants.LITERAL, value = "above")
private InsertPosition position;
/**
* Name of a function on the client-side Tapestry.ElementEffect object that is invoked to make added content
* visible. Leaving as null uses the default function, "highlight".
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
/**
* The element name to render, which is normally the element name used to represent the FormInjector component in
* the template, or "div".
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String element;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Environmental
private FormSupport formSupport;
@@ -106,7 +106,7 @@
void beginRender(MarkupWriter writer)
{
- clientId = pageRenderSupport.allocateClientId(resources);
+ clientId = renderSupport.allocateClientId(resources);
writer.element(element,
@@ -148,7 +148,7 @@
ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(
componentEventResultProcessor);
- resources.triggerContextEvent(TapestryConstants.ACTION_EVENT, context, callback);
+ resources.triggerContextEvent(EventConstants.ACTION, context, callback);
if (!callback.isAborted()) return null;
@@ -195,7 +195,7 @@
{
// Kind of ugly, but the only way to ensure we don't have name collisions on the
// client side is to force a unique id into each name (as well as each id, but that's
- // PageRenderSupport's job). It would be nice if we could agree on the uid, but
+ // RenderSupport's job). It would be nice if we could agree on the uid, but
// not essential.
String uid = Long.toHexString(System.currentTimeMillis());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java Thu May 15 18:55:31 2008
@@ -78,7 +78,7 @@
* Defines where the pager (used to navigate within the "pages" of results) should be displayed: "top", "bottom",
* "both" or "none".
*/
- @Parameter(value = "top", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "top", defaultPrefix = BindingConstants.LITERAL)
private GridPagerPosition pagerPosition;
/**
@@ -110,7 +110,7 @@
* A comma-seperated list of property names to be added to the {@link org.apache.tapestry.beaneditor.BeanModel}.
* Cells for added columns will be blank unless a cell override is provided.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String add;
/**
@@ -119,14 +119,14 @@
* case-insensitive.
*/
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String include;
/**
* A comma-separated list of property names to be removed from the {@link org.apache.tapestry.beaneditor.BeanModel}.
* The names are case-insensitive.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String exclude;
/**
@@ -134,7 +134,7 @@
* names are case insensitive. Any properties not indicated in the list will be appended to the end of the display
* order.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String reorder;
/**
@@ -175,7 +175,7 @@
* CSS class for the <table> element. In addition, informal parameters to the Grid are rendered in the table
* element.
*/
- @Parameter(name = "class", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX, value = "t-data-grid")
+ @Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL, value = "t-data-grid")
@Property(write = false)
private String tableClass;
@@ -244,7 +244,7 @@
private Request request;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
/**
* Set up via the traditional or Ajax component event request handler
@@ -435,7 +435,7 @@
if (inPlace && zone == null)
{
- zone = pageRenderSupport.allocateClientId(resources);
+ zone = renderSupport.allocateClientId(resources);
writer.element("div", "id", zone);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java Thu May 15 18:55:31 2008
@@ -75,7 +75,7 @@
private ClientBehaviorSupport clientBehaviorSupport;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
void beginRender(MarkupWriter writer)
{
@@ -140,7 +140,7 @@
? new Object[] { pageIndex }
: new Object[] { pageIndex, zone };
- Link link = resources.createActionLink(TapestryConstants.ACTION_EVENT, false, context);
+ Link link = resources.createActionLink(EventConstants.ACTION, false, context);
Element element = writer.element("a", "href", link, "title", messages.format("goto-page", pageIndex));
@@ -149,7 +149,7 @@
if (zone != null)
{
- String id = pageRenderSupport.allocateClientId(resources);
+ String id = renderSupport.allocateClientId(resources);
element.attribute("id", id);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java Thu May 15 18:55:31 2008
@@ -185,7 +185,7 @@
* The element to render. If not null, then the loop will render the indicated element around its body (on each pass
* through the loop). The default is derived from the component template.
*/
- @Parameter(value = "prop:componentResources.elementName", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "prop:componentResources.elementName", defaultPrefix = BindingConstants.LITERAL)
private String element;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java Thu May 15 18:55:31 2008
@@ -193,7 +193,7 @@
* Used to include scripting code in the rendered page.
*/
@Environmental
- private PageRenderSupport renderSupport;
+ private RenderSupport renderSupport;
/**
* Needed to access query parameters when processing form submission.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java Thu May 15 18:55:31 2008
@@ -41,7 +41,7 @@
* id, first by looking for a message key named "id-label" (substituting the component's actual id), then by
* converting the actual id to a presentable string (for example, "userId" to "User Id").
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String label;
/**
@@ -70,7 +70,7 @@
private DiscardBody discardBody;
@Inject
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
private String clientId;
@@ -124,7 +124,7 @@
{
String value = container.toClient(this.value);
- clientId = pageRenderSupport.allocateClientId(resources);
+ clientId = renderSupport.allocateClientId(resources);
controlName = container.getElementName();
writer.element("input", "type", "radio", "id", clientId, "name", controlName, "value", value);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java Thu May 15 18:55:31 2008
@@ -41,7 +41,7 @@
* id, first by looking for a message key named "id-label" (substituting the component's actual id), then by
* converting the actual id to a presentable string (for example, "userId" to "User Id").
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String label;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java Thu May 15 18:55:31 2008
@@ -90,14 +90,14 @@
* selected. The value for the blank option is always the empty string, the label may be the blank string; the
* label is from the blankLabel parameter (and is often also the empty string).
*/
- @Parameter(value = "auto", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(value = "auto", defaultPrefix = BindingConstants.LITERAL)
private BlankOption blankOption;
/**
* The label to use for the blank option, if rendered. If not specified, the container's message catalog is
* searched for a key, <code><em>id</em>-blanklabel</code>.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String blankLabel;
@Inject
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Zone.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Zone.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Zone.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Zone.java Thu May 15 18:55:31 2008
@@ -47,7 +47,7 @@
* Name of a function on the client-side Tapestry.ElementEffect object that is invoked to make the Zone's
* <div> visible before being updated. If not specified, then the basic "show" method is used.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
/**
@@ -55,13 +55,13 @@
* been updated. If not specified, then the basic "highlight" method is used, which performs a classic "yellow fade"
* to indicate to the user that and update has taken place.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String update;
private String clientId;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Environmental
private ClientBehaviorSupport clientBehaviorSupport;
@@ -78,7 +78,7 @@
void beginRender(MarkupWriter writer)
{
- clientId = pageRenderSupport.allocateClientId(resources);
+ clientId = renderSupport.allocateClientId(resources);
Element e = writer.element("div", "id", clientId);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/Autocomplete.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/Autocomplete.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/Autocomplete.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/Autocomplete.java Thu May 15 18:55:31 2008
@@ -68,7 +68,7 @@
private ComponentResources resources;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Inject
private Request request;
@@ -86,7 +86,7 @@
/**
* Overwrites the default minimum characters to trigger a server round trip (the default is 1).
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private int minChars;
@Inject
@@ -97,14 +97,14 @@
* Overrides the default check frequency for determining whether to send a server request. The default is .4
* seconds.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private double frequency;
/**
* If given, then the autocompleter will support multiple input values, seperated by any of the individual
* characters in the string.
*/
- @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String tokens;
/**
@@ -128,7 +128,7 @@
"src", loader.toClientURL(),
- "class", TapestryConstants.INVISIBLE_CLASS,
+ "class", CSSClassConstants.INVISIBLE,
"id", loaderId);
writer.end();
@@ -162,8 +162,8 @@
// Let subclasses do more.
configure(config);
- pageRenderSupport.addScript("new Ajax.Autocompleter('%s', '%s', '%s', %s);", id, menuId, link.toAbsoluteURI(),
- config);
+ renderSupport.addScript("new Ajax.Autocompleter('%s', '%s', '%s', %s);", id, menuId, link.toAbsoluteURI(),
+ config);
}
Object onAutocomplete()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/TriggerFragment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/TriggerFragment.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/TriggerFragment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/TriggerFragment.java Thu May 15 18:55:31 2008
@@ -14,10 +14,10 @@
package org.apache.tapestry.corelib.mixins;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ClientElement;
import org.apache.tapestry.Field;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.InjectContainer;
import org.apache.tapestry.annotations.Parameter;
@@ -38,11 +38,11 @@
/**
* The {@link org.apache.tapestry.corelib.components.FormFragment} instance to make dynamically visible or hidden.
*/
- @Parameter(required = true, defaultPrefix = TapestryConstants.COMPONENT_BINDING_PREFIX)
+ @Parameter(required = true, defaultPrefix = BindingConstants.COMPONENT)
private ClientElement fragment;
@Environmental
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Environmental
private Heartbeat heartbeat;
@@ -57,7 +57,7 @@
spec.put(container.getClientId());
spec.put(fragment.getClientId());
- pageRenderSupport.addInit("linkTriggerToFormFragment", spec);
+ renderSupport.addInit("linkTriggerToFormFragment", spec);
}
};