Updated Branches:
refs/heads/master e5037b78e -> 99f978f85
Fixed TAP5-2010 ("Broken links in Javadoc pages")
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/99f978f8
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/99f978f8
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/99f978f8
Branch: refs/heads/master
Commit: 99f978f85d5ebbc8afd755385e90f3c26b9d5b3b
Parents: e5037b7
Author: bharner <bo...@apache.org>
Authored: Mon Oct 8 16:53:27 2012 -0400
Committer: bharner <bo...@apache.org>
Committed: Mon Oct 8 16:53:27 2012 -0400
----------------------------------------------------------------------
.../tapestry5/runtime/PageLifecycleListener.java | 2 +-
.../tapestry5/services/MarkupRendererFilter.java | 5 +----
.../services/PartialMarkupRendererFilter.java | 5 +----
.../apache/tapestry5/services/TapestryModule.java | 3 ---
.../ioc/internal/services/MethodSignature.java | 2 +-
5 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99f978f8/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
----------------------------------------------------------------------
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 b1d5405..8c91339 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
@@ -27,7 +27,7 @@ public interface PageLifecycleListener
* Invoked when the page finishes loading. This occurs once all components are loaded and all parameters have been
* set.
*
- * @deprecated in 5.3.4, use {@link org.apache.tapestry5.ComponentResources#addPageLoadedCallback(Runnable)} instead
+ * @deprecated in 5.3.4, use {@link org.apache.tapestry5.runtime.PageLifecycleCallbackHub#addPageLoadedCallback(Runnable)} instead
*/
void containingPageDidLoad();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99f978f8/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
index aeab618..6b79900 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
@@ -21,10 +21,7 @@ import org.apache.tapestry5.MarkupWriter;
* and/or after the main rendering process. Typically, this is to allow for the placement of
* {@linkplain org.apache.tapestry5.services.Environment environmental services}.
*
- * @see org.apache.tapestry5.services.TapestryModule#contributeMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration,
- * org.apache.tapestry5.Asset, boolean, String, boolean, org.apache.tapestry5.ioc.services.SymbolSource,
- * AssetSource, org.apache.tapestry5.services.javascript.JavaScriptStackSource,
- * org.apache.tapestry5.internal.services.javascript.JavaScriptStackPathConstructor, org.apache.tapestry5.Asset)
+ * @see org.apache.tapestry5.services.TapestryModule#contributeMarkupRenderer
*/
public interface MarkupRendererFilter
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99f978f8/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
index 6dd6458..8cb87ad 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
@@ -23,10 +23,7 @@ import org.apache.tapestry5.json.JSONObject;
* filters are often in place so as to contribute {@link org.apache.tapestry5.annotations.Environmental} services to the
* pages and components that render.
*
- * @see org.apache.tapestry5.services.TapestryModule#contributePartialMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration,
- * org.apache.tapestry5.Asset, org.apache.tapestry5.services.javascript.JavaScriptStackSource,
- * org.apache.tapestry5.internal.services.javascript.JavaScriptStackPathConstructor,
- * org.apache.tapestry5.ioc.services.SymbolSource, AssetSource)
+ * @see org.apache.tapestry5.services.TapestryModule#contributePartialMarkupRenderer
*/
public interface PartialMarkupRendererFilter
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99f978f8/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
index 87696f5..a7f35bc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
@@ -1330,9 +1330,6 @@ public final class TapestryModule
* configuration can be extended to allow for different automatic injections
* (based on some combination of field
* type and field name).
- * <p/>
- * Note that contributions to this service may be old-style {@link InjectionProvider}, which will
- * be coerced to {@link InjectionProvider2}.
*/
public InjectionProvider2 buildInjectionProvider(List<InjectionProvider2> configuration)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/99f978f8/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java
index e18a0a1..4f5917f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodSignature.java
@@ -218,7 +218,7 @@ public class MethodSignature
/**
* Returns a string consisting of the name of the method and its parameter types. This is similar to
* {@link #toString()}, but omits the return type and information about thrown exceptions. A unique id is used by
- * {@link org.apache.tapestry5.ioc.internal.util.MethodIterator} to identify overlapping methods (methods with the same name and parameter types but with
+ * {@link org.apache.tapestry5.ioc.internal.services.MethodIterator} to identify overlapping methods (methods with the same name and parameter types but with
* different thrown exceptions).
*
* @see #isOverridingSignatureOf(MethodSignature)