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 18:12:29 UTC
svn commit: r657123 [3/3] - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/ main/java/org/apache/tapestry/corelib/base/
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/corelib/mixins/ main/...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyEditContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyEditContext.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyEditContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyEditContext.java Fri May 16 09:12:25 2008
@@ -22,7 +22,7 @@
/**
* Defines a context for editing a property of a bean via {@link org.apache.tapestry.corelib.components.BeanEditor}.
- * This value is made available to blocks via the {@link org.apache.tapestry.annotations.Environmental} annotation.
+ * This value is made available to blocks via the {@link org.apache.tapestry.annotation.Environmental} annotation.
*
* @see org.apache.tapestry.services.BeanBlockSource
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyOutputContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyOutputContext.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyOutputContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyOutputContext.java Fri May 16 09:12:25 2008
@@ -20,7 +20,7 @@
/**
* Provides context information needed when displaying a value. This interface is an integral part of the {@link Grid}
* and similar output components. It is made available to components via an {@link
- * org.apache.tapestry.annotations.Environmental} annotation.
+ * org.apache.tapestry.annotation.Environmental} annotation.
*/
public interface PropertyOutputContext
{
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=657123&r1=657122&r2=657123&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 Fri May 16 09:12:25 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.services;
import org.apache.tapestry.*;
-import org.apache.tapestry.annotations.*;
+import org.apache.tapestry.annotation.*;
import org.apache.tapestry.beaneditor.Validate;
import org.apache.tapestry.corelib.data.BlankOption;
import org.apache.tapestry.corelib.data.GridPagerPosition;
@@ -34,18 +34,19 @@
import org.apache.tapestry.internal.translator.*;
import org.apache.tapestry.internal.util.IntegerRange;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.*;
+import org.apache.tapestry.ioc.annotation.*;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import org.apache.tapestry.ioc.services.*;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.ioc.util.TimeInterval;
-import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.runtime.ComponentResourcesAware;
import org.apache.tapestry.runtime.RenderCommand;
import org.apache.tapestry.util.StringToEnumCoercion;
import org.apache.tapestry.validator.*;
+import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.*;
import org.slf4j.Logger;
import javax.servlet.ServletContext;
@@ -275,15 +276,15 @@
* Adds a number of standard component class transform workers: <dl> <dt>Retain </dt> <dd>Allows fields to retain
* their values between requests</dd> <dt>Persist </dt> <dd>Allows fields to store their their value persistently
* between requests</dd> <dt>Parameter </dt> <dd>Identifies parameters based on the {@link
- * org.apache.tapestry.annotations.Parameter} annotation</dd> <dt>Component </dt> <dd>Defines embedded components
- * based on the {@link org.apache.tapestry.annotations.Component} annotation</dd> <dt>Mixin </dt> <dd>Adds a mixin
- * as part of a component's implementation</dd> <dt>Environment </dt> <dd>Allows fields to contain values extracted
+ * org.apache.tapestry.annotation.Parameter} annotation</dd> <dt>Component </dt> <dd>Defines embedded components
+ * based on the {@link org.apache.tapestry.annotation.Component} annotation</dd> <dt>Mixin </dt> <dd>Adds a mixin as
+ * part of a component's implementation</dd> <dt>Environment </dt> <dd>Allows fields to contain values extracted
* from the {@link org.apache.tapestry.services.Environment} service</dd> <dt>Inject </dt> <dd>Used with the {@link
- * org.apache.tapestry.ioc.annotations.Inject} annotation, when a value is supplied</dd> <dt>InjectPage</dt>
- * <dd>Adds code to allow access to other pages via the {@link org.apache.tapestry.annotations.InjectPage} field
+ * org.apache.tapestry.ioc.annotation.Inject} annotation, when a value is supplied</dd> <dt>InjectPage</dt> <dd>Adds
+ * code to allow access to other pages via the {@link org.apache.tapestry.annotation.InjectPage} field
* annotation</dd> <dt>InjectBlock </dt> <dd>Allows a block from the template to be injected into a field</dd>
- * <dt>IncludeStylesheet </dt> <dd>Supports the {@link org.apache.tapestry.annotations.IncludeStylesheet}
- * annotation</dd> <dt>IncludeJavaScriptLibrary </dt> <dd>Supports the {@link org.apache.tapestry.annotations.IncludeJavaScriptLibrary}
+ * <dt>IncludeStylesheet </dt> <dd>Supports the {@link org.apache.tapestry.annotation.IncludeStylesheet}
+ * annotation</dd> <dt>IncludeJavaScriptLibrary </dt> <dd>Supports the {@link org.apache.tapestry.annotation.IncludeJavaScriptLibrary}
* annotation</dd> <dt>SupportsInformalParameters </dt> <dd>Checks for the annotation</dd> <dt>Meta </dt> <dd>Checks
* for meta data and adds it to the component model</dd> <dt>ApplicationState </dt> <dd>Converts fields that
* reference application state objects <dt>UnclaimedField </dt> <dd>Identifies unclaimed fields and resets them to
@@ -291,13 +292,13 @@
* {@link org.apache.tapestry.runtime.RenderCommand}</dd> <dt>SetupRender, BeginRender, etc. </dt> <dd>Correspond to
* component render phases and annotations</dd> <dt>InvokePostRenderCleanupOnResources </dt> <dd>Makes sure {@link
* org.apache.tapestry.internal.InternalComponentResources#postRenderCleanup()} is invoked after a component
- * finishes rendering</dd> <dt>Secure</dt> <dd>Checks for the {@link org.apache.tapestry.annotations.Secure}
- * annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link org.apache.tapestry.annotations.ContentType}
- * annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the {@link org.apache.tapestry.annotations.ResponseEncoding}
+ * finishes rendering</dd> <dt>Secure</dt> <dd>Checks for the {@link org.apache.tapestry.annotation.Secure}
+ * annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link org.apache.tapestry.annotation.ContentType}
+ * annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the {@link org.apache.tapestry.annotation.ResponseEncoding}
* annotation</dd> <dt>GenerateAccessors</dt> <dd>Generates accessor methods if {@link
- * org.apache.tapestry.annotations.Property} annotation is present </dd> <dt>Cached</dt> <dd>Checks for the {@link
- * org.apache.tapestry.annotations.Cached} annotation</dd><dt>Log</dt> <dd>Checks for the {@link
- * org.apache.tapestry.annotations.Log} annotation</dd></dl>
+ * org.apache.tapestry.annotation.Property} annotation is present </dd> <dt>Cached</dt> <dd>Checks for the {@link
+ * org.apache.tapestry.annotation.Cached} annotation</dd><dt>Log</dt> <dd>Checks for the {@link
+ * org.apache.tapestry.annotation.Log} annotation</dd></dl>
*/
public static void contributeComponentClassTransformWorker(
OrderedConfiguration<ComponentClassTransformWorker> configuration,
@@ -559,7 +560,7 @@
* <dt>ErrorFilter</dt> <dd>Catches request errors and lets the {@link org.apache.tapestry.services.RequestExceptionHandler}
* handle them</dd> <dt>Localization</dt> <dd>Determines the locale for the current request from header data or
* cookies in the request</dd> <dt>StoreIntoGlobals</dt> <dd>Stores the request and response into the {@link
- * org.apache.tapestry.services.RequestGlobals} service (this is repeated at the end of the pipeline, in case any
+ * org.apache.tapestry5.services.RequestGlobals} service (this is repeated at the end of the pipeline, in case any
* filter substitutes the request or response). </dl>
*/
public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration, Context context,
@@ -1274,7 +1275,7 @@
* Contributes handlers for the following types: <dl> <dt>Object</dt> <dd>Failure case, added to provide more useful
* exception message</dd> <dt>{@link RenderCommand}</dt> <dd>Typically, a {@link org.apache.tapestry.Block}</dd>
* <dt>{@link Component}</dt> <dd>Renders the component and its body</dd> <dt>{@link
- * org.apache.tapestry.json.JSONObject}</dt> <dd>The JSONObject is returned as a text/javascript response</dd>
+ * org.apache.tapestry5.json.JSONObject}</dt> <dd>The JSONObject is returned as a text/javascript response</dd>
* <dt>{@link org.apache.tapestry.StreamResponse}</dt> <dd>The stream response is sent as the actual response</dd>
* </dl>
*/
@@ -1366,8 +1367,8 @@
/**
- * 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>
+ * Adds page render filters, each of which provides an {@link org.apache.tapestry.annotation.Environmental} service.
+ * Filters often provide {@link Environmental} services needed by components as they render. <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>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java Fri May 16 09:12:25 2008
@@ -33,7 +33,7 @@
/**
* Signature for {@link org.apache.tapestry.runtime.Component#dispatchComponentEvent(org.apache.tapestry.runtime.ComponentEvent)}.
*
- * @see org.apache.tapestry.annotations.OnEvent
+ * @see org.apache.tapestry.annotation.OnEvent
*/
public static final TransformMethodSignature DISPATCH_COMPONENT_EVENT = new TransformMethodSignature(
Modifier.PUBLIC, "boolean", "dispatchComponentEvent", new String[] { ComponentEvent.class.getName() },
@@ -66,21 +66,21 @@
/**
* Signature for {@link org.apache.tapestry.runtime.Component#setupRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.SetupRender
+ * @see org.apache.tapestry.annotation.SetupRender
*/
public static final TransformMethodSignature SETUP_RENDER_SIGNATURE = renderPhaseSignature("setupRender");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#beginRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.BeginRender
+ * @see org.apache.tapestry.annotation.BeginRender
*/
public static final TransformMethodSignature BEGIN_RENDER_SIGNATURE = renderPhaseSignature("beginRender");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#beforeRenderTemplate(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.BeforeRenderTemplate
+ * @see org.apache.tapestry.annotation.BeforeRenderTemplate
*/
public static final TransformMethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature(
"beforeRenderTemplate");
@@ -88,7 +88,7 @@
/**
* Signature for {@link org.apache.tapestry.runtime.Component#afterRenderTemplate(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.BeforeRenderTemplate
+ * @see org.apache.tapestry.annotation.BeforeRenderTemplate
*/
public static final TransformMethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature(
"afterRenderTemplate");
@@ -96,7 +96,7 @@
/**
* Signature for {@link org.apache.tapestry.runtime.Component#beforeRenderBody(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.BeforeRenderBody
+ * @see org.apache.tapestry.annotation.BeforeRenderBody
*/
public static final TransformMethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature(
"beforeRenderBody");
@@ -104,21 +104,21 @@
/**
* Signature for {@link org.apache.tapestry.runtime.Component#afterRenderBody(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.AfterRenderBody
+ * @see org.apache.tapestry.annotation.AfterRenderBody
*/
public static final TransformMethodSignature AFTER_RENDER_BODY_SIGNATURE = renderPhaseSignature("afterRenderBody");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#afterRender(MarkupWriter, Event)}
*
- * @see org.apache.tapestry.annotations.AfterRender
+ * @see org.apache.tapestry.annotation.AfterRender
*/
public static final TransformMethodSignature AFTER_RENDER_SIGNATURE = renderPhaseSignature("afterRender");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#cleanupRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotations.CleanupRender
+ * @see org.apache.tapestry.annotation.CleanupRender
*/
public static final TransformMethodSignature CLEANUP_RENDER_SIGNATURE = renderPhaseSignature("cleanupRender");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java Fri May 16 09:12:25 2008
@@ -28,7 +28,7 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.services.SymbolProvider;
import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.ApplicationGlobals;
+import org.apache.tapestry5.services.ApplicationGlobals;
import java.util.Locale;
import java.util.Map;
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=657123&r1=657122&r2=657123&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 Fri May 16 09:12:25 2008
@@ -15,16 +15,16 @@
package org.apache.tapestry.test;
import org.apache.tapestry.*;
-import org.apache.tapestry.annotations.Id;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.Path;
+import org.apache.tapestry.annotation.Id;
+import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry.annotation.Path;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.PropertyModel;
import org.apache.tapestry.internal.services.MapMessages;
import org.apache.tapestry.internal.services.MarkupWriterImpl;
import static org.apache.tapestry.internal.test.CodeEq.codeEq;
import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotation.Inject;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java Fri May 16 09:12:25 2008
@@ -52,7 +52,7 @@
Defense.notNull(value, "value");
V existing = keyToValue.get(key);
- if (existing != null) throw new IllegalArgumentException(UtilMessages.duplicateKey(key, value, existing));
+ if (existing != null) throw new IllegalArgumentException(PublicUtilMessages.duplicateKey(key, value, existing));
keyToValue.put(key, value);
@@ -118,7 +118,7 @@
currentKey = valueToKey.get(value);
- if (currentKey == null) throw new IllegalArgumentException(UtilMessages.missingValue(value, valueToKey
+ if (currentKey == null) throw new IllegalArgumentException(PublicUtilMessages.missingValue(value, valueToKey
.keySet()));
return currentKey;
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/PublicUtilMessages.java (from r647587, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/UtilMessages.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/PublicUtilMessages.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/PublicUtilMessages.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/UtilMessages.java&r1=647587&r2=657123&rev=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/UtilMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/PublicUtilMessages.java Fri May 16 09:12:25 2008
@@ -20,9 +20,9 @@
import java.util.Collection;
-final class UtilMessages
+final class PublicUtilMessages
{
- private static final Messages MESSAGES = MessagesImpl.forClass(UtilMessages.class);
+ private static final Messages MESSAGES = MessagesImpl.forClass(PublicUtilMessages.class);
static String duplicateKey(Object key, Object newValue, Object existingValue)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/StringToEnumCoercion.java Fri May 16 09:12:25 2008
@@ -54,7 +54,7 @@
T result = stringToEnum.get(input);
if (result == null)
- throw new RuntimeException(UtilMessages.missingEnumValue(
+ throw new RuntimeException(PublicUtilMessages.missingEnumValue(
input,
enumClass,
stringToEnum.keySet()));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?rev=657123&r1=657122&r2=657123&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Fri May 16 09:12:25 2008
@@ -33,7 +33,7 @@
<packages>
<package name="org.apache.tapestry"/>
<package name="org.apache.tapestry.dom"/>
- <package name="org.apache.tapestry.json"/>
+ <package name="org.apache.tapestry5.json"/>
<package name="org.apache.tapestry.services"/>
<package name="org.apache.tapestry.util"/>
<package name="org.apache.tapestry.runtime"/>