You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2015/04/06 21:20:21 UTC

[6/9] tapestry-5 git commit: Clean up markup inside JavaDoc to confirm to JDK 1.8's stricter rules

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
----------------------------------------------------------------------
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 03a96da..1dfcd3d 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
@@ -28,11 +28,11 @@ import java.util.List;
 /**
  * A mixin for a text field that allows for autocompletion of text fields. This is based on
  * Twttter <a href="http://twitter.github.io/typeahead.js/">typeahead.js</a> version 0.10.5.
- * <p/>
+ * 
  * The container is responsible for providing an event handler for event "providecompletions". The context will be the
  * partial input string sent from the client. The return value should be an array or list of completions, in
  * presentation order. e.g.
- * <p/>
+ * 
  * <pre>
  * String[] onProvideCompletionsFromMyField(String input)
  * {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
index 1464129..0a746ef 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
@@ -22,7 +22,7 @@ import org.apache.tapestry5.services.javascript.JavaScriptSupport;
 /**
  * A mixin that can be placed on a clickable component, such as {@link org.apache.tapestry5.corelib.components.LinkSubmit},
  * and will raise a confirmation dialog when the element is clicked.
- * <p/>
+ * 
  * Due to conflicts between jQuery (as used by Bootstrap's JavaScript library) and Prototype, this mixin does not operate
  * when the {@linkplain org.apache.tapestry5.SymbolConstants#JAVASCRIPT_INFRASTRUCTURE_PROVIDER JavaScript infrastructure provider}
  * is "prototype".

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormFieldFocus.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormFieldFocus.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormFieldFocus.java
index 82e2aaf..9fcc124 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormFieldFocus.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormFieldFocus.java
@@ -1,5 +1,3 @@
-// Copyright (c) 2011. The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -15,7 +13,6 @@
 package org.apache.tapestry5.corelib.mixins;
 
 import org.apache.tapestry5.BindingConstants;
-import org.apache.tapestry5.ClientElement;
 import org.apache.tapestry5.Field;
 import org.apache.tapestry5.FieldFocusPriority;
 import org.apache.tapestry5.annotations.AfterRender;
@@ -30,7 +27,7 @@ import org.slf4j.Logger;
 /**
  * A mixin that instruments the outer {@link org.apache.tapestry5.corelib.components.Form} on which
  * component the focus should be activated.
- * <p/>
+ * 
  * This is meant to be used only with {@link org.apache.tapestry5.corelib.components.Form} component.
  *
  * @since 5.3

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
index 424fc5a..f90bcc5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
@@ -1,5 +1,3 @@
-// Copyright 2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -26,7 +24,7 @@ import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.ioc.annotations.Symbol;
 
 /**
- * <p>Applied to a {@link org.apache.tapestry5.Field}, this provides the outer layers of markup to correctly
+ * Applied to a {@link org.apache.tapestry5.Field}, this provides the outer layers of markup to correctly
  * render text fields, selects, and textareas using Bootstrap:
  * an outer {@code <div class="field-group">} containing a {@code <label class="control-label">} and the field itself.
  * Actually, the class attribute of the div is defined by the  
@@ -35,8 +33,8 @@ import org.apache.tapestry5.ioc.annotations.Symbol;
  * <code>field-group</code> and <code>control-label</code> are the default values. 
  * As with the {@link org.apache.tapestry5.corelib.components.Label} component, the {@code for} attribute is set (after the field itself
  * renders).
- * </p>
- * <p>
+ *
+ *
  * You can also use the {@link SymbolConstants#FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME} symbol
  * to optionally wrap the input field in an element and {@link SymbolConstants#FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_CSS_CLASS}
  * to give it a CSS class. This is useful for Bootstrap form-horizontal forms.
@@ -44,11 +42,11 @@ import org.apache.tapestry5.ioc.annotations.Symbol;
  * {@link SymbolConstants#FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_CSS_CLASS} to <code>col-sm-10</code>
  * and {@link SymbolConstants#FORM_GROUP_LABEL_CSS_CLASS} to <code>col-sm-2</code>
  * will generate labels 2 columns wide and form fields 10 columns wide.
- * </p>
- * <p>
+ *
+ *
  * This component is not appropriate for radio buttons or checkboxes as they use a different class on the outermost element
  * ("radio" or "checkbox") and next the element inside the {@code <label>}.
- * </p>
+ *
  *
  * @tapestrydoc
  * @since 5.4

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/NotEmpty.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/NotEmpty.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/NotEmpty.java
index 5cd0f9b..996e33e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/NotEmpty.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/NotEmpty.java
@@ -1,5 +1,3 @@
-// Copyright 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,7 +20,7 @@ import org.apache.tapestry5.dom.Element;
  * A mixin that attaches to an element that renders an element.  At the end of the render, if the element is empty, then
  * a non-breaking space (&amp;nbsp;) is injected into the element. This is often necessary for proper rendering on the
  * client.
- * <p/>
+ * 
  * Often used in conjunction with the {@link org.apache.tapestry5.corelib.components.Any} component.
  *
  * @since 5.1.0.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/OverrideFieldFocus.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/OverrideFieldFocus.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/OverrideFieldFocus.java
index 5cd9df0..874bdf2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/OverrideFieldFocus.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/OverrideFieldFocus.java
@@ -1,5 +1,3 @@
-// Copyright (c) 2011. The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,21 +12,18 @@
 
 package org.apache.tapestry5.corelib.mixins;
 
-import org.apache.tapestry5.BindingConstants;
 import org.apache.tapestry5.Field;
 import org.apache.tapestry5.FieldFocusPriority;
 import org.apache.tapestry5.annotations.AfterRender;
 import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.InjectContainer;
-import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.corelib.components.Form;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.services.javascript.JavaScriptSupport;
 import org.slf4j.Logger;
 
 /**
  * A mixin that let a {@link org.apache.tapestry5.Field} gain focus.
- * <p/>
+ *
  * This supersede {@link org.apache.tapestry5.corelib.mixins.FormFieldFocus} in 5.4
  *
  * @since 5.4

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderClientId.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderClientId.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderClientId.java
index 23a2fdb..aeda081 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderClientId.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderClientId.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,9 +12,9 @@
 
 package org.apache.tapestry5.corelib.mixins;
 
-import org.apache.tapestry5.annotations.InjectContainer;
-import org.apache.tapestry5.annotations.AfterRender;
 import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.InjectContainer;
 
 /**
  * Forces a client element to render its client id by ensuring that
@@ -24,7 +22,7 @@ import org.apache.tapestry5.ClientElement;
  * is called. This is sometimes needed because, by design, most components (those that
  * implement {@link ClientElement}) only render a client-side ID if their getClientId
  * method is called sometime during the server-side DOM render.
- * <p/>
+ *
  * See the {@link org.apache.tapestry5.corelib.components.Any Any} component
  * for an example of use.
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
index bdb8471..4f9cd9e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -16,25 +14,21 @@ package org.apache.tapestry5.corelib.mixins;
 
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.MarkupWriter;
-import org.apache.tapestry5.annotations.AfterRenderTemplate;
-import org.apache.tapestry5.annotations.BeforeRenderTemplate;
-import org.apache.tapestry5.annotations.BeginRender;
-import org.apache.tapestry5.annotations.MixinAfter;
-import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.annotations.*;
 import org.apache.tapestry5.ioc.annotations.Inject;
 
 /**
  * Used to render out all informal parameters, at the end of the {@link org.apache.tapestry5.annotations.BeginRender}
  * phase.
- * <p/>
+ *
  * This mixin can be used with components that render a single tag inside the {@link BeginRender} phase. RenderInformals
  * will activate during the PostBeginRender phase to write additional attributes, from the informal parameters, into the
  * active element.
- * <p/>
+ *
  * If you want this behavior, but need to render more than a single tag, then implement render phase methods for the
  * {@link BeforeRenderTemplate} and {@link AfterRenderTemplate} phases. Use those phases to write the additional
  * elements and close them.
- * <p/>
+ *
  * This is often used as a base class, for cases where a component doesn't have other mixins.
  * 
  * @tapestrydoc

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/ZoneRefresh.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/ZoneRefresh.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/ZoneRefresh.java
index d2ca6dd..68dec3b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/ZoneRefresh.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/ZoneRefresh.java
@@ -1,5 +1,3 @@
-// Copyright 2011, 2012 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,11 +12,7 @@
 
 package org.apache.tapestry5.corelib.mixins;
 
-import org.apache.tapestry5.BindingConstants;
-import org.apache.tapestry5.ComponentResources;
-import org.apache.tapestry5.EventConstants;
-import org.apache.tapestry5.EventContext;
-import org.apache.tapestry5.Link;
+import org.apache.tapestry5.*;
 import org.apache.tapestry5.annotations.AfterRender;
 import org.apache.tapestry5.annotations.Events;
 import org.apache.tapestry5.annotations.InjectContainer;
@@ -29,15 +23,15 @@ import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.services.javascript.JavaScriptSupport;
 
 /**
- * <p>
+ *
  * This mixin periodically refreshs a {@link org.apache.tapestry5.corelib.components.Zone zone}
  * by triggering an event on the server using ajax requests.
- * </p>
- * <p>
+ *
+ *
  * Server-side, the mixin triggers the "refresh" event with the mixin's context. A container may but
  * does not need to handle the event. If the event is handled and a value is returned, that value is
  * used to render the response. Otherwise, the Zone's body is re-rendered.
- * </p>
+ *
  * <b>Note: </b> This mixin is only meant for a {@link org.apache.tapestry5.corelib.components.Zone zone}.
  *
  * @tapestrydoc

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
index 55a3b62..8546c6c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2008, 2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -29,7 +27,7 @@ import java.util.List;
 
 /**
  * Page used to see the status of all services defined by the {@link Registry}.
- * <p/>
+ *
  * TODO: Add filters to control which services are displayed
  */
 @UnknownActivationContextCheck(false)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
----------------------------------------------------------------------
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 75dc68a..00c1312 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
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -28,7 +26,7 @@ import java.util.regex.Pattern;
 /**
  * An element that will render with a begin tag and attributes, a body, and an end tag. Also acts as a factory for
  * enclosed Element, Text and Comment nodes.
- * <p/>
+ *
  * TODO: Support for CDATA nodes. Do we need Entity nodes?
  */
 public final class Element extends Node

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
index 0cf7e62..16bfc2c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -35,7 +33,7 @@ public interface InternalComponentResourcesCommon
 
     /**
      * Used during construction of the page to identify the binding for a particular parameter.
-     * <p/>
+     *
      */
     void bindParameter(String parameterName, Binding binding);
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalSymbols.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalSymbols.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalSymbols.java
index 1066c71..b335ac9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalSymbols.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalSymbols.java
@@ -34,7 +34,7 @@ public class InternalSymbols
      * Comma-separated list of pre-allocated Form component control names. Basically, this exists to
      * work around name collisions on the client side. Starting in 5.3, these names are
      * also pre-allocated as ids.
-     * <p/>
+     *
      *
      * @since 5.2.0
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
index 8fbc12e..41bd45e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
@@ -1,5 +1,3 @@
-// Copyright 2006-2014 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -32,9 +30,9 @@ import java.util.List;
  * This class is used to build the {@link Registry}. The Registry contains
  * {@link org.apache.tapestry5.ioc.modules.TapestryIOCModule} and {@link TapestryModule}, any
  * modules identified by {@link #addModules(Class[])} )}, plus the application module.
- * <p/>
+ *
  * The application module is optional.
- * <p/>
+ *
  * The application module is identified as <em>package</em>.services.<em>appName</em>Module, where
  * <em>package</em> and the <em>appName</em> are specified by the caller.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
index 5e4ab42..0353dfe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
@@ -268,7 +268,7 @@ public class TapestryInternalUtils
 
     /**
      * Converts an enum to a label string, allowing for overrides from a message catalog.
-     * <p/>
+     *
      * <ul>
      * <li>As key <em>prefix</em>.<em>name</em> if present. Ex: "ElementType.LOCAL_VARIABLE"
      * <li>As key <em>name</em> if present, i.e., "LOCAL_VARIABLE".

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
index 776418d..8b93de6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2008, 2009 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -20,8 +18,8 @@ import org.apache.tapestry5.ioc.Location;
  * Binding type for literal, immutable values. Literal bindings are {@linkplain org.apache.tapestry5.Binding#isInvariant()
  * invariant}; any value provided by a LiteralBinding, even if {@linkplain org.apache.tapestry5.ioc.services.TypeCoercer#coerce(Object,
  * Class) coerced}, will be cached aggresively by Tapestry cmponent.
- * <p/>
- * <p>LiteralBindings are often used for literal string values supplied in-line in the component template, but is used
+ *
+ * LiteralBindings are often used for literal string values supplied in-line in the component template, but is used
  * for many other things as well, any kind of fixed, read-only value.
  */
 public class LiteralBinding extends AbstractBinding

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
index 4f65bac..8dc3418 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -24,7 +22,7 @@ import org.apache.tapestry5.services.PropertyConduitSource;
 
 /**
  * Binding factory for reading and updating JavaBean properties.
- * <p/>
+ *
  * Expression are evaluated via a {@link PropertyConduit}, which is generated by {@link PropertyConduitSource} (which
  * therefore defines the expression language).
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/EmbeddedComponentAssembler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/EmbeddedComponentAssembler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/EmbeddedComponentAssembler.java
index acad5df..376596b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/EmbeddedComponentAssembler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/EmbeddedComponentAssembler.java
@@ -1,5 +1,3 @@
-// Copyright 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -36,10 +34,10 @@ interface EmbeddedComponentAssembler extends Locatable
      * the latter case, the mixinId is validated (to ensure it exists). In addition, a special mixinid that matches the
      * component's class name can be used; this is necessary to disambiguate informal parameters of the component from formal mixin parameters
      * (where an unqualified name would be bound to the mixin's parameter).
-     * <p/>
+     *
      * If the name of the parameter does not match a formal parameter of the component (or mixin) and the component (or
      * mixin) does not support informal parameters, then null is returned.
-     * <p/>
+     *
      * This method should only be called at page-assembly time as it requires some data that is collected during
      * ComponentAssembly construction in order to handle published parameters of embedded components.
      *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
index 17a92d6..0ee401e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
@@ -49,7 +49,7 @@ import java.util.Map;
  * There's still a lot of room to beef up {@link org.apache.tapestry5.internal.pageload.ComponentAssembler} and
  * {@link org.apache.tapestry5.internal.pageload.EmbeddedComponentAssembler} to perform more static analysis, but
  * that may no longer be necessary, given the switch to shared (non-pooled) pages in 5.2.
- * <p/>
+ *
  * Loading a page involves a recursive process of creating
  * {@link org.apache.tapestry5.internal.pageload.ComponentAssembler}s: for the root component, then down the tree for
  * each embedded component. A ComponentAssembler is largely a collection of
@@ -58,7 +58,7 @@ import java.util.Map;
  * matching parameters to bindings, is done as part of the one-time construction of the ComponentAssembler. The end
  * result removes a huge amount of computational redundancy that was present in Tapestry 5.0, but to understand this,
  * you need to split your mind into two phases: construction (of the ComponentAssemblers) and assembly.
- * <p/>
+ *
  * And truly, <em>This is the Tapestry Heart, This is the Tapestry Soul...</em>
  */
 public class PageLoaderImpl implements PageLoader, ComponentAssemblerSource

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
index c8a52e1..fc468c0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2008, 2010, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -33,7 +31,7 @@ import org.apache.tapestry5.services.transform.InjectionProvider2;
  * fields containing the injected Block from the template. The annotation's value is the id of the
  * block to inject; if
  * omitted, the block id is deduced from the field id.
- * <p/>
+ *
  * Must be scheduled before {@link DefaultInjectionProvider} because it uses the same annotation, Inject, with a
  * different interpretation.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
index dbd3cb9..e7b9df6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -21,14 +19,14 @@ import org.apache.tapestry5.services.transform.ControlledPackageType;
 /**
  * Creates {@link org.apache.tapestry5.internal.services.Instantiator}s for components, based on component class name.
  * This will involve transforming the component's class before it is loaded.
- * <p/>
+ *
  * In addition, a source acts as an event hub for {@link org.apache.tapestry5.services.InvalidationListener}s, so that
  * any information derived from loaded classes can be discarded and rebuilt when classes change.
- * <p/>
+ *
  * The strategy used is that when <em>any</em> class (in a controlled package) changes, the entire class loader is
  * discarded, along with any instances derived from those classes. A new class loader is created, and then invalidation
  * events are fired to listeners.
- * <p/>
+ *
  * Starting in Tapestry 5.3, the packages that are loaded are controlled by a configuration that maps package names to
  * {@link ControlledPackageType}s.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentModelSource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentModelSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentModelSource.java
index 6b22d67..7fcc1b1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentModelSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentModelSource.java
@@ -1,5 +1,3 @@
-// Copyright 2009 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -18,7 +16,7 @@ import org.apache.tapestry5.model.ComponentModel;
 
 /**
  * Access to component models (as provided via {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSource}).
- * <p/>
+ *
  * This is a good candidate to move into the public services package.
  *
  * @since 5.1.0.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
----------------------------------------------------------------------
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 4563da2..46b8bfa 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
@@ -1,5 +1,3 @@
-// Copyright 2007, 2012 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -18,7 +16,7 @@ import org.apache.tapestry5.ComponentResources;
 
 /**
  * A kind of callback that can easily be injected into a transformed class to perform complex work.
- * <p/>
+ *
  * These callbacks are often injected into a transformed component class. Bear in mind that such
  * callbacks must be <em>threadsafe</em>, since every instance of such a class will share a single instance of the
  * operation.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
index cda1920..ed57a9d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2008, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -23,7 +21,7 @@ import org.apache.tapestry5.services.pageload.ComponentResourceSelector;
  * Provides access to cached {@link org.apache.tapestry5.internal.parser.ComponentTemplate}s. The source acts as a
  * invalidation event hub, and will broadcast invalidation events when any loaded template resource changes. The
  * listener for these invalidation events is the page source, which stores cached page instances.
- * <p/>
+ *
  * Any search for a template will end with success (a non-null template), but the template returned may be the
  * {@link ComponentTemplate#isMissing() missing template}.
  */
@@ -33,7 +31,7 @@ public interface ComponentTemplateSource
      * Provides access to a template. The template will be parsed as necessary. If no template for the exact component
      * is found, then the template for the component's parent is returned. In this way, it is possible for a component
      * to extend the behavior of its super-class without duplicating the super-class component's template.
-     * <p/>
+     *
      * In some cases, the empty template will be returned.
      * 
      * @param componentModel

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
index d580b9e..04f8b80 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
@@ -169,7 +169,7 @@ public final class ComponentTemplateSourceImpl extends InvalidationEventHubImpl
     /**
      * Resolves the component name to a localized {@link Resource} (using the {@link ComponentTemplateLocator} chain of
      * command service). The localized resource is used as the key to a cache of {@link ComponentTemplate}s.
-     * <p/>
+     *
      * If a template doesn't exist, then the missing ComponentTemplate is returned.
      */
     public ComponentTemplate getTemplate(ComponentModel componentModel, Locale locale)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
index 5923dfb..26c0a63 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
@@ -29,7 +29,6 @@ import org.apache.tapestry5.services.*;
 import org.slf4j.Logger;
 
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
@@ -44,12 +43,12 @@ import java.util.Map.Entry;
  * servlet spec's standard error handling, the default exception handler allows configuring handlers for specific types of
  * exceptions. The error-page/exception-type configuration in web.xml does not work in Tapestry application as errors are
  * wrapped in Tapestry's exception types (see {@link OperationException} and {@link ComponentEventException} ).
- * <p/>
+ *
  * Configurations are flexible. You can either contribute a {@link ExceptionHandlerAssistant} to use arbitrary complex logic
  * for error handling or a page class to render for the specific exception. Additionally, exceptions can carry context for the
- * error page. Exception context is formed either from the name of Exception (e.g. SmtpNotRespondingException -> ServiceFailure mapping
+ * error page. Exception context is formed either from the name of Exception (e.g. SmtpNotRespondingException {@code ->} ServiceFailure mapping
  * would render a page with URL /servicefailure/smtpnotresponding) or they can implement {@link ContextAwareException} interface.
- * <p/>
+ *
  * If no configured exception type is found, the default exception page {@link SymbolConstants#EXCEPTION_REPORT_PAGE} is rendered.
  * This fallback exception page must implement the {@link org.apache.tapestry5.services.ExceptionReporter} interface.
  */
@@ -130,7 +129,7 @@ public class DefaultRequestExceptionHandler implements RequestExceptionHandler
 
     /**
      * Handles the exception thrown at some point the request was being processed
-     * <p/>
+     *
      * First checks if there was a specific exception handler/page configured for this exception type, it's super class or super-super class.
      * Renders the default exception page if none was configured.
      *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
index d8b9a12..e63b014 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
@@ -1,5 +1,3 @@
-// Copyright 2007-2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -63,7 +61,7 @@ public interface DocumentLinker
      * of the page (in a full page render) and collected as the "script" property of the partial page render response.
      * The JavaScript is executed after the page loads (or in an Ajax update, after external JavaScript libraries are
      * loaded and the DOM is updated).
-     * <p/>
+     *
      * This method may be called multiple times for the same priority and the script will be accumulated.
      *
      * @param priority

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FormControlNameManager.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FormControlNameManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FormControlNameManager.java
index e4b92f0..e880109 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FormControlNameManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FormControlNameManager.java
@@ -34,8 +34,6 @@ public interface FormControlNameManager
     /**
      * Tells whether a given name is reserved.
      *
-     * @param string
-     * @return
      */
     boolean isReserved(String name);
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
index 3ec9ef6..40d62ba 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
@@ -50,7 +50,7 @@ public interface LinkSource
      * Creates a render link for the page. If an activation context is supplied then that context is built into the URI.
      * If no activation context is supplied, then the activation context is obtained from the page itself, by triggering
      * a passivate event on its root component.
-     * <p/>
+     *
      * When the activationContext is an empty array, the targeted page is checked to see if it can provide an activation
      * context. This is accomplished by triggering a "passivate" event on the targeted page. If the override parameter
      * is true, this will not occur (even when the activation context is empty).

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
index e2238e7..4583705 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
@@ -1,5 +1,3 @@
-// Copyright 2006-2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -35,11 +33,11 @@ import java.util.Map;
  * them, in accordance with extension rules and locale. This represents code that was refactored out of
  * {@link ComponentMessagesSourceImpl}. This class can be used as a base class, though the existing code base uses it as
  * a utility. Composition trumps inheritance!
- * <p/>
+ *
  * The message catalog for a component is the combination of all appropriate properties files for the component, plus
  * any keys inherited form base components and, ultimately, the application global message catalog. At some point we
  * should add support for per-library message catalogs.
- * <p/>
+ *
  * Message catalogs are read using the UTF-8 character set. This is tricky in JDK 1.5; we read the file into memory then
  * feed that bytestream to Properties.load().
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
index 9c28827..c169b7f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2008, 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -78,9 +76,9 @@ public interface PageRenderQueue
      * Adds an optional filter to the rendering. Optional filters are <em>temporary</em>, used just during the current
      * partial render (as opposed to filters contributed to the
      * {@link org.apache.tapestry5.services.PartialMarkupRenderer} service which are permanent, shared and stateless.
-     * <p/>
+     *
      * Filters are added to the <em>end</em> of the pipeline (after all permanent contributions).
-     * <p/>
+     *
      * Filters will be executed in the order in which they are added.
      *
      * @param filter to add to the pipeline

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
index e60b828..4509ee4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -20,10 +18,10 @@ import org.apache.tapestry5.runtime.PageLifecycleListener;
 /**
  * Per-thread service that caches page instances for the duration of the request, and is also responsible for tracking
  * the active page (the page which will ultimately render the response).
- * <p/>
+ *
  * Since {@link org.apache.tapestry5.internal.structure.Page} is internal, most user-code should use the
  * {@link org.apache.tapestry5.services.ComponentSource} service instead.
- * <p>
+ *
  * Starting in 5.2, page instances are shared (with externalized mutable state), not pooled, but the cache is still
  * useful for managing the page's {@linkplain PageLifecycleListener lifecycle}.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManager.java
----------------------------------------------------------------------
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 90b1eb2..62b797b 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
@@ -1,5 +1,3 @@
-// Copyright 2006, 2008, 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,10 +20,10 @@ import org.apache.tapestry5.services.ResourceDigestGenerator;
  * Caches information about resources on the classpath. In addition, acts as an invalidation hub for any resources for
  * which information is obtained (when any of the resources are changed, invalidation listeners are notified so they can
  * clear their caches).
- * <p/>
+ *
  * Note that the name and role of this class changed (and diminished) quite a bit in Tapestry 5.3. It is now focused on
  * determining which files require a digest, and which what the digests are for resources.
- * <p/>
+ *
  * Further, in 5.4, this service has been stripped down to an unused placeholder; it only present to prevent
  * errors where modules have contributed a String extension to protected (even though the service is internal). As of
  * 5.4, all assets have a built-in checksum in the URL directly (in 5.3 and earlier, the URL included the application
@@ -50,7 +48,7 @@ public interface ResourceDigestManager extends InvalidationEventHub
 
     /**
      * Returns the digest for the given path.
-     * <p/>
+     *
      * As of 5.4, simple returns null.
      *
      * @param resource

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
index 4a7c355..3deaa8d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
@@ -34,7 +34,7 @@ import static org.apache.tapestry5.internal.services.SaxTemplateParser.Version.*
  * SAX-based template parser logic, taking a {@link Resource} to a Tapestry
  * template file and returning
  * a {@link ComponentTemplate}.
- * <p/>
+ *
  * Earlier versions of this code used the StAX (streaming XML parser), but that
  * was really, really bad for Google App Engine. This version uses SAX under the
  * covers, but kind of replicates the important bits of the StAX API as
@@ -339,27 +339,27 @@ public class SaxTemplateParser
 
     /**
      * Processes an element through to its matching end tag.
-     * <p/>
+     *
      * An element can be:
-     * <p/>
+     *
      * a Tapestry component via &lt;t:type&gt;
-     * <p/>
+     *
      * a Tapestry component via t:type="type" and/or t:id="id"
-     * <p/>
+     *
      * a Tapestry component via a library namespace
-     * <p/>
+     *
      * A parameter element via &lt;t:parameter&gt;
-     * <p/>
+     *
      * A parameter element via &lt;p:name&gt;
-     * <p/>
+     *
      * A &lt;t:remove&gt; element (in the 5.1 schema)
-     * <p/>
+     *
      * A &lt;t:content&gt; element (in the 5.1 schema)
-     * <p/>
+     *
      * A &lt;t:block&gt; element
-     * <p/>
+     *
      * The body &lt;t:body&gt;
-     * <p/>
+     *
      * An ordinary element
      */
     void element(TemplateParserState initialState)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
index 3de9108..d53d910 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -19,7 +17,7 @@ import org.apache.tapestry5.services.Session;
 
 /**
  * A strategy for storing persistent page properties into the {@link Session session}.
- * <p/>
+ *
  * Builds attribute names as: <code>state:<em>page-name</em>:<em>component-id</em>:<em>field-name</em></code>
  */
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
index a48d388..45b1c02 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
@@ -1,5 +1,3 @@
-// Copyright 2030 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -24,7 +22,7 @@ import java.io.IOException;
  * enabled.
  * The default implementation is to respond with a 404 NOT FOUND.
  *
- * @see http://issues.apache.org/jira/browse/TAP5-2070
+ * @see <a href="http://issues.apache.org/jira/browse/TAP5-2070">TAP5-2070</a>
  * @see org.apache.tapestry5.annotations.UnknownActivationContextCheck
  * @see org.apache.tapestry5.services.HttpError
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java
index 9d9ccb3..d478ffe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java
@@ -35,8 +35,8 @@ import java.util.regex.Pattern;
  * CSS file will change (which would ordinarily break relative URLs), and for changing the relative directories of
  * the CSS file and the image assets it may refer to (useful for incorporating a hash of the resource's content into
  * the exposed URL).
- * <p/>
- * <p/>
+ *
+ *
  * One potential problem with URL rewriting is the way that URLs for referenced resources are generated; we are
  * somewhat banking on the fact that referenced resources are non-compressable images.
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
index 735c1e8..1d0698f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
@@ -31,7 +31,7 @@ public interface JavaScriptStackAssembler
      * Obtains the {@link org.apache.tapestry5.services.javascript.JavaScriptStack} by name, and then
      * uses the {@link org.apache.tapestry5.services.assets.StreamableResourceSource} service to
      * obtain the assets, which are combined together.
-     * <p/>
+     *
      * Expects the {@linkplain org.apache.tapestry5.services.LocalizationSetter#setNonPersistentLocaleFromLocaleName(String) non-persistent locale} to be set before invoking!
      */
     StreamableResource assembleJavaScriptResourceForStack(String stackName, boolean compress, JavaScriptAggregationStrategy javascriptAggregationStrategy) throws IOException;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
index 6c34ab8..8fc51ba 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
@@ -45,13 +45,13 @@ import java.util.*;
  * Implements {@link RenderCommand} and represents a component within an overall page. Much of a
  * component page
  * element's behavior is delegated to user code, via a {@link org.apache.tapestry5.runtime.Component} instance.
- * <p/>
+ *
  * Once instantiated, a ComponentPageElement should be registered as a
  * {@linkplain org.apache.tapestry5.internal.structure.Page#addLifecycleListener(org.apache.tapestry5.runtime.PageLifecycleListener)
  * lifecycle listener}. This could be done inside the constructors, but that tends to complicate unit tests, so its done
  * by {@link org.apache.tapestry5.internal.services.PageElementFactoryImpl}. There's still a bit of refactoring in this
  * class (and its many inner classes) that can improve overall efficiency.
- * <p/>
+ *
  * Modified for Tapestry 5.2 to adjust for the no-pooling approach (shared instances with externalized mutable state).
  */
 public class ComponentPageElementImpl extends BaseLocatable implements ComponentPageElement

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
----------------------------------------------------------------------
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 3099c72..80c5d25 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
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
  * Represents a unique page within the application. Pages are part of the <em>internal</em> structure of a Tapestry
  * application; end developers who refer to "page" are really referring to the {@link #getRootComponent() root
  * component} of the actual page.
- * <p/>
+ *
  * Starting in release 5.2, the nature of pages changed considerably. Pages are no longer pooled instances. Instead,
  * pages are shared instances (per locale) but all internal <em>mutable</em> state is stored inside
  * {@link PerthreadManager}. Page construction time is considered to extend past the
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
  * other mechanisms). At best, we can be assured that the entire page construction phase is protected by a single
  * synchronized block (but not on the page itself). An ideal system would build the page bottom to top so that all
  * assignments could take place in constructors, assigning to final fields. Maybe some day.
- * <p/>
+ *
  * The Page object is never visible to end-user code, though it exposes an interface ({@link PageLifecycleCallbackHub} that
  * {@linkplain org.apache.tapestry5.ComponentResources#getPageLifecycleCallbackHub() is}).
  */
@@ -108,13 +108,13 @@ public interface Page extends PageLifecycleCallbackHub
      * Invoked to inform the page that it is being detached from the current request. This occurs
      * just before the page
      * is returned to the page pool.
-     * <p/>
+     *
      * A page may be clean or dirty. A page is dirty if its dirty count is greater than zero (meaning that, during the
      * render of the page, some components did not fully render), or if any of its listeners throw an exception from
      * containingPageDidDetach().
-     * <p/>
+     *
      * The page pool should discard pages that are dirty, rather than store them into the pool.
-     * <p/>
+     *
      * Under Tapestry 5.2 and pool-less pages, the result is ignored; all mutable state is expected to be discarded
      * automatically from the {@link PerthreadManager}. A future release of Tapestry will likely convert this method to
      * type void.
@@ -128,7 +128,7 @@ public interface Page extends PageLifecycleCallbackHub
      * Invoked to inform the page that it is attached to the current request. This occurs when a
      * page is first referenced within a request. If the page was created from scratch for this request, the call
      * to {@link #loaded()} will preceded the call to {@link #attached()}.
-     * <p/>
+     *
      * First all listeners have {@link PageLifecycleListener#restoreStateBeforePageAttach()} invoked, followed by
      * {@link PageLifecycleListener#containingPageDidAttach()}.
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
index e69526c..6ba04bf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
@@ -1,5 +1,3 @@
-// Copyright 2010, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -20,7 +18,7 @@ import org.apache.tapestry5.runtime.ComponentEvent;
  * Supplies one parameter value when invoking a component event handler method. In general,
  * this involves extracting a value form the event's context and coercing it to a type
  * appropriate to the parameter.
- * <p/>
+ *
  * These values are accumulated and used to invoke the event handler method.
  *
  * @since 5.2.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
index 39273bd..85b6b35 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
@@ -1,5 +1,3 @@
-// Copyright 2006-2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -30,7 +28,7 @@ import org.apache.tapestry5.services.transform.TransformationSupport;
 /**
  * Performs injection triggered by any field annotated with the {@link org.apache.tapestry5.ioc.annotations.Inject}
  * annotation or the {@link javax.inject.Inject} annotation.
- * <p/>
+ *
  * The implementation of this worker mostly delegates to a chain of command of {@link InjectionProvider2}.
  */
 public class InjectWorker implements ComponentClassTransformWorker2

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
index e2a99a7..336d074 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterConduit.java
@@ -1,5 +1,3 @@
-// Copyright 2010, 2011, 2012 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -24,10 +22,10 @@ import org.apache.tapestry5.plastic.FieldConduit;
  * A facade around {@link Binding} and {@link InternalComponentResources} that is used to instrument
  * fields with the {@link Parameter} annotation. Extends {@link FieldConduit} so that
  * the get() method implicitly coerces the value to the field's type.
- * <p/>
+ *
  * {@link #get(Object, org.apache.tapestry5.plastic.InstanceContext)} will read from the underlying {@link Binding} and used the {@link TypeCoercer} coerce the value to the
  * parameter field's type. get() also includes a null value check (as per {@link Parameter#allowNull()}.
- * <p/>
+ *
  * {@link #set(Object, org.apache.tapestry5.plastic.InstanceContext, Object)} pushes the value into the binding.
  *
  * @since 5.2.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/LocaleUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/LocaleUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/LocaleUtils.java
index 7d6f2ee..773d2f8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/LocaleUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/LocaleUtils.java
@@ -1,5 +1,3 @@
-// Copyright 2008 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,17 +20,17 @@ import java.util.Locale;
 public class LocaleUtils
 {
     /**
-     * <p>Converts a String to a Locale.</p> <p/> <p>This method takes the string format of a locale and creates the
-     * locale object from it.</p> <p/>
+     * Converts a String to a Locale.  This method takes the string format of a locale and creates the
+     * locale object from it.
      * <pre>
      *   LocaleUtils.toLocale("en")         = new Locale("en", "")
      *   LocaleUtils.toLocale("en_GB")      = new Locale("en", "GB")
      *   LocaleUtils.toLocale("en_GB_xxx")  = new Locale("en", "GB", "xxx")   (#)
      * </pre>
-     * <p/> <p>(#) The behaviour of the JDK variant constructor changed between JDK1.3 and JDK1.4. In JDK1.3, the
+     *  (#) The behaviour of the JDK variant constructor changed between JDK1.3 and JDK1.4. In JDK1.3, the
      * constructor upper cases the variant, in JDK1.4, it doesn't. Thus, the result from getVariant() may vary depending
-     * on your JDK.</p> <p/> <p>This method validates the input strictly. The language code must be lowercase. The
-     * country code must be uppercase. The separator must be an underscore. The length must be correct. </p>
+     * on your JDK.  This method validates the input strictly. The language code must be lowercase. The
+     * country code must be uppercase. The separator must be an underscore. The length must be correct.
      *
      * @param input the locale String to convert, null returns null
      * @return a Locale, null if null input

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NamedSet.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NamedSet.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NamedSet.java
index 301954c..dce5b75 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NamedSet.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NamedSet.java
@@ -29,7 +29,7 @@ import java.util.concurrent.locks.ReadWriteLock;
  * This is optimized to use less memory (than a {@link CaseInsensitiveMap} (it uses a singly-liked list),
  * though the cost of a lookup is more expensive. However, this is a good match against many of the structures inside
  * a page instance, where most lookups occur only during page constructions, and the number of values is often small.
- * <p/>
+ *
  * Each NameSet has its own {@link ReadWriteLock}.
  *
  * @param <T>

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
index 6366611..1133723 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,10 +12,11 @@
 
 package org.apache.tapestry5.model;
 
-import org.apache.tapestry5.annotations.MixinAfter;
-import org.apache.tapestry5.annotations.Persist;
-import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.annotations.*;
 import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.LibraryMapping;
 import org.slf4j.Logger;
 
 import java.util.List;
@@ -36,8 +35,8 @@ public interface ComponentModel
      * Returns the name of the library that defines this component; this may be the empty string for
      * an application page or component, or will be a name of a library (possibly including "core" for built-in
      * components).
-     * Library names are defined by the {@link org.apache.tapestry5.services.LibraryMapping} contributions
-     * to the {@link org.apache.tapestry5.services.ComponentClassResolver} service.
+     * Library names are defined by the {@link LibraryMapping} contributions
+     * to the {@link ComponentClassResolver} service.
      *
      * @return library name containing the component, or empty string for application components
      * @since 5.4
@@ -65,7 +64,7 @@ public interface ComponentModel
 
     /**
      * Returns the ids of all embedded components defined within the component class (via the {@link
-     * org.apache.tapestry5.annotations.Component} annotation), including those defined by any super-class.
+     * Component} annotation), including those defined by any super-class.
      */
     List<String> getEmbeddedComponentIds();
 
@@ -185,8 +184,7 @@ public interface ComponentModel
 
     /**
      * Returns a set of all the render phases that this model (including parent models) that are handled. Render phases
-     * are represented by the corresponding annotation ({@link org.apache.tapestry5.annotations.BeginRender}, {@link
-     * org.apache.tapestry5.annotations.AfterRender}, etc.).
+     * are represented by the corresponding annotation ({@link BeginRender}, {@link AfterRender}, etc.).
      *
      * @return set of classes
      * @since 5.0.19, 5.1.0.0
@@ -213,13 +211,12 @@ public interface ComponentModel
     String[] getOrderForMixin(String mixinClassName);
 
     /**
-     * Relevant for pages only, indicates that the component handle the {@link org.apache.tapestry5.EventConstants.ACTIVATE}
+     * Relevant for pages only, indicates that the component handle the {@link EventConstants#ACTIVATE}
      * events with a catch all rules
      *
+     * @return true if the page implements catch all rules for the activate event context, or false otherwise
+     * @see MutableComponentModel#doHandleActivationEventContext()
      * @since 5.4
-     * @see {@link MutableComponentModel.doHandleActivationEventContext()}
-     * @return <code>true</code> in case the page implement a catch all rules for the activate event context,
-     * <code>false</code> otherwise
      */
     boolean handleActivationEventContext();
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
----------------------------------------------------------------------
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 e289ba5..623a6df 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
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -122,7 +120,7 @@ public interface MutableComponentModel extends ComponentModel
     void addEventHandler(String eventType);
 
     /**
-     * Relevant for pages only, identifies that the component handle {@link org.apache.tapestry5.EventConstants.ACTIVATE}
+     * Relevant for pages only, identifies that the component handle {@link org.apache.tapestry5.EventConstants#ACTIVATE}
      * events supporting one of the three special case for catch all rules:
      * <ul>
      *     <li><code>{@link java.lang.Object}[]</code></li>

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
index 513f118..bc306a3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
@@ -326,6 +326,7 @@ public class AssetsModule
      * <dt>AppCatalog</dt>
      * <dd>The Resource defined by {@link SymbolConstants#APPLICATION_CATALOG}</dd>
      * <dt>
+     *     </dl>
      *
      * @since 5.2.0
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
index 6d7f967..682fdc4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/InternalModule.java
@@ -27,7 +27,6 @@ import org.apache.tapestry5.services.*;
 import org.apache.tapestry5.services.transform.ControlledPackageType;
 
 import javax.servlet.http.Cookie;
-
 import java.util.Map;
 
 /**
@@ -103,7 +102,7 @@ public class InternalModule
      * <dl>
      * <dt>LinkDecoration (instance of {@link LinkDecorationListener})</dt>
      * <dd>Triggers events for notifications about links</dd>
-     * <dl>
+     * </dl>
      *
      * @since 5.2.0
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/modules/JavaScriptModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/JavaScriptModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/JavaScriptModule.java
index c11d6a9..9a092ea 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/JavaScriptModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/JavaScriptModule.java
@@ -106,7 +106,7 @@ public class JavaScriptModule
      * <dt>jquery</dt>
      * <dd>Added if the infrastructure provider is "jquery".</dd>
      * </dl>
-     * <p/>
+     *
      * User modules may replace or extend this list.
      */
     @Contribute(JavaScriptStack.class)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index 119ca58..2c67c04 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -507,8 +507,8 @@ public final class TapestryModule
      * <dd>Support for the {@link HeartbeatDeferred} annotation, which defers method invocation to the end of the {@link Heartbeat}
      * <dt>Inject</dt>
      * <dd>Used with the {@link org.apache.tapestry5.ioc.annotations.Inject} annotation, when a value is supplied</dd>
+     * <dt>Operation</dt> <dd>Support for the {@link Operation} method annotation</dd>
      * </dl>
-     * <dd>Operation</dt> <dd>Support for the {@link Operation} method annotation</dd></dd>
      */
     @Contribute(ComponentClassTransformWorker2.class)
     @Primary
@@ -769,6 +769,7 @@ public final class TapestryModule
      * applications</dd>
      * <dt>GZip</dt>
      * <dd>Handles GZIP compression of response streams (if supported by client)</dd>
+     * </dl>
      */
     public void contributeHttpServletRequestHandler(OrderedConfiguration<HttpServletRequestFilter> configuration,
 
@@ -1157,7 +1158,7 @@ public final class TapestryModule
      * Builds the PropBindingFactory as a chain of command. The terminator of
      * the chain is responsible for ordinary
      * property names (and property paths).
-     * <p/>
+     *
      * This mechanism has been replaced in 5.1 with a more sophisticated parser based on ANTLR. See <a
      * href="https://issues.apache.org/jira/browse/TAP5-79">TAP5-79</a> for details. There are no longer any built-in
      * contributions to the configuration.
@@ -1600,7 +1601,7 @@ public final class TapestryModule
      * <dt>{@link org.apache.tapestry5.ajax.MultiZoneUpdate}</dt>
      * <dd>Sends a single JSON response to update the content of multiple zones
      * </dl>
-     * <p/>
+     *
      * In most cases, when you want to support a new type, you should convert it to one of the built-in supported types
      * (such as {@link RenderCommand}. You can then inject the master AjaxComponentEventResultProcessor (use the
      * {@link Ajax} marker annotation) and delegate to it.
@@ -2238,7 +2239,7 @@ public final class TapestryModule
 
     /**
      * Contributes strategies accessible via the {@link NullFieldStrategySource} service.
-     * <p/>
+     *
      * <dl>
      * <dt>default</dt>
      * <dd>Does nothing, nulls stay null.</dd>
@@ -2255,9 +2256,9 @@ public final class TapestryModule
     /**
      * Determines positioning of hidden fields relative to other elements (this
      * is needed by {@link org.apache.tapestry5.corelib.components.FormFragment} and others.
-     * <p/>
+     *
      * For elements input, select, textarea and label the hidden field is positioned after.
-     * <p/>
+     *
      * For elements p, div, li and td, the hidden field is positioned inside.
      */
     public static void contributeHiddenFieldLocationRules(

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
index 0e0bb34..e79d185 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2009, 2011 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,10 +20,10 @@ import org.apache.tapestry5.annotations.OnEvent;
  * many different events. This interface is part of the public API for Tapestry, but is <em>not</em> expected to be
  * directly implemented by component classes; it should only be implemented as part of the component class
  * transformation process.
- * <p/>
+ *
  * Most of the methods are related to render phases; see the corresponding annotations and component rendering
  * documentation to see how they relate to each other.
- * <p/>
+ *
  * Starting in 5.3 this interface no longer implements {@link PageLifecycleListener}. Normally, this would be an incompatible
  * change, but Component is not supposed to be directly implemented by user code.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
index ee438d0..7921e47 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
@@ -1,5 +1,3 @@
-// Copyright 2006 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -25,7 +23,7 @@ public interface RenderCommand
      * Invoked on an object to request that it render itself. This involves a mix of invoking methods on the writer, and
      * queueing up additional commands (often, representing children of the object that was invoked) to perform
      * additional rendering.
-     * <p/>
+     *
      * In this way, rendering is a tail recursive algorithm, but is not implemented using tail recursion.
      */
     void render(MarkupWriter writer, RenderQueue queue);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
index 05569dd..f3f943f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2008, 2010 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -21,11 +19,11 @@ import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration;
  * Responsible for managing <em>session state objects</em>, objects which persist between requests, but are not tied to
  * any individual page or component. SSOs are also created on demand. SSOs are typically stored in the session, so that
  * they are specific to a particular client.
- * <p/>
+ *
  * The term "Application" is a hold-over from Tapestry 5.0, which used the @ApplicationState (deprecated and deleted)
  * annotation, and called them "ASOs" (Application State Objects). This service would be better named
  * "SessionStateManager" (but renaming it would cause backwards compatibility issues).
- * <p/>
+ *
  * Tapestry has a built-in default strategy for storing SSOs (in the session) and instantiating them. If desired,
  * contributions to the service configuration can override the default behavior, either specifying an alternate storage
  * strategy, or an alternate {@linkplain org.apache.tapestry5.services.ApplicationStateCreator creation strategy}.