This is an automated email from the ASF dual-hosted git repository.
benweidig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new f64b97d18 Missing @Deprecated annotations added
f64b97d18 is described below
commit f64b97d1889b77425f66bd1c7c8edee7621939d5
Author: Ben Weidig <[email protected]>
AuthorDate: Sun Jun 28 08:42:00 2026 +0200
Missing @Deprecated annotations added
A lot of things had @deprecated Javadoc tags but no @Deprecated Java
annotations.
This silences ~120 compiler warnings.
---
.../beanmodel/services/BeanModelSource.java | 1 +
.../commons/services/InvalidationEventHub.java | 1 +
.../commons/services/InvalidationListener.java | 1 +
.../org/apache/tapestry5/CSSClassConstants.java | 4 ++
.../tapestry5/ComponentParameterConstants.java | 4 ++
.../org/apache/tapestry5/ComponentResources.java | 2 +
.../java/org/apache/tapestry5/MarkupConstants.java | 2 +
.../org/apache/tapestry5/ValidationDecorator.java | 1 +
.../org/apache/tapestry5/ajax/MultiZoneUpdate.java | 1 +
.../java/org/apache/tapestry5/alerts/Severity.java | 1 +
.../org/apache/tapestry5/annotations/Retain.java | 4 +-
.../apache/tapestry5/corelib/ClientValidation.java | 1 +
.../tapestry5/corelib/components/AjaxFormLoop.java | 1 +
.../tapestry5/corelib/components/Alerts.java | 1 +
.../tapestry5/corelib/components/DateField.java | 2 +
.../apache/tapestry5/corelib/components/Form.java | 1 +
.../tapestry5/corelib/components/FormFragment.java | 3 ++
.../corelib/components/Html5DateField.java | 1 +
.../apache/tapestry5/corelib/components/If.java | 1 +
.../corelib/components/ProgressiveDisplay.java | 1 +
.../apache/tapestry5/corelib/components/Zone.java | 3 ++
.../tapestry5/corelib/mixins/Autocomplete.java | 2 +
.../java/org/apache/tapestry5/dom/Element.java | 1 +
.../org/apache/tapestry5/grid/GridConstants.java | 8 +++-
.../tapestry5/internal/InternalConstants.java | 6 +++
.../services/ComponentResourcesOperation.java | 1 +
.../internal/services/ResourceDigestManager.java | 1 +
.../ajax/MultiZoneUpdateEventResultProcessor.java | 1 +
.../apache/tapestry5/internal/structure/Page.java | 3 ++
.../internal/structure/PageResetListener.java | 1 +
.../tapestry5/model/MutableComponentModel.java | 1 +
.../tapestry5/runtime/PageLifecycleAdapter.java | 1 +
.../tapestry5/runtime/PageLifecycleListener.java | 5 +++
.../org/apache/tapestry5/services/AssetAlias.java | 1 +
.../services/ClasspathAssetAliasManager.java | 1 +
.../tapestry5/services/ClientBehaviorSupport.java | 4 ++
.../services/ComponentDefaultProvider.java | 2 +
.../org/apache/tapestry5/services/Cookies.java | 8 +++-
.../org/apache/tapestry5/services/Environment.java | 2 +
.../org/apache/tapestry5/services/FormSupport.java | 1 +
.../apache/tapestry5/services/LibraryMapping.java | 1 +
.../tapestry5/services/LinkCreationListener.java | 1 +
.../tapestry5/services/MarkupWriterFactory.java | 2 +
.../services/PageRenderRequestParameters.java | 1 +
.../services/ResourceDigestGenerator.java | 1 +
.../services/ValidationDecoratorFactory.java | 2 +
.../javascript/InitializationPriority.java | 1 +
.../services/javascript/JavaScriptStack.java | 1 +
.../services/javascript/JavaScriptSupport.java | 8 ++++
.../services/javascript/StackExtensionType.java | 1 +
.../services/javascript/StylesheetOptions.java | 1 +
.../services/messages/ComponentMessagesSource.java | 1 +
.../templates/ComponentTemplateLocator.java | 1 +
.../apache/tapestry5/test/TapestryTestCase.java | 1 +
.../tapestry5/hibernate/HibernateConstants.java | 2 +
.../tapestry5/http/TapestryHttpConstants.java | 1 +
.../http/internal/services/RequestImpl.java | 2 +
.../apache/tapestry5/http/services/Request.java | 1 +
.../tapestry5/ioc/internal/util/InternalUtils.java | 1 +
.../tapestry5/ioc/services/PerthreadManager.java | 1 +
.../ioc/services/RegistryShutdownListener.java | 1 +
.../ioc/services/ThreadCleanupListener.java | 1 +
.../org/apache/tapestry5/ioc/test/IOCTestCase.java | 1 +
.../java/org/apache/tapestry5/json/JSONArray.java | 2 +
.../apache/tapestry5/test/SeleniumTestCase.java | 2 +
.../org/apache/tapestry5/test/ioc/MockTester.java | 1 +
.../org/apache/tapestry5/test/ioc/TestBase.java | 30 ++++++++++++---
.../org/apache/tapestry5/test/ioc/TestUtils.java | 45 ++++++++++++++++------
.../tapestry5/ioc/annotations/InjectResource.java | 1 +
.../tapestry5/ioc/annotations/SubModule.java | 1 +
70 files changed, 181 insertions(+), 22 deletions(-)
diff --git
a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/BeanModelSource.java
b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/BeanModelSource.java
index 6399c1f4b..c7e64325b 100644
---
a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/BeanModelSource.java
+++
b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/BeanModelSource.java
@@ -46,6 +46,7 @@ public interface BeanModelSource
* @deprecated use {@link #createDisplayModel(Class,
org.apache.tapestry5.commons.Messages)} or {@link
* #createEditModel(Class,
org.apache.tapestry5.commons.Messages)}
*/
+ @Deprecated
<T> BeanModel<T> create(Class<T> beanClass, boolean
filterReadOnlyProperties, Messages messages);
/**
diff --git
a/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationEventHub.java
b/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationEventHub.java
index 4e0f37ec5..9754d3932 100644
---
a/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationEventHub.java
+++
b/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationEventHub.java
@@ -44,6 +44,7 @@ public interface InvalidationEventHub
*
* @deprecated in 5.4, use {@link #addInvalidationCallback(Runnable)}
instead}
*/
+ @Deprecated
void addInvalidationListener(InvalidationListener listener);
/**
diff --git
a/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationListener.java
b/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationListener.java
index 56b3b26ec..4d2e1c018 100644
---
a/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationListener.java
+++
b/commons/src/main/java/org/apache/tapestry5/commons/services/InvalidationListener.java
@@ -24,6 +24,7 @@ package org.apache.tapestry5.commons.services;
* @since 5.1.0.0
* @deprecated In 5.4; use {@link
InvalidationEventHub#addInvalidationCallback(Runnable)} instead
*/
+@Deprecated
public interface InvalidationListener
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
index cdea26a20..8d72facad 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
@@ -19,6 +19,7 @@ package org.apache.tapestry5;
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+@Deprecated
public class CSSClassConstants
{
/**
@@ -26,6 +27,7 @@ public class CSSClassConstants
*
* @deprecated Removed in Tapestry 5.4 with no replacement.
*/
+ @Deprecated
public static final String INVISIBLE = "t-invisible";
/**
@@ -34,6 +36,7 @@ public class CSSClassConstants
* @deprecated Deprecated in 5.4 with no replacement; decoration of fields
with validation errors
* has moved to the client.
*/
+ @Deprecated
public static final String ERROR = "error";
/**
@@ -43,5 +46,6 @@ public class CSSClassConstants
* @deprecated Deprecated in 5.4 with no replacement; decoration of fields
with validation errors
* has moved to the client.
*/
+ @Deprecated
public static final String ERROR_SINGLE = "t-error-single";
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java
index 094befa29..dcd3baae1 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java
@@ -73,6 +73,7 @@ public class ComponentParameterConstants
* Defaults to "above".
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String FORMINJECTOR_INSERT_POSITION =
"tapestry.components.forminjector_insert_position";
/**
@@ -82,6 +83,7 @@ public class ComponentParameterConstants
* Defaults to "highlight".
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String FORMINJECTOR_SHOW_FUNCTION =
"tapestry.components.forminjector_show_function";
/**
@@ -106,6 +108,7 @@ public class ComponentParameterConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String ZONE_SHOW_METHOD =
"tapestry.components.zone_show_method";
/**
@@ -115,5 +118,6 @@ public class ComponentParameterConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String ZONE_UPDATE_METHOD =
"tapestry.components.zone_update_method";
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
index f991acbc7..5cb76d044 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
@@ -186,6 +186,7 @@ public interface ComponentResources extends
ComponentResourcesCommon
*
* @deprecated In 5.3.4, use {@link #getPageLifecycleCallbackHub()} instead
*/
+ @Deprecated
void addPageLifecycleListener(PageLifecycleListener listener);
/**
@@ -202,6 +203,7 @@ public interface ComponentResources extends
ComponentResourcesCommon
* @since 5.2.0
* @deprecated in 5.3.4, not necessary with {@link
PageLifecycleCallbackHub#addPageLoadedCallback(Runnable)}.
*/
+ @Deprecated
void removePageLifecycleListener(PageLifecycleListener listener);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupConstants.java
index b011783cd..e7320a63c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupConstants.java
@@ -29,6 +29,7 @@ public class MarkupConstants
*
* @deprecated Deprecated in Tapestry 5.4 with no replacement. Do not use.
*/
+ @Deprecated
public static final String WAIT_FOR_PAGE = "javascript:return
Tapestry.waitForPage(event);";
/**
@@ -37,5 +38,6 @@ public class MarkupConstants
* @see #WAIT_FOR_PAGE
* @deprecated Deprecated in Tapestry 5.4 with no replacement. Do not use.
*/
+ @Deprecated
public static final String ONCLICK = "onclick";
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
index 7d214f522..fb5cd241e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
@@ -29,6 +29,7 @@ import org.apache.tapestry5.dom.Element;
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+@Deprecated
public interface ValidationDecorator
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
b/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
index 93c603af6..15b024c35 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
@@ -32,6 +32,7 @@ import java.util.Map;
* @deprecated Deprecated in 5.3; use the {@link
org.apache.tapestry5.services.ajax.AjaxResponseRenderer} service instead of
* returning an instance of MultiZoneUpdate
*/
+@Deprecated
public class MultiZoneUpdate
{
private final MultiZoneUpdate parent;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Severity.java
b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Severity.java
index cc4f2e4ed..5a8fab43b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Severity.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Severity.java
@@ -43,6 +43,7 @@ public enum Severity
*
* @deprecated Deprecated in Tapestry 5.4 with no replacement (beyond the
name of the value itself).
*/
+ @Deprecated
public final String cssClass;
private Severity()
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
index a3729bde1..c251ce06b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
@@ -34,14 +34,14 @@ import static
org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
* This annotation should only be used with lazily-evaluated objects that
contain no client-specific information.
*
* @deprecated This rarely used annotation is likely to cause threading issues
starting in Tapestry 5.2 (which no longer
- * pools pages
- * but uses shared instances with externalized mutable state)
+ * pools pages but uses shared instances with externalized mutable
state)
*/
@Target(FIELD)
@Retention(RUNTIME)
@Documented
@UseWith(
{ COMPONENT, MIXIN, PAGE })
+@Deprecated
public @interface Retain
{
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/ClientValidation.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/ClientValidation.java
index f8bab7c38..c59ad00b6 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/ClientValidation.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/ClientValidation.java
@@ -26,6 +26,7 @@ public enum ClientValidation
*
* @deprecated Deprecated in 5.4, and no longer supported.
*/
+ @Deprecated
BLUR,
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
index 72eaded6b..50842fd8b 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
@@ -93,6 +93,7 @@ public class AjaxFormLoop
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
index 6893fc912..2b376b7fd 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
@@ -45,6 +45,7 @@ public class Alerts extends BaseClientElement
* @deprecated Deprecated in Tapestry 5.4; override the {@code
core-dismiss-label} message key in
* your application's message catalog. This parameter is now ignored.
*/
+ @Deprecated
@Parameter(value = "message:core-dismiss-label", defaultPrefix =
BindingConstants.LITERAL)
private String dismissText;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
index 569ebfdc3..12dc14b61 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
@@ -110,6 +110,7 @@ public class DateField extends AbstractField
*
* @deprecated Deprecated in 5.4 with no replacement. The component
leverages the Twitter Bootstrap glyphicons support.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.ASSET)
private Asset icon;
@@ -119,6 +120,7 @@ public class DateField extends AbstractField
* @since 5.2.0.0
* @deprecated Since 5.4; override the global message key
"core-date-value-not-parsable" instead (see {@link
org.apache.tapestry5.services.messages.ComponentMessagesSource})
*/
+ @Deprecated
@Parameter("componentResources.messages")
private Messages messages;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
index 5d8b8222c..2842ad028 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
@@ -321,6 +321,7 @@ public class Form implements ClientElement,
FormValidationControl
/**
* @deprecated In 5.4; previously used only for testing
*/
+ @Deprecated
public void setDefaultTracker(ValidationTracker defaultTracker)
{
this.defaultTracker = defaultTracker;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
index c4046648b..8990da44f 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
@@ -84,6 +84,7 @@ public class FormFragment implements ClientElement
*
* @deprecated Deprecated in 5.4; clients that wish to animate should
handle the <code>events.element.didShow</code> client-side event.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
@@ -93,6 +94,7 @@ public class FormFragment implements ClientElement
*
* @deprecated Deprecated in 5.4; clients that wish to animate should
handle the <code>events.element.didHide</code> client-side event.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String hide;
@@ -120,6 +122,7 @@ public class FormFragment implements ClientElement
* @since 5.3
* @deprecated Deprecated in 5.4 with no current replacement.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL, allowNull = false)
private String visibleBound;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Html5DateField.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Html5DateField.java
index d66dff7a8..3f75f1ba0 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Html5DateField.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Html5DateField.java
@@ -63,6 +63,7 @@ public class Html5DateField extends AbstractField
* @since 5.2.0.0
* @deprecated Since 5.4; override the global message key
"core-date-value-not-parsable" instead (see {@link
org.apache.tapestry5.services.messages.ComponentMessagesSource})
*/
+ @Deprecated
@Parameter("componentResources.messages")
private Messages messages;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
index 143738f91..32aab7ab3 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
@@ -37,6 +37,7 @@ public class If extends AbstractConditional
* @see Unless
* @deprecated Since 5.3 as property expressions support the '!' invert
operator
*/
+ @Deprecated
@Parameter
private boolean negate;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ProgressiveDisplay.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ProgressiveDisplay.java
index 726f4cd6e..777416915 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ProgressiveDisplay.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ProgressiveDisplay.java
@@ -86,6 +86,7 @@ public class ProgressiveDisplay
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String update;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
index 276cf8d82..d1b51d0e1 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
@@ -86,6 +86,7 @@ public class Zone implements ClientBodyElement
*
* @deprecated In 5.4, with no specific replacement, now does nothing (see
notes on client-side JavaScript events, elsewhere)
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String show;
@@ -96,6 +97,7 @@ public class Zone implements ClientBodyElement
*
* @deprecated In 5.4, with no specific replacement, now does nothing (see
notes on client-side JavaScript events, elsewhere)
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String update;
@@ -125,6 +127,7 @@ public class Zone implements ClientBodyElement
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
@Parameter
private boolean visible;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
index 097fe7951..dc631567d 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
@@ -93,6 +93,7 @@ public class Autocomplete
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private double frequency;
@@ -102,6 +103,7 @@ public class Autocomplete
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String tokens;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
index 3e0b843ca..d1ff941c8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
@@ -643,6 +643,7 @@ public final class Element extends Node
* @return the element for further configuration
* @deprecated Deprecated in 5.4, as this is now special behavior for the
"class" attribute.
*/
+ @Deprecated
public Element addClassName(String... classNames)
{
for (String name : classNames)
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
index e9c6f1914..62cdb31b1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
@@ -22,6 +22,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String FIRST_CLASS = "t-first";
/**
@@ -30,6 +31,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String LAST_CLASS = "t-last";
/**
@@ -38,6 +40,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String SORT_ASCENDING_CLASS =
"t-sort-column-ascending";
/**
@@ -46,7 +49,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
-
+ @Deprecated
public static final String SORT_DESCENDING_CLASS =
"t-sort-column-descending";
/**
@@ -81,6 +84,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String COLUMNS_ASCENDING = "sort-asc.png";
/**
@@ -88,6 +92,7 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String COLUMNS_DESCENDING = "sort-desc.png";
/**
@@ -95,5 +100,6 @@ public class GridConstants
*
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
public static final String COLUMNS_SORTABLE = "sortable.png";
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
index 948130113..f0b4d32f8 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
@@ -38,12 +38,14 @@ public final class InternalConstants
* pages, components and mixins sub-packages.
* @deprecated Use {@link
TapestryHttpInternalConstants#TAPESTRY_APP_PACKAGE_PARAM} instead
*/
+ @Deprecated
public static final String TAPESTRY_APP_PACKAGE_PARAM =
TapestryHttpInternalConstants.TAPESTRY_APP_PACKAGE_PARAM;
/**
* Turns off loading of default modules (as driven by JAR file Manifest
entries).
* @deprecated Use {@link
TapestryHttpInternalConstants#DISABLE_DEFAULT_MODULES_PARAM} instead
*/
+ @Deprecated
public static final String DISABLE_DEFAULT_MODULES_PARAM =
TapestryHttpInternalConstants.DISABLE_DEFAULT_MODULES_PARAM;
/**
@@ -84,6 +86,7 @@ public final class InternalConstants
/**
* @deprecated Use {@link
TapestryHttpInternalConstants#CHARSET_CONTENT_TYPE_PARAMETER} instead
*/
+ @Deprecated
public static final String CHARSET_CONTENT_TYPE_PARAMETER =
TapestryHttpInternalConstants.CHARSET_CONTENT_TYPE_PARAMETER;
/**
@@ -116,6 +119,7 @@ public final class InternalConstants
* @since 5.1.0.0
* @deprecated Use {@link
TapestryHttpInternalConstants#CONTENT_ENCODING_HEADER} instead
*/
+ @Deprecated
public static final String CONTENT_ENCODING_HEADER =
TapestryHttpInternalConstants.CONTENT_ENCODING_HEADER;
/**
@@ -124,6 +128,7 @@ public final class InternalConstants
* @since 5.1.0.0
* @deprecated Use {@link
TapestryHttpInternalConstants#GZIP_CONTENT_ENCODING} instead
*/
+ @Deprecated
public static final String GZIP_CONTENT_ENCODING =
TapestryHttpInternalConstants.GZIP_CONTENT_ENCODING;
/**
@@ -141,6 +146,7 @@ public final class InternalConstants
/**
* @deprecated Use {@link CommonsUtils#EMPTY_STRING_ARRAY} instead
*/
+ @Deprecated
public static final String[] EMPTY_STRING_ARRAY =
CommonsUtils.EMPTY_STRING_ARRAY;
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
index 46b8bfa4e..166b8a183 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
@@ -23,6 +23,7 @@ import org.apache.tapestry5.ComponentResources;
*
* @deprecated In Tapestry 5.4; use {@link
org.apache.tapestry5.plastic.MethodAdvice} and other parts of the new (in 5.3)
plastic library.
*/
+@Deprecated
public interface ComponentResourcesOperation
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManager.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManager.java
index 13dc669b3..d04cee18f 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManager.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManager.java
@@ -32,6 +32,7 @@ import org.apache.tapestry5.services.ResourceDigestGenerator;
* @deprecated Deprecated in 5.4 with no replacement; see release notes about
classpath assets moving to /META-INF/assets/.
* To be removed in 5.5.
*/
+@Deprecated
public interface ResourceDigestManager extends InvalidationEventHub
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/MultiZoneUpdateEventResultProcessor.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/MultiZoneUpdateEventResultProcessor.java
index d2be912da..5ab047d3f 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/MultiZoneUpdateEventResultProcessor.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/MultiZoneUpdateEventResultProcessor.java
@@ -37,6 +37,7 @@ import java.util.Map;
* @since 5.1.0.1
* @deprecated Deprecated in 5.3
*/
+@Deprecated
public class MultiZoneUpdateEventResultProcessor implements
ComponentEventResultProcessor<MultiZoneUpdate>
{
private final TypeCoercer typeCoercer;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
index c38ce34b5..e37809b98 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
@@ -147,6 +147,7 @@ public interface Page extends PageLifecycleCallbackHub
* @deprecated in 5.3.4; use {@link #addPageLoadedCallback(Runnable)},
{@link #addPageAttachedCallback(Runnable)}, or
* {@link #addPageDetachedCallback(Runnable)} instead
*/
+ @Deprecated
void addLifecycleListener(PageLifecycleListener listener);
/**
@@ -155,6 +156,7 @@ public interface Page extends PageLifecycleCallbackHub
* @since 5.2.0
* @deprecated in 5.3.4, due to introduction of {@link
#addPageLoadedCallback(Runnable)}
*/
+ @Deprecated
void removeLifecycleListener(PageLifecycleListener listener);
/**
@@ -216,6 +218,7 @@ public interface Page extends PageLifecycleCallbackHub
* @since 5.2.0
* @deprecated in 5.3.4,
*/
+ @Deprecated
void addResetListener(PageResetListener listener);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
index 055c907ea..f017321ec 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
@@ -24,6 +24,7 @@ import org.apache.tapestry5.annotations.PageReset;
* @deprecated in 5.3.4
* @see
org.apache.tapestry5.runtime.PageLifecycleCallbackHub#addResetCallback(Runnable)
*/
+@Deprecated
public interface PageResetListener
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
index bc0b57efb..29667acea 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
@@ -34,6 +34,7 @@ public interface MutableComponentModel extends ComponentModel
* @see Parameter
* @deprecated Use {@link #addParameter(String, boolean, boolean, String,
boolean)} instead.
*/
+ @Deprecated
void addParameter(String name, boolean required, boolean allowNull, String
defaultBindingPrefix);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleAdapter.java
b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleAdapter.java
index cb5b89188..6911e7fcd 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleAdapter.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleAdapter.java
@@ -19,6 +19,7 @@ package org.apache.tapestry5.runtime;
*
* @deprecated in 5.3.4, as {@link PageLifecycleListener} has been deprecated
*/
+@Deprecated
public class PageLifecycleAdapter implements PageLifecycleListener
{
public void containingPageDidAttach()
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
index 67eda6ad6..34a4680a4 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
@@ -19,6 +19,7 @@ package org.apache.tapestry5.runtime;
*
* @deprecated in 5.3.4, replaced with {@link PageLifecycleCallbackHub}
*/
+@Deprecated
public interface PageLifecycleListener
{
/**
@@ -27,6 +28,7 @@ public interface PageLifecycleListener
*
* @deprecated in 5.3.4, use {@link
org.apache.tapestry5.runtime.PageLifecycleCallbackHub#addPageLoadedCallback(Runnable)}
instead
*/
+ @Deprecated
void containingPageDidLoad();
/**
@@ -35,6 +37,7 @@ public interface PageLifecycleListener
*
* @deprecated In Tapestry 5.3, use {@link
PageLifecycleCallbackHub#addPageDetachedCallback(Runnable)} instead.
*/
+ @Deprecated
void containingPageDidDetach();
/**
@@ -43,6 +46,7 @@ public interface PageLifecycleListener
*
* @deprecated In Tapestry 5.3, use {@link
org.apache.tapestry5.runtime.PageLifecycleCallbackHub#addPageAttachedCallback(Runnable)}
instead.
*/
+ @Deprecated
void containingPageDidAttach();
/**
@@ -52,5 +56,6 @@ public interface PageLifecycleListener
* @since 5.1.0.1
* @deprecated In Tapestry 5.3, with no replacement (persisted fields now
lazily restore their state)
*/
+ @Deprecated
void restoreStateBeforePageAttach();
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetAlias.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetAlias.java
index 5edd069f3..22f1cd191 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetAlias.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetAlias.java
@@ -20,6 +20,7 @@ package org.apache.tapestry5.services;
* @since 5.4
* @deprecated Deprecated in 5.4 (see notes in {@link
ClasspathAssetAliasManager}).
*/
+@Deprecated
public class AssetAlias
{
public final String virtualFolder, path;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
index 2fbc0e2d6..b888f9065 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
@@ -43,6 +43,7 @@ import java.util.Map;
* @deprecated Deprecated in 5.4, with no replacement. This will no longer be
used in Tapestry 5.5, as all classpath assets
* will need to be under the {@code META-INF/assets} folder (but
may be maintained for compatibility reasons until 5.6).
*/
+@Deprecated
@UsesMappedConfiguration(String.class)
public interface ClasspathAssetAliasManager
{
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientBehaviorSupport.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientBehaviorSupport.java
index 145e89ebb..c967122ca 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientBehaviorSupport.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClientBehaviorSupport.java
@@ -27,6 +27,7 @@ import org.apache.tapestry5.http.Link;
* @deprecated Deprecated in 5.4 with no replacement. Use {@link
org.apache.tapestry5.services.javascript.JavaScriptSupport} directly,
* instead.
*/
+@Deprecated
public interface ClientBehaviorSupport
{
/**
@@ -71,6 +72,7 @@ public interface ClientBehaviorSupport
* name of the function used to make the SubForm invisible, or
null for the default
* @deprecated Use {@link #addFormFragment(String, boolean, String,
String, String)} instead
*/
+ @Deprecated
void addFormFragment(String clientId, String showFunctionName, String
hideFunctionName);
/**
@@ -88,6 +90,7 @@ public interface ClientBehaviorSupport
* name of the function used to make the SubForm invisible, or
null for the default
* @deprecated Use {@link #addFormFragment(String, boolean, String,
String, String)} instead
*/
+ @Deprecated
void addFormFragment(String clientId, boolean alwaysSubmit, String
showFunctionName, String hideFunctionName);
/**
@@ -110,6 +113,7 @@ public interface ClientBehaviorSupport
* @since 5.3
* @deprecated In 5.4; use the <code>core/form-fragment</code> module
instead.
*/
+ @Deprecated
void addFormFragment(String clientId, boolean alwaysSubmit, String
showFunctionName, String hideFunctionName, String visibilityBoundFunctionName);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
index 4feab20b3..0d2134f5e 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
@@ -60,6 +60,7 @@ public interface ComponentDefaultProvider
* @return the translator, or null
* @deprecated Use {@link #defaultTranslatorBinding(String,
org.apache.tapestry5.ComponentResources)} instead
*/
+ @Deprecated
FieldTranslator defaultTranslator(String parameterName, ComponentResources
resources);
/**
@@ -80,6 +81,7 @@ public interface ComponentDefaultProvider
* @return the validator, possibly a no-op validator
* @deprecated Use {@link #defaultValidatorBinding(String,
org.apache.tapestry5.ComponentResources)} instead
*/
+ @Deprecated
FieldValidator defaultValidator(String parameterName, ComponentResources
resources);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
index ddcdfc450..496cc069b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
@@ -38,7 +38,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
-
+ @Deprecated
void writeCookieValue(String name, String value);
/**
@@ -50,7 +50,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
-
+ @Deprecated
void writeCookieValue(String name, String value, int maxAge);
/**
@@ -58,6 +58,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
+ @Deprecated
void writeCookieValue(String name, String value, String path);
/**
@@ -65,6 +66,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
+ @Deprecated
void writeDomainCookieValue(String name, String value, String domain);
/**
@@ -72,6 +74,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
+ @Deprecated
void writeDomainCookieValue(String name, String value, String domain, int
maxAge);
/**
@@ -79,6 +82,7 @@ public interface Cookies
*
* @deprecated Use the {@link CookieBuilder} API, obtained with {@link
#getBuilder(String, String)}, instead.
*/
+ @Deprecated
void writeCookieValue(String name, String value, String path, String
domain);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
index 6672458a4..e054c78be 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
@@ -74,6 +74,7 @@ public interface Environment
* @deprecated Deprecated in 5.4 with no replacement; not longer used by
Tapestry.
* @see org.apache.tapestry5.TapestryConstants#RESPONSE_RENDERER
*/
+ @Deprecated
void cloak();
/**
@@ -83,5 +84,6 @@ public interface Environment
* @deprecated Deprecated in 5.4 with no replacement; not longer used by
Tapestry.
* @see org.apache.tapestry5.TapestryConstants#RESPONSE_RENDERER
*/
+ @Deprecated
void decloak();
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
index 9b8daf864..d12092052 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
@@ -98,6 +98,7 @@ public interface FormSupport extends ClientElement
* use {@link org.apache.tapestry5.services.javascript.JavaScriptSupport}
to add necessary modules, and add
* triggering and configuring attributes to the field's {@link
org.apache.tapestry5.dom.Element}.
*/
+ @Deprecated
void addValidation(Field field, String validationName, String message,
Object constraint);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
index 6794bdcea..798c173eb 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
@@ -75,6 +75,7 @@ public final class LibraryMapping
*
* @deprecated In 5.4, use {@link #libraryName} instead.
*/
+ @Deprecated
public String getPathPrefix()
{
return libraryName;
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationListener.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationListener.java
index 2c6124634..875b1c7db 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationListener.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationListener.java
@@ -22,6 +22,7 @@ import org.apache.tapestry5.http.Link;
* @see org.apache.tapestry5.services.LinkCreationHub
* @deprecated Use {@link LinkCreationListener2} instead
*/
+@Deprecated
public interface LinkCreationListener
{
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
index 1d358f8a5..f852f0da7 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
@@ -32,6 +32,7 @@ public interface MarkupWriterFactory
*
* @deprecated use {@link #newMarkupWriter(Page)} instead which doesn't
rely on the content type alone.
*/
+ @Deprecated
MarkupWriter newMarkupWriter(ContentType contentType);
/**
@@ -44,6 +45,7 @@ public interface MarkupWriterFactory
*
* @deprecated use {@link #newPartialMarkupWriter(Page)} instead which
doesn't rely on the content type alone.
*/
+ @Deprecated
MarkupWriter newPartialMarkupWriter(ContentType contentType);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
index 5340c5b87..c22b4ced6 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
@@ -38,6 +38,7 @@ public class PageRenderRequestParameters
/**
* @deprecated Use {@link #PageRenderRequestParameters(String,
EventContext, boolean)}.
*/
+ @Deprecated
public PageRenderRequestParameters(String logicalPageName, EventContext
activationContext)
{
this(logicalPageName, activationContext, false);
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
index a454da25d..6366607b3 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
@@ -31,6 +31,7 @@ import java.net.URL;
* @deprecated Deprecated in 5.4 with no replacement; see release notes about
classpath assets moving
* to /META-INF/assets/, and content checksums inside asset URLs
*/
+@Deprecated
@UsesConfiguration(String.class)
public interface ResourceDigestGenerator
{
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationDecoratorFactory.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationDecoratorFactory.java
index a3d431333..338c5854b 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationDecoratorFactory.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationDecoratorFactory.java
@@ -25,10 +25,12 @@ import org.apache.tapestry5.ValidationDecorator;
* @since 5.3
* @deprecated Deprecated in 5.4 with no replacement, as {@link
ValidationDecorator} is being phased out.
*/
+@Deprecated
public interface ValidationDecoratorFactory
{
/**
* Creates a new decorator for the indicated writer.
*/
+ @Deprecated
ValidationDecorator newInstance(MarkupWriter writer);
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/InitializationPriority.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/InitializationPriority.java
index e7babbf5b..6951ad70a 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/InitializationPriority.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/InitializationPriority.java
@@ -31,6 +31,7 @@ public enum InitializationPriority
*
* @deprecated Deprecated in 5.4; this is now treated as "earlier than
{@linkplain #EARLY early}".
*/
+ @Deprecated
IMMEDIATE,
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
index e9b15e493..d4d03b0cc 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
@@ -105,5 +105,6 @@ public interface JavaScriptStack
* may return null.
* @return how the stack is aggregated
*/
+ @Deprecated
String getInitialization();
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java
index 498a8274e..131c70d3d 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptSupport.java
@@ -73,6 +73,7 @@ public interface JavaScriptSupport
* arguments referenced by format specifiers
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addScript(String format, Object... arguments);
/**
@@ -86,6 +87,7 @@ public interface JavaScriptSupport
* arguments referenced by format specifiers
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addScript(InitializationPriority priority, String format, Object...
arguments);
/**
@@ -99,6 +101,7 @@ public interface JavaScriptSupport
* object to pass to the client-side function
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(String functionName, JSONObject parameter);
/**
@@ -113,6 +116,7 @@ public interface JavaScriptSupport
* @since 5.3
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(String functionName, JSONArray parameter);
/**
@@ -129,6 +133,7 @@ public interface JavaScriptSupport
* @since 5.3
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(InitializationPriority priority, String
functionName, JSONArray parameter);
/**
@@ -144,6 +149,7 @@ public interface JavaScriptSupport
* object to pass to the client-side function
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(InitializationPriority priority, String
functionName, JSONObject parameter);
/**
@@ -157,6 +163,7 @@ public interface JavaScriptSupport
* string to pass to function (typically, a client id)
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(String functionName, String parameter);
/**
@@ -172,6 +179,7 @@ public interface JavaScriptSupport
* string to pass to function (typically, a client id)
* @deprecated Deprecated in 5.4; refactor to use {@linkplain
#require(String) JavaScript modules} instead
*/
+ @Deprecated
void addInitializerCall(InitializationPriority priority, String
functionName, String parameter);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
index 0dccf2e44..a291e37a7 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
@@ -92,5 +92,6 @@ public enum StackExtensionType
* @see
org.apache.tapestry5.services.javascript.JavaScriptStack#getInitialization()
* @deprecated Deprecated in 5.4 with no replacement; initialization may
be removed in the future.
*/
+ @Deprecated
INITIALIZATION;
}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
index 186554a02..346a5d220 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetOptions.java
@@ -62,6 +62,7 @@ public final class StylesheetOptions
/**
* @deprecated In 5.3, may be removed in a later release. Use {@link
#StylesheetOptions(String)} and {@link #withCondition(String)}} instead.
*/
+ @Deprecated
public StylesheetOptions(String media, String condition)
{
this(media, condition, false);
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/messages/ComponentMessagesSource.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/messages/ComponentMessagesSource.java
index ff72f4e9e..09a201a4b 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/messages/ComponentMessagesSource.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/messages/ComponentMessagesSource.java
@@ -45,6 +45,7 @@ public interface ComponentMessagesSource
* @return the message catalog for the component, in the indicated locale
* @deprecated Deprecated in 5.3; use {@link #getMessages(ComponentModel,
ComponentResourceSelector)} instead.
*/
+ @Deprecated
Messages getMessages(ComponentModel componentModel, Locale locale);
/**
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java
index 753f00936..7c551f5d2 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/templates/ComponentTemplateLocator.java
@@ -31,6 +31,7 @@ import java.util.Locale;
* @since 5.2.0
* @deprecated Deprecated in 5.3, override or decorate {@link
ComponentResourceSelector} instead.
*/
+@Deprecated
@UsesOrderedConfiguration(ComponentTemplateLocator.class)
public interface ComponentTemplateLocator
{
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
index 3d3a969f6..3ba6f1353 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
@@ -688,6 +688,7 @@ public abstract class TapestryTestCase extends IOCTestCase
/**
* @deprecated Deprecated in 5.4 with no replacement.
*/
+ @Deprecated
protected final void train_toClientURL(Asset asset, String URL)
{
expect(asset.toClientURL()).andReturn(URL).atLeastOnce();
diff --git
a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateConstants.java
b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateConstants.java
index 219d0c7ce..64d8034ec 100644
---
a/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateConstants.java
+++
b/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/HibernateConstants.java
@@ -22,10 +22,12 @@ public class HibernateConstants
/**
* @deprecated Use {@link
org.apache.tapestry5.hibernate.HibernateSymbols#PROVIDE_ENTITY_VALUE_ENCODERS}
instead.
*/
+ @Deprecated
public static final String PROVIDE_ENTITY_VALUE_ENCODERS_SYMBOL =
HibernateSymbols.PROVIDE_ENTITY_VALUE_ENCODERS;
/**
* @deprecated Use {@link
org.apache.tapestry5.hibernate.HibernateSymbols#DEFAULT_CONFIGURATION} instead
*/
+ @Deprecated
public static final String DEFAULT_CONFIGURATION =
HibernateSymbols.DEFAULT_CONFIGURATION;
}
diff --git
a/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
b/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
index b87fa6532..874e7db72 100644
---
a/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
+++
b/tapestry-http/src/main/java/org/apache/tapestry5/http/TapestryHttpConstants.java
@@ -32,6 +32,7 @@ final public class TapestryHttpConstants {
* should only occur when developing Tapestry).
* @deprecated use {@link TapestryHttpSymbolConstants#TAPESTRY_VERSION}
instead.
*/
+ @Deprecated
public static final String TAPESTRY_VERSION =
TapestryHttpSymbolConstants.TAPESTRY_VERSION;
}
diff --git
a/tapestry-http/src/main/java/org/apache/tapestry5/http/internal/services/RequestImpl.java
b/tapestry-http/src/main/java/org/apache/tapestry5/http/internal/services/RequestImpl.java
index 2c5c06417..87e4ad4d4 100644
---
a/tapestry-http/src/main/java/org/apache/tapestry5/http/internal/services/RequestImpl.java
+++
b/tapestry-http/src/main/java/org/apache/tapestry5/http/internal/services/RequestImpl.java
@@ -34,6 +34,7 @@ public class RequestImpl implements Request
/**
* @deprecated Use {@link Request#REQUESTED_WITH_HEADER} instead
*/
+ @Deprecated
static final String REQUESTED_WITH_HEADER = Request.REQUESTED_WITH_HEADER;
static final String XML_HTTP_REQUEST = "XMLHttpRequest";
@@ -41,6 +42,7 @@ public class RequestImpl implements Request
/**
* @deprecated Use {@link Request#X_FORWARDED_PROTO_HEADER} instead
*/
+ @Deprecated
static final String X_FORWARDED_PROTO_HEADER =
Request.X_FORWARDED_PROTO_HEADER;
static final String X_FORWARDED_PROTO_HTTPS = "https";
diff --git
a/tapestry-http/src/main/java/org/apache/tapestry5/http/services/Request.java
b/tapestry-http/src/main/java/org/apache/tapestry5/http/services/Request.java
index ac1580463..43564d953 100644
---
a/tapestry-http/src/main/java/org/apache/tapestry5/http/services/Request.java
+++
b/tapestry-http/src/main/java/org/apache/tapestry5/http/services/Request.java
@@ -44,6 +44,7 @@ public interface Request
*
* @deprecated in 5.4, inject the value for symbol {@link
org.apache.tapestry5.SymbolConstants#CONTEXT_PATH} instead
*/
+ @Deprecated
String getContextPath();
/**
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
index ad5da52a2..750c811ac 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
@@ -717,6 +717,7 @@ public class InternalUtils
* @deprecated Deprecated in 5.4; use {@link
ExceptionUtils#toMessage(Throwable)} instead.
*/
// Cause it gets used a lot outside of Tapestry proper even though it is
internal.
+ @Deprecated
public static String toMessage(Throwable exception)
{
return ExceptionUtils.toMessage(exception);
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
index bf9c246f2..fc8a7d6ec 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
@@ -29,6 +29,7 @@ public interface PerthreadManager
* to add
* @deprecated Deprecated in 5.4, use {@link
#addThreadCleanupCallback(Runnable)} instead.
*/
+ @Deprecated
void addThreadCleanupListener(ThreadCleanupListener listener);
/**
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
index edf3b0b3e..07cf9c66b 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
@@ -22,6 +22,7 @@ import java.util.EventListener;
* @see RegistryShutdownHub#addRegistryShutdownListener(Runnable)
* @deprecated In Tapestry 5.3, to be removed in a later release.
*/
+@Deprecated
public interface RegistryShutdownListener extends EventListener
{
/**
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
index b857cbf56..3c4f4492b 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
@@ -22,6 +22,7 @@ import java.util.EventListener;
*
* @deprecated Deprecated in 5.4, use {@link
PerthreadManager#addThreadCleanupCallback(Runnable)} instead.
*/
+@Deprecated
public interface ThreadCleanupListener extends EventListener
{
/**
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
index f471d41c7..c8f839a9e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
@@ -48,6 +48,7 @@ import static org.easymock.EasyMock.isA;
*
* @deprecated In 5.4, with no replacement
*/
+@Deprecated
public class IOCTestCase extends TestBase
{
diff --git
a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
index ee9e755b9..72a270a75 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
@@ -127,6 +127,7 @@ public final class JSONArray extends JSONCollection
implements Collection<Object
* @return Returns the number of values in this array.
* @deprecated Use {@link #size()} instead.
*/
+ @Deprecated
public int length() {
return size();
}
@@ -168,6 +169,7 @@ public final class JSONArray extends JSONCollection
implements Collection<Object
* @return this array.
* @deprecated The use of {@link #add(Object)} is encouraged.
*/
+ @Deprecated
public JSONArray put(Object value) {
add(value);
return this;
diff --git
a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index 991d4baf6..fe4dfef27 100644
---
a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++
b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -1912,6 +1912,7 @@ public abstract class SeleniumTestCase extends Assert
implements Selenium
* @since 5.3
* @deprecated Deprecated in 5.4 with no replacement
*/
+ @Deprecated
protected final void waitForElementToDisappear(String elementId)
{
String condition =
String.format("selenium.browserbot.getCurrentWindow().testSupport.doesNotExist(\"%s\")",
elementId);
@@ -1975,6 +1976,7 @@ public abstract class SeleniumTestCase extends Assert
implements Selenium
* @since 5.3
* @deprecated Deprecated in 5.4 in favor of the version without a timeout
*/
+ @Deprecated
protected final void waitForAjaxRequestsToComplete(String timeout)
{
waitForAjaxRequestsToComplete();
diff --git
a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/MockTester.java
b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/MockTester.java
index 50f7a2b11..21b963800 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/MockTester.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/MockTester.java
@@ -25,6 +25,7 @@ import org.easymock.IMocksControl;
* to ensure backwards compatibility.
* @deprecated In 5.4, with no replacement
*/
+@Deprecated
public final class MockTester
{
private static class ThreadLocalControl extends ThreadLocal<IMocksControl>
diff --git
a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestBase.java
b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestBase.java
index 404813a48..32e870957 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestBase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestBase.java
@@ -33,18 +33,21 @@ import org.testng.annotations.AfterMethod;
*
* This class was originally in the tapestry-ioc module as was moved to
tapestry-test; the package name was not changed
* to ensure backwards compatibility.
- *
+ *
* @see org.easymock.EasyMock#createControl()
* @see org.apache.tapestry5.test.ioc.MockTester
* @deprecated In 5.4, with no replacement
*/
+@Deprecated
public class TestBase extends TestUtils
{
private final MockTester tester = new MockTester();
/**
* @return the {@link IMocksControl} for this thread.
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected final IMocksControl getMocksControl()
{
return tester.getMocksControl();
@@ -52,7 +55,9 @@ public class TestBase extends TestUtils
/**
* Discards any mock objects created during the test.
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
@AfterMethod(alwaysRun = true)
public final void discardMockControl()
{
@@ -62,13 +67,15 @@ public class TestBase extends TestUtils
/**
* Creates a new mock object of the indicated type. The shared mock
control does <strong>not</strong> check order,
* but does fail on any unexpected method invocations.
- *
+ *
* @param <T>
* the type of the mock object
* @param mockClass
* the class to mock
* @return the mock object, ready for training
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected final <T> T newMock(Class<T> mockClass)
{
return tester.newMock(mockClass);
@@ -77,7 +84,9 @@ public class TestBase extends TestUtils
/**
* Switches each mock object created by {@link #newMock(Class)} into
replay mode (out of the initial training
* mode).
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected final void replay()
{
tester.replay();
@@ -86,7 +95,9 @@ public class TestBase extends TestUtils
/**
* Verifies that all trained methods have been invoked on all mock objects
(created by {@link #newMock(Class)}, then
* switches each mock object back to training mode.
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected final void verify()
{
tester.verify();
@@ -94,10 +105,12 @@ public class TestBase extends TestUtils
/**
* Convienience for {@link EasyMock#expectLastCall()} with {@link
IExpectationSetters#andThrow(Throwable)}.
- *
+ *
* @param throwable
* the exception to be thrown by the most recent method call on
any mock
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected static void setThrowable(Throwable throwable)
{
EasyMock.expectLastCall().andThrow(throwable);
@@ -106,10 +119,12 @@ public class TestBase extends TestUtils
/**
* Convienience for {@link EasyMock#expectLastCall()} with
* {@link IExpectationSetters#andAnswer(org.easymock.IAnswer)}.
- *
+ *
* @param answer
* callback for the most recent method invocation
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
protected static void setAnswer(IAnswer<?> answer)
{
EasyMock.expectLastCall().andAnswer(answer);
@@ -117,11 +132,12 @@ public class TestBase extends TestUtils
/**
* Convenience for {@link EasyMock#expect(Object)}.
- *
+ *
* @param value to expect
* @return expectation setter, for setting return value, etc.
+ * @deprecated In 5.4, with no replacement
*/
- @SuppressWarnings("unchecked")
+ @Deprecated
protected static <T> IExpectationSetters<T> expect(T value)
{
return EasyMock.expect(value);
@@ -130,7 +146,9 @@ public class TestBase extends TestUtils
/**
* A factory method to create EasyMock Capture objects.
* @return new Capture
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
@SuppressWarnings({"UnusedDeclaration"})
protected static <T> Capture<T> newCapture()
{
diff --git
a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestUtils.java
b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestUtils.java
index 48bfe5672..c0ddd69cd 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestUtils.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ioc/TestUtils.java
@@ -25,17 +25,20 @@ import java.util.List;
*
* This class was originally in the tapestry-ioc module as was moved to
tapestry-test; the package name was not changed
* to ensure backwards compatibility.
- *
+ *
* @since 5.2.0
* @deprecated In 5.4, with no replacement
*/
+@Deprecated
public class TestUtils extends Assert
{
/**
* Invoked from code that should not be reachable. For example, place a
call to unreachable() after invoking a
* method that is expected to throw an exception.
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static void unreachable()
{
fail("This code should not be reachable.");
@@ -43,12 +46,14 @@ public class TestUtils extends Assert
/**
* Asserts that the message property of the throwable contains each of the
provided substrings.
- *
+ *
* @param t
* throwable to check
* @param substrings
* some number of expected substrings
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static void assertMessageContains(Throwable t, String... substrings)
{
String message = t.getMessage();
@@ -61,14 +66,16 @@ public class TestUtils extends Assert
* Compares two lists for equality; first all the elements are
individually compared for equality (if the lists are
* of unequal length, only elements up to the shorter length are
compared). Then the length of the lists are
* compared. This generally gives
- *
+ *
* @param <T>
* type of objects to compare
* @param actual
* actual values to check
* @param expected
* expected values
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static <T> void assertListsEquals(List<T> actual, List<T> expected)
{
int count = Math.min(actual.size(), expected.size());
@@ -90,6 +97,10 @@ public class TestUtils extends Assert
}
}
+ /**
+ * @deprecated In 5.4, with no replacement
+ */
+ @Deprecated
protected static <T> void showLists(List<T> actual, List<T> expected)
{
List<String> actualStrings = toStrings(actual);
@@ -145,14 +156,17 @@ public class TestUtils extends Assert
/**
* Convenience for {@link #assertListsEquals(List, List)}.
- *
+ *
* @param <T>
* type of objects to compare
* @param actual
* actual values to check
* @param expected
* expected values
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
+ @SafeVarargs
public static <T> void assertListsEquals(List<T> actual, T... expected)
{
assertListsEquals(actual, Arrays.asList(expected));
@@ -160,14 +174,17 @@ public class TestUtils extends Assert
/**
* Convenience for {@link #assertListsEquals(List, List)}.
- *
+ *
* @param <T>
* type of objects to compare
* @param actual
* actual values to check
* @param expected
* expected values
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
+ @SafeVarargs
public static <T> void assertArraysEqual(T[] actual, T... expected)
{
assertListsEquals(Arrays.asList(actual), expected);
@@ -175,17 +192,19 @@ public class TestUtils extends Assert
/**
* Initializes private fields (via reflection).
- *
+ *
* @param object
* object to be updated
* @param fieldValues
* string field names and corresponding field values
* @return the object
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static <T> T set(T object, Object... fieldValues)
{
assert object != null;
- Class objectClass = object.getClass();
+ Class<?> objectClass = object.getClass();
for (int i = 0; i < fieldValues.length; i += 2)
{
@@ -212,14 +231,16 @@ public class TestUtils extends Assert
/**
* Reads the content of a private field.
- *
+ *
* @param object
* to read the private field from
* @param fieldName
* name of field to read
* @return value stored in the field
* @since 5.1.0.5
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static Object get(Object object, String fieldName)
{
assert object != null;
@@ -249,10 +270,10 @@ public class TestUtils extends Assert
return exception.getClass().getName();
}
- private static Field findField(Class objectClass, String fieldName)
+ private static Field findField(Class<?> objectClass, String fieldName)
{
- Class cursor = objectClass;
+ Class<?> cursor = objectClass;
while (cursor != null)
{
@@ -275,13 +296,15 @@ public class TestUtils extends Assert
/**
* Creates a new instance of the object using its default constructor, and
initializes it (via
* {@link #set(Object, Object[])}).
- *
+ *
* @param objectType
* typeof object to instantiate
* @param fieldValues
* string field names and corresponding field values
* @return the initialized instance
+ * @deprecated In 5.4, with no replacement
*/
+ @Deprecated
public static <T> T create(Class<T> objectType, Object... fieldValues)
{
T result = null;
diff --git
a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
index f57c2560a..2d6965c09 100644
---
a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
+++
b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
@@ -27,6 +27,7 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@UseWith(AnnotationUseContext.SERVICE)
+@Deprecated
public @interface InjectResource
{
}
diff --git
a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java
b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java
index 93fb9c1f5..e8e3b0560 100644
---
a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java
+++
b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java
@@ -29,6 +29,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
@Documented
@UseWith(AnnotationUseContext.MODULE)
+@Deprecated
public @interface SubModule
{
