tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject [3/9] tapestry-5 git commit: Clean up markup inside JavaDoc to confirm to JDK 1.8's stricter rules
Date Mon, 06 Apr 2015 19:20:18 GMT
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
index e2a3c75..1a71ca9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
@@ -1,5 +1,3 @@
-// Copyright 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,98 +14,83 @@ package org.apache.tapestry5.ioc.internal.services.cron;
 
 import java.io.Serializable;
 import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.TreeSet;
+import java.util.*;
 
 /**
  * Provides a parser and evaluator for unix-like cron expressions. Cron
  * expressions provide the ability to specify complex time combinations such as
  * "At 8:00am every Monday through Friday" or "At 1:30am every
  * last Friday of the month".
- * <P>
+ *
  * Cron expressions are comprised of 6 required fields and one optional field
  * separated by white space. The fields respectively are described as follows:
- * <p/>
+ *
  * <table cellspacing="8">
  * <tr>
  * <th align="left">Field Name</th>
  * <th align="left">&nbsp;</th>
  * <th align="left">Allowed Values</th>
- * <th align="left">&nbsp;</th>
  * <th align="left">Allowed Special Characters</th>
  * </tr>
  * <tr>
  * <td align="left"><code>Seconds</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>0-59</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * /</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Minutes</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>0-59</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * /</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Hours</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>0-23</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * /</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Day-of-month</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>1-31</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * ? / L W</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Month</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>1-12 or JAN-DEC</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * /</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Day-of-Week</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>1-7 or SUN-SAT</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * ? / L #</code></td>
  * </tr>
  * <tr>
  * <td align="left"><code>Year (Optional)</code></td>
- * <td align="left">&nbsp;</th>
+ * <td align="left">&nbsp;</td>
  * <td align="left"><code>empty, 1970-2199</code></td>
- * <td align="left">&nbsp;</th>
  * <td align="left"><code>, - * /</code></td>
  * </tr>
+ * <caption>Cron Expressions</caption>
  * </table>
- * <P>
+ * 
  * The '*' character is used to specify all values. For example, &quot;*&quot;
  * in the minute field means &quot;every minute&quot;.
- * <P>
+ * 
  * The '?' character is allowed for the day-of-month and day-of-week fields. It
  * is used to specify 'no specific value'. This is useful when you need to
  * specify something in one of the two fields, but not the other.
- * <P>
+ * 
  * The '-' character is used to specify ranges For example &quot;10-12&quot; in
  * the hour field means &quot;the hours 10, 11 and 12&quot;.
- * <P>
+ * 
  * The ',' character is used to specify additional values. For example
  * &quot;MON,WED,FRI&quot; in the day-of-week field means &quot;the days Monday,
  * Wednesday, and Friday&quot;.
- * <P>
+ * 
  * The '/' character is used to specify increments. For example &quot;0/15&quot;
  * in the seconds field means &quot;the seconds 0, 15, 30, and 45&quot;. And
  * &quot;5/15&quot; in the seconds field means &quot;the seconds 5, 20, 35, and
@@ -119,7 +102,7 @@ import java.util.TreeSet;
  * on every &quot;nth&quot; value in the given set. Thus &quot;7/6&quot; in the
  * month field only turns on month &quot;7&quot;, it does NOT mean every 6th
  * month, please note that subtlety.
- * <P>
+ * 
  * The 'L' character is allowed for the day-of-month and day-of-week fields.
  * This character is short-hand for &quot;last&quot;, but it has different
  * meaning in each of the two fields. For example, the value &quot;L&quot; in
@@ -132,7 +115,7 @@ import java.util.TreeSet;
  * from the last day of the month, such as "L-3" which would mean the third-to-last
  * day of the calendar month. <i>When using the 'L' option, it is important not to
  * specify lists, or ranges of values, as you'll get confusing/unexpected results.</i>
- * <P>
+ * 
  * The 'W' character is allowed for the day-of-month field.  This character
  * is used to specify the weekday (Monday-Friday) nearest the given day.  As an
  * example, if you were to specify &quot;15W&quot; as the value for the
@@ -144,11 +127,11 @@ import java.util.TreeSet;
  * 1st is a Saturday, the trigger will fire on Monday the 3rd, as it will not
  * 'jump' over the boundary of a month's days.  The 'W' character can only be
  * specified when the day-of-month is a single day, not a range or list of days.
- * <P>
+ * 
  * The 'L' and 'W' characters can also be combined for the day-of-month
  * expression to yield 'LW', which translates to &quot;last weekday of the
  * month&quot;.
- * <P>
+ * 
  * The '#' character is allowed for the day-of-week field. This character is
  * used to specify &quot;the nth&quot; XXX day of the month. For example, the
  * value of &quot;6#3&quot; in the day-of-week field means the third Friday of
@@ -159,7 +142,7 @@ import java.util.TreeSet;
  * no firing will occur that month.  If the '#' character is used, there can
  * only be one expression in the day-of-week field (&quot;3#1,6#3&quot; is
  * not valid, since there are two expressions).
- * <P>
+ * 
  * <!--The 'C' character is allowed for the day-of-month and day-of-week fields.
  * This character is short-hand for "calendar". This means values are
  * calculated against the associated calendar, if any. If no calendar is
@@ -167,11 +150,11 @@ import java.util.TreeSet;
  * value of "5C" in the day-of-month field means "the first day included by the
  * calendar on or after the 5th". A value of "1C" in the day-of-week field
  * means "the first day included by the calendar on or after Sunday".-->
- * <P>
+ * 
  * The legal characters and the names of months and days of the week are not
  * case sensitive.
- * <p/>
- * <p>
+ *
+ * 
  * <b>NOTES:</b>
  * <ul>
  * <li>Support for specifying both a day-of-week and a day-of-month value is
@@ -185,7 +168,7 @@ import java.util.TreeSet;
  * interpretation CronExpression chooses. An example would be
  * "0 0 14-6 ? * FRI-MON". </li>
  * </ul>
- * </p>
+ *
  *
  * @author Sharada Jambula, James House
  * @author Contributions from Mads Henderson

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
index f861e8d..eb37a08 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 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
@@ -51,7 +49,7 @@ public class ConcurrentBarrier
      * Invokes the object after acquiring the read lock (if necessary). If invoked when the read lock has not yet been
      * acquired, then the lock is acquired for the duration of the call. If the lock has already been acquired, then the
      * status of the lock is not changed.
-     * <p/>
+     *
      * TODO: Check to see if the write lock is acquired and <em>not</em> acquire the read lock in that situation.
      * Currently this code is not re-entrant. If a write lock is already acquired and the thread attempts to get the
      * read lock, then the thread will hang. For the moment, all the uses of ConcurrentBarrier are coded in such a way
@@ -216,7 +214,7 @@ public class ConcurrentBarrier
      * @param runnable    Runnable object to execute inside the write lock.
      * @param timeout     Time to wait for write lock.
      * @param timeoutUnit Units of timeout.
-     * @return true if lock was obtained & runnabled executed. False otherwise.
+     * @return true if lock was obtained and the runnable executed, or false otherwise.
      */
     public boolean tryWithWrite(final Runnable runnable, long timeout, TimeUnit timeoutUnit)
     {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
index 4505528..efd079e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.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
@@ -20,16 +18,16 @@ import java.util.List;
  * A service which can assemble an implementation based on a command interface, and an ordered list of objects
  * implementing that interface (the "commands"). This is an implementation of the Gang of Four Chain Of Command
  * pattern.
- * <p/>
+ *
  * For each method in the interface, the chain implementation will call the corresponding method on each command object
  * in turn (with the order defined by the list). If any of the command objects return true, then the chain of command
  * stops and the initial method invocation returns true. Otherwise, the chain of command continues to the next command
  * (and will return false if none of the commands returns true).
- * <p/>
+ *
  * For methods whose return type is not boolean, the chain stops with the first non-null (for object types), or non-zero
  * (for numeric types). The chain returns the value that was returned by the command. If the method return type is void,
  * all commands will be invoked.
- * <p/>
+ *
  * Method invocations will also be terminated if an exception is thrown.
  */
 public interface ChainBuilder

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
index 142d4d6..7662301 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.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
@@ -18,7 +16,7 @@ import java.util.List;
 
 /**
  * An analysis of an exception (including nested exceptions).
- * <p/>
+ *
  * TODO: Make serializable and/or convert to XML format.
  */
 public interface ExceptionAnalysis

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LazyAdvisor.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LazyAdvisor.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LazyAdvisor.java
index 6db5eb4..463378a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LazyAdvisor.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LazyAdvisor.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
@@ -22,12 +20,12 @@ import org.apache.tapestry5.ioc.MethodAdviceReceiver;
  * as if any of the parameters to a method are mutable, or the internal state of the invoked service changes, the lazily
  * evaluated results may not match the immediately evaluated result. This effect is greatly exaggerated if the lazy
  * return object is evaluated in a different thread than when it was generated.
- * <p/>
+ *
  * Another consideration is that exceptions that would occur immediately in the non-lazy case are also deferred, often
  * losing much context in the process.
- * <p/>
+ *
  * Use laziness with great care.
- * <p/>
+ *
  * Use the {@link org.apache.tapestry5.ioc.annotations.NotLazy} annotation on methods that should not be advised.
  *
  * @since 5.1.0.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
index be0c43e..bfa0eeb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 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,7 +18,7 @@ import org.slf4j.Logger;
  * Service that can create a logging interceptor that wraps around a service implementation (or interceptor). The
  * interceptor works with the service's log to log, at debug level, method entry (with arguments), method exit (with
  * return value, if any) as well as any thrown exceptions.
- * <p/>
+ *
  * This represents the Tapestry 5.0 decorator approach; for Tapestry 5.1 you may want to use the {@link
  * org.apache.tapestry5.ioc.services.LoggingAdvisor} in conjunction with a service advisor method.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
index defe334..41ae3d4 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 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
@@ -22,11 +20,11 @@ import org.apache.tapestry5.ioc.annotations.UsesOrderedConfiguration;
 /**
  * A service that acts as a chain-of-command over a number of {@link org.apache.tapestry5.ioc.ObjectProvider}, but
  * allows for the case where no object may be provided.
- * <p/>
+ *
  * This service is itself a key part of Tapestry's general injection mechanism; it is used when instantiating a service
  * implementation instance, invoking module methods (service builder, decorator, or contribution methods), when
  * {@linkplain ObjectLocator#autobuild(Class) autobuilding} objects of any type.
- * <p/>
+ *
  * As of Tapestry 5.3, the MasterObjectProvider allows injection of {@link org.apache.tapestry5.ioc.OperationTracker} as a
  * special case (not based on a contributed ObjectProvider).
  */
@@ -37,7 +35,7 @@ public interface MasterObjectProvider
      * Provides an object based on an expression. The process of providing objects occurs within a particular
      * <em>context</em>, which will typically be a service builder method, service contributor method, or service
      * decorator method. The locator parameter provides access to the services visible <em>to that context</em>.
-     * <p/>
+     *
      * When the value is required and no {@link ObjectProvider} provided a non-null value, then {@link
      * ObjectLocator#getService(Class, Class[])}  is invoked (with no marker annotations),
      * to provide a uniquely matching service, or throw a failure exception

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
index ad2512f..a906819 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
@@ -19,10 +19,6 @@ import org.apache.tapestry5.ioc.ObjectCreator;
  * Manages per-thread data, and provides a way for listeners to know when such data should be cleaned up. Typically,
  * data is cleaned up at the end of the request (in a web application). Tapestry IoC has any number of objects that need
  * to know when this event occurs, so that they can clean up any per-thread/per-request state.
- * <p/>
- * Due to <a href="https://issues.apache.org/jira/browse/TAPESTRY-2141">TAPESTRY-2141<a> (and the underlying JDK 1.5 bug
- * <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5025230">5025230</a>), this service has expanded to
- * manage per-thread data (not just end-of-request listeners).
  */
 public interface PerthreadManager
 {
@@ -57,8 +53,8 @@ public interface PerthreadManager
     <T> PerThreadValue<T> createValue();
 
     /**
-     * Return {@link org.apache.tapestry5.ioc.ObjectCreator}, which for each thread,
-     * the first call will use the delegate {@link org.apache.tapestry5.ioc.ObjectCreator} to create
+     * Return {@link ObjectCreator}, which for each thread,
+     * the first call will use the delegate {@link ObjectCreator} to create
      * an instance, and later calls will reuse the same per-thread instance. The instance is stored in the
      * {@link org.apache.tapestry5.ioc.services.PerthreadManager} and will be released at the end of the request.
      *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
index 98dfa97..2cfa200 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.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
@@ -23,15 +21,15 @@ import java.util.List;
  * filter interface: the filter interface is a variant of the service interface, where each method has an additional
  * parameter that is an instance of the service interface. Typically, this service parameter (often named "delegate") is
  * either the first or the last parameter of each method.
- * <p/>
+ *
  * The implementation of a filter method is expected to pass all of its parameters to the service instance passed into
  * it.
- * <p/>
+ *
  * The interesting thing is that there may be multiple filters in the pipeline. A fabricated "bridge" object (that
  * implements the service interface) is created to let each filter invoke methods on the next filter down the pipeline.
  * This simplifies the model for creating pipelines, as each filter is coded as if it was directly "in front of" the
  * terminator. In fact, it may be indirectly invoking methods on the next filter in the pipeline via a bridge instance.
- * <p/>
+ *
  * The builder is fairly smart about matching up service interface methods to filter interface methods, but keeping it
  * simple is also a good idea.  By convention, the final parameter of each filter method is the delegate object (the bridge or terminator).
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
index 95ecc33..22b5fab 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.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
@@ -18,7 +16,7 @@ package org.apache.tapestry5.ioc.services;
  * Creates a "shadow" of a property of an object. The shadow has the same type as the property, and delegates all method
  * invocations to the property. Each method invocation on the shadow re-acquires the value of the property from the
  * underlying object and delegates to the current value of the property.
- * <p/>
+ *
  * Typically, the object in question is another service, one with the "perthread" service lifecycle. This allows a
  * global singleton to shadow a value that is specific to the current thread (and therefore, the current request).
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
index 13a1523..c18d946 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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
@@ -20,7 +18,7 @@ import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration;
 /**
  * Provides access to user defined lifecycles (beyond the two built-in lifecycles: "singleton" and "primitive"). The
  * user defined lifecycles are contributed into the service's configuration.
- * <p/>
+ *
  * Note that the default scope {@linkplain org.apache.tapestry5.ioc.ScopeConstants#DEFAULT "singleton"} is special and
  * not a contribution.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceOverride.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceOverride.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceOverride.java
index 383c8cc..e822c70 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceOverride.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceOverride.java
@@ -1,5 +1,3 @@
-// Copyright 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
@@ -21,7 +19,7 @@ import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration;
  * Used to override built in services. Simply contribute a mapping from a type to an instance of that type. Anywhere
  * that exact type is injected, without specifying markers or other annotations, the contributed instance will be
  * injected, even if there is already a service that implements the interface.
- * <p>
+ *
  * In fact, this is <em>not</em> limited to overriding services; any object that can be injected based solely on type
  * can be contributed.
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
index 6ddac07..ece42e0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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
@@ -21,12 +19,12 @@ import java.util.Map;
 /**
  * A service implementation builder that operates around a {@link StrategyRegistry}, implementing a version of the Gang
  * of Four Strategy pattern.
- * <p/>
+ *
  * The constructed service is configured with a number of adapters (that implement the same service interface). Method
  * invocations on the service are routed to one of the adapters.
- * <p/>
+ *
  * The first parameter of each method is used to select the appropriate adapter.
- * <p/>
+ *
  * The ideal interface for use with this builder has only one method.
  */
 public interface StrategyBuilder

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
index 8a1f134..9745090 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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
@@ -18,7 +16,7 @@ import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration;
 
 /**
  * A provider of values for symbols, used by the {@link org.apache.tapestry5.ioc.services.SymbolSource} service.
- * <p/>
+ *
  * This is the service interface for the FactoryDefaults and ApplicationDefaults services; each of these takes a
  * configuration mapping symbols to their values.
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
index 52c1c41..a38d718 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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,7 +19,7 @@ import org.apache.tapestry5.ioc.annotations.Value;
  * Used to manage <em>symbols</em>, configuration properties whose value is evaluated at runtime. Symbols use the Ant
  * syntax: <code>${foo.bar.baz}</code> where <code>foo.bar.baz</code> is the name of the symbol. The symbol may appear
  * inside some annotation, such as {@link Value}.
- * <p/>
+ *
  * The SymbolSource service configuration is an ordered list of {@link org.apache.tapestry5.ioc.services.SymbolProvider}s.
  * Two key SymbolProvider services are FactoryDefaults and ApplicationDefaults.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
index b465b4f..b857cbf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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
@@ -18,7 +16,7 @@ import java.util.EventListener;
 
 /**
  * Listener interface for object that need to know about thread event cleanup.
- * <p/>
+ *
  * Note that registration with the {@link org.apache.tapestry5.ioc.services.PerthreadManager} is a one-shot affair; it
  * lasts no longer than the next cleanup.
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/Schedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/Schedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/Schedule.java
index f22319e..cab803a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/Schedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/Schedule.java
@@ -1,5 +1,3 @@
-// Copyright 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
@@ -31,7 +29,7 @@ public interface Schedule
      * Computes the next execution time for a job.
      *
      * @param previousExecution time of previous execution (in system clock millis)
-     * @return time of next execution (in system clock millis) or a value <=0 to cancel the job's execution
+     * @return time of next execution (in system clock millis) or a value &lt;= 0 to cancel the job's execution
      */
     long nextExecution(long previousExecution);
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java
index fde8d07..6bf275c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/IdAllocator.java
@@ -1,5 +1,3 @@
-// Copyright 2004, 2005, 2006, 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
@@ -14,18 +12,18 @@
 
 package org.apache.tapestry5.ioc.util;
 
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-
 /**
  * Used to "uniquify" names within a given context. A base name is passed in, and the return value is the base name, or
  * the base name extended with a suffix to make it unique.
- * <p/>
+ *
  * This class is not threadsafe.
  */
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
index 6f86cc7..c7c7dab 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 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
@@ -14,19 +12,19 @@
 
 package org.apache.tapestry5.ioc.util;
 
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 
-import org.apache.tapestry5.ioc.internal.util.InternalUtils;
-
 /**
  * Generates name variations for a given file name or path and a locale. The name variations
  * are provided in most-specific to least-specific order, so for a path of "Base.ext" and a Locale
  * of "en_US", the generated names would be "Base_en_US.ext", "Base_en.ext", "Base.ext".
- * <p>
+ *
  * Implements Iterable, so a LocalizedNameGenerator may be used directly in a for loop.
- * <p/>
+ *
  * This class is not threadsafe.
  * 
  * @since 5.3

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListener.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListener.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListener.java
index ad0633e..8eabe3a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListener.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListener.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 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
@@ -16,7 +14,7 @@ package org.apache.tapestry5.services;
 
 /**
  * Interface for objects which can periodically check for updates.
- * <p>
+ *
  * Note that this interface has moved from module tapestry-core to tapestry-ioc, but has kept the same package (for
  * backwards compatibility reasons).
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListenerHub.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListenerHub.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListenerHub.java
index ced0354..5395060 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListenerHub.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/services/UpdateListenerHub.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 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
@@ -23,14 +21,14 @@ import org.apache.tapestry5.ioc.ObjectLocator;
  * external resource files (such as classes or template files) can check to see if any file they've used has changed. If
  * so, the service can invalidate its internal cache, or notify other services (typically via
  * {@link org.apache.tapestry5.services.InvalidationListener} that they should do the same.
- * <p>
+ *
  * Note that this interface has moved from module tapestry-core to tapestry-ioc, but has kept the same package (for
  * backwards compatibility reasons).
- * <p>
+ *
  * A <em>weak reference</em> to the listener is kept; this ensures that registering as a listener will not prevent a
  * listener instance from being reclaimed by the garbage collector (this is useful as proxies created by
  * {@link ObjectLocator#proxy(Class, Class)} may register as listeners, but still be ephemeral).
- * <p>
+ *
  * Starting in Tapestry 5.3, this services does <em>nothing</em> in production mode.
  * 
  * @since 5.1.0.0

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerManager.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerManager.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerManager.java
index 9884b70..48650f9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerManager.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerManager.java
@@ -1,5 +1,3 @@
-// Copyright 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,15 +12,14 @@
 
 package org.apache.tapestry5.jpa;
 
-import java.util.Map;
-
 import javax.persistence.EntityManager;
+import java.util.Map;
 
 /**
  * Manages <code>EntityManager</code>s for the current thread.
  * An <code>EntityManager</code> is created as needed and closed at the end of each request.
  *
- * <p/>
+ *
  *
  * The implementation of this service is per-thread.
  *
@@ -31,15 +28,15 @@ import javax.persistence.EntityManager;
 public interface EntityManagerManager
 {
     /**
-     * Gets the active <code>EntityManager</code> for this request, creating it as necessary.
+     * Gets the active EntityManager for this request, creating it as necessary.
      *
-     * @param persistenceUnitName the name of a persistence unit as defined in <code>persistence.xml<code>
+     * @param persistenceUnitName the name of a persistence unit as defined in {@code persistence.xml}
      * @return EntityManager for the persistence unit,
      */
     EntityManager getEntityManager(String persistenceUnitName);
 
     /**
-     * Gets all active <code>EntityManager</code>s for this request, creating them as necessary.
+     * Gets all active EntityManagers for this request, creating them as necessary.
      *
      * @return Map in which persistence unit names are associated with EntityManagers
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerSource.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerSource.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerSource.java
index f9ec159..dddf84c 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerSource.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/EntityManagerSource.java
@@ -1,5 +1,3 @@
-// Copyright 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,11 +12,10 @@
 
 package org.apache.tapestry5.jpa;
 
-import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.PersistenceUnitInfo;
+import java.util.List;
 
 /**
  * Responsible for creating an EntityManager as needed.
@@ -28,24 +25,24 @@ import javax.persistence.spi.PersistenceUnitInfo;
 public interface EntityManagerSource
 {
     /**
-     * Creates an <code>EntityManager</code> for the given persistence unit name.
+     * Creates an EntityManager for the given persistence unit name.
      *
-     * @param persistenceUnitName the name of a persistence unit as defined in <code>persistence.xml<code>
+     * @param persistenceUnitName the name of a persistence unit as defined in {@code persistence.xml}
      * @return  EntityManager for the given persistence unit name
      */
     EntityManager create(String persistenceUnitName);
 
     /**
-     * Gets the <code>EntityManagerFactory</code> for the given persistence unit name, creating it as necessary.
+     * Gets the EntityManagerFactory for the given persistence unit name, creating it as necessary.
      *
-     * @param persistenceUnitName the name of a persistence unit as defined in <code>persistence.xml<code>
+     * @param persistenceUnitName the name of a persistence unit as defined in {@code persistence.xml}
      *
      * @return EntityManagerFactory for the given persistence unit name
      */
     EntityManagerFactory getEntityManagerFactory(String persistenceUnitName);
 
     /**
-     * Get the list of {@linkplain PersistenceUnitInfo} parsed from <code>persistence.xml<code>.
+     * Get the list of {@linkplain PersistenceUnitInfo} parsed from {@code persistence.xml}.
      *
      * @return list of PersistenceUnitInfos
      */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaEntityPackageManager.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaEntityPackageManager.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaEntityPackageManager.java
index e5f7b51..a4d28dc 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaEntityPackageManager.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaEntityPackageManager.java
@@ -1,5 +1,3 @@
-// Copyright 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,13 +12,13 @@
 
 package org.apache.tapestry5.jpa;
 
-import java.util.Collection;
-
 import org.apache.tapestry5.ioc.annotations.UsesConfiguration;
 
+import java.util.Collection;
+
 /**
  * Contains a set of contributed package names from which to load entities.
- * <p/>
+ *
  * The service's configuration is the names of Java packages to search for JPA entities.
  * 
  * @since 5.3

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
index 040afdd..00004c9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaGridDataSource.java
@@ -1,5 +1,3 @@
-// Copyright 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,7 +12,8 @@
 
 package org.apache.tapestry5.jpa;
 
-import java.util.List;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.grid.SortConstraint;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -22,9 +21,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Root;
-
-import org.apache.tapestry5.grid.GridDataSource;
-import org.apache.tapestry5.grid.SortConstraint;
+import java.util.List;
 
 /**
  * A simple implementation of {@link org.apache.tapestry5.grid.GridDataSource} based on a
@@ -32,9 +29,9 @@ import org.apache.tapestry5.grid.SortConstraint;
  * entity class. This implementation does support multiple
  * {@link org.apache.tapestry5.grid.SortConstraint sort
  * constraints}.
- * <p/>
+ *
  * This class is <em>not</em> thread-safe; it maintains internal state.
- * <p/>
+ *
  * Typically, an instance of this object is created fresh as needed (that is, it is not stored
  * between requests).
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
index 7cb7d55..385a612 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONArray.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 2008, 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
@@ -45,16 +43,16 @@ import java.util.List;
  * accessing the values by index, and {@code put} methods for adding or replacing values. The values can be any of
  * these types: {@code Boolean}, {@code JSONArray}, {@code JSONObject}, {@code Number},
  * {@code String}, or the {@code JSONObject.NULL object}.
- * <p/>
+ *
  * The constructor can convert a JSON text into a Java object. The {@code toString} method converts to JSON text.
- * <p/>
+ *
  * A {@code get} method returns a value if one can be found, and throws an exception if one cannot be found. An
  * {@code opt} method returns a default value instead of throwing an exception, and so is useful for obtaining
  * optional values.
- * <p/>
+ *
  * The generic {@code get()} and {@code opt()} methods return an object which you can cast or query for type.
  * There are also typed {@code get} and {@code opt} methods that do type checking and type coersion for you.
- * <p/>
+ *
  * The texts produced by the {@code toString} methods strictly conform to JSON syntax rules. The constructors are
  * more forgiving in the texts they will accept:
  * <ul>
@@ -104,7 +102,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
 
     /**
      * Create a new array, and adds all values fro the iterable to the array (using {@link #putAll(Iterable)}.
-     * <p/>
+     *
      * This is implemented as a static method so as not to break the semantics of the existing {@link #JSONArray(Object...)} constructor.
      * Adding a constructor of type Iterable would change the meaning of <code>new JSONArray(new JSONArray())</code>.
      *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONCollection.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONCollection.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONCollection.java
index f06118b..c5ee108 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONCollection.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONCollection.java
@@ -1,5 +1,3 @@
-// Copyright 2010, 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
@@ -28,9 +26,9 @@ public abstract class JSONCollection implements Serializable
 {
     /**
      * Converts this JSON collection into a parsable string representation.
-     * <p/>
+     *
      * Warning: This method assumes that the data structure is acyclical.
-     * <p>
+     *
      * Starting in release 5.2, the result will be pretty printed for readability.
      * 
      * @return a printable, displayable, portable, transmittable representation of the object, beginning with

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
index 1392bb8..a9555b8 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.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
@@ -50,18 +48,18 @@ import java.util.*;
  * values into a JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code> method
  * returns a value if one can be found, and throws an exception if one cannot be found. An <code>opt</code> method
  * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
- * <p/>
+ *
  * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can cast or query for type.
  * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coersion for you.
- * <p/>
+ *
  * The <code>put</code> methods adds values to an object. For example,
- * <p/>
+ *
  * <pre>
  * myString = new JSONObject().put(&quot;JSON&quot;, &quot;Hello, World!&quot;).toString();
  * </pre>
- * <p/>
+ *
  * produces the string <code>{"JSON": "Hello, World"}</code>.
- * <p/>
+ *
  * The texts produced by the <code>toString</code> methods strictly conform to the JSON syntax rules. The constructors
  * are more forgiving in the texts they will accept:
  * <ul>
@@ -71,19 +69,19 @@ import java.util.*;
  * contain leading or trailing spaces, and if they do not contain any of these characters: <code>{ }
  * [ ] / \ : , = ; #</code> and if they do not look like numbers and if they are not the reserved words
  * <code>true</code>, <code>false</code>, or <code>null</code>.</li>
- * <li>Keys can be followed by <code>=</code> or <code>=></code> as well as by <code>:</code>.</li>
+ * <li>Keys can be followed by <code>=</code> or {@code =>} as well as by {@code :}.</li>
  * <li>Values can be followed by <code>;</code> <small>(semicolon)</small> as well as by <code>,</code>
  * <small>(comma)</small>.</li>
  * <li>Numbers may have the <code>0-</code> <small>(octal)</small> or <code>0x-</code> <small>(hex)</small> prefix.</li>
  * <li>Comments written in the slashshlash, slashstar, and hash conventions will be ignored.</li>
  * </ul>
- * <hr/>
- * <p/>
+ * <hr>
+ *
  * This class, and the other related classes, have been heavily modified from the original source, to fit Tapestry
  * standards and to make use of JDK 1.5 features such as generics. Further, since the interest of Tapestry is primarily
  * constructing JSON (and not parsing it), many of the non-essential methods have been removed (since the original code
  * came with no tests).
- * <p/>
+ *
  * Finally, support for the {@link org.apache.tapestry5.json.JSONLiteral} type has been added, which allows the exact
  * output to be controlled; useful when a JSONObject is being used as a configuration object, and must contain values
  * that are not simple data, such as an inline function (making the result not JSON).
@@ -175,7 +173,7 @@ public final class JSONObject extends JSONCollection
      * Constructs a new JSONObject using a series of String keys and object values.
      * Object values sholuld be compatible with {@link #put(String, Object)}. Keys must be strings
      * (toString() will be invoked on each key).
-     * <p/>
+     *
      * Prior to release 5.4, keysAndValues was type String...; changing it to Object... makes
      * it much easier to initialize a JSONObject in a single statement, which is more readable.
      *
@@ -305,8 +303,7 @@ public final class JSONObject extends JSONCollection
      * @param value
      *         An object to be accumulated under the key.
      * @return this.
-     * @throws {@link
-     *         RuntimeException} If the value is an invalid number or if the key is null.
+     * @throws RuntimeException if the value is an invalid number or if the key is null.
      */
     public JSONObject accumulate(String key, Object value)
     {
@@ -696,8 +693,8 @@ public final class JSONObject extends JSONCollection
     }
 
     /**
-     * Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted
-     * within </, allowing JSON text to be delivered in HTML. In JSON text, a string cannot contain a control character
+     * Produce a string in double quotes with backslash sequences in all the right places,
+     * allowing JSON text to be delivered in HTML. In JSON text, a string cannot contain a control character
      * or an unescaped quote or backslash.
      *
      * @param string

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-json/src/main/java/org/apache/tapestry5/json/package-info.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/package-info.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/package-info.java
index 62c1972..5a757e7 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/package-info.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/package-info.java
@@ -1,5 +1,3 @@
-// Copyright 2012, 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
@@ -14,7 +12,7 @@
 
 /**
  * Repackaged, improved (and tested) version of code originally from json.org.
- * <p/>
+ *
  * Starting in release 5.4, {@link org.apache.tapestry5.json.JSONObject} and {@link org.apache.tapestry5.json.JSONArray}
  * are serializable.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaImage.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaImage.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaImage.java
index 973a801..7e05811 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaImage.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaImage.java
@@ -35,7 +35,7 @@ import java.io.InputStream;
  * Part of a Captcha based authentication scheme; a KaptchaImage generates a new
  * text image whenever it <em>renders</em> and can provide the previously
  * rendered text subsequently (it is stored persistently in the session).
- * <p/>
+ *
  * The component renders an {@code <img>} tag, including width and height attributes. Other attributes
  * come from informal parameters.
  *

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
index eba74ec..eca1c1f 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
@@ -1,5 +1,3 @@
-// Copyright 2007, 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
@@ -22,7 +20,7 @@ import org.easymock.IMocksControl;
  * suite. A <em>single</em> standard mock control is used for all mock instances. The control does not care about
  * execution order, but will balk at any unexpected method invocations. This class is thread safe (it used a thread
  * local to store the mock control).
- * <p>
+ *
  * This class was originally in the tapestry-ioc module as was moved to tapestry-test; the package name was not changed
  * to ensure backwards compatibility.
  * @deprecated In 5.4, with no replacement

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
index 5bb263e..e8f5788 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
@@ -1,5 +1,3 @@
-// Copyright 2006, 2007, 2008, 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
@@ -19,20 +17,20 @@ import org.testng.annotations.AfterMethod;
 
 /**
  * Manages a set of EasyMock mock objects. Used as a base class for test cases.
- * <p/>
+ *
  * Extends from {@link org.testng.Assert} to bring in all the public static assert methods without requiring extra
  * imports.
- * <p/>
+ *
  * Provides a common mock factory method, {@link #newMock(Class)}. A single <em>standard</em> mock control is used for
  * all mock objects. Standard mocks do not care about the exact order in which methods are invoked, though they are as
  * rigorous as strict mocks when checking that parameters are the correct values.
- * <p/>
+ *
  * This base class is created with the intention of use within a TestNG test suite; if using JUnit, you can get the same
  * functionality using {@link MockTester}.
- * <p/>
+ *
  * This class is thread safe (it uses a thread local to store the mock control). In theory, this should allow TestNG to
  * execute tests in parallel.
- * <p>
+ *
  * This class was originally in the tapestry-ioc module as was moved to tapestry-test; the package name was not changed
  * to ensure backwards compatibility.
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
index 31bf6fb..0cfdcc2 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.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,7 +22,7 @@ import java.util.List;
 /**
  * Extra assertions on top of the standard set, packaged as a base class for easy referencing in tests. Also,
  * utilities for instantiation objects and setting and reading private fields of those objects.
- * <p>
+ *
  * This class was originally in the tapestry-ioc module as was moved to tapestry-test; the package name was not changed
  * to ensure backwards compatibility.
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index 890cdb6..5b04def 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -121,11 +121,12 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
      * <td>*firefox</td>
      * <td>Command string used to launch the browser, as defined by Selenium</td>
      * </tr>
+     * <caption>Options and defaults</caption>
      * </table>
-     * <p/>
+     *
      * Tests in the <em>beforeStartup</em> group will be run before the start of Selenium. This can be used to
      * programmatically override the above parameter values.
-     * <p/>
+     *
      * This method will be invoked in <em>each</em> subclass, but is set up to only startup the servers once (it checks
      * the {@link ITestContext} to see if the necessary keys are already present).
      *
@@ -386,7 +387,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
     /**
      * Returns the base URL for the application. This is of the typically <code>http://localhost:9999/</code> (i.e., it
      * includes a trailing slash).
-     * <p/>
+     *
      * Generally, you should use {@link #openLinks(String...)} to start from your application's home page.
      */
     public String getBaseURL()
@@ -1612,7 +1613,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
     /**
      * Waits, up to the page load limit for an element (identified by a CSS rule) to exist
      * (it is not assured that the element will be visible).
-     * <p/>
+     *
      * This implementation only works if the application provides a function onto the
      * window object:  "testSupport.findCSSMatchCount()" which accepts a CSS rule and returns the number
      * of matching elements.
@@ -1647,8 +1648,8 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
 
     /**
      * Waits for the element to be removed from the DOM.
-     * <p/>
-     * <p/>
+     *
+     *
      * This implementation depends on window being extended with testSupport.isNotVisible().
      *
      * @param elementId

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactory.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactory.java
index c509cce..559d8fa 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactory.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/ResourceTransformerFactory.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
@@ -17,7 +15,7 @@ package org.apache.tapestry5.internal.webresources;
 import org.apache.tapestry5.services.assets.ResourceTransformer;
 
 /**
- * Creates ResourceTransformer around a named {@link org.apache.tapestry5.webresources.services.ResourceProcessor}.
+ * Wraps a {@link ResourceTransformer} to provide additional features such as caching.
  *
  * @see org.apache.tapestry5.services.assets.StreamableResourceSource
  * @since 5.4
@@ -38,7 +36,6 @@ public interface ResourceTransformerFactory
      * @param cacheMode
      *         Indicates if and how the compiled content should be cached (in development mode only)
      * @return transformer
-     * @see org.apache.tapestry5.webresources.services.ResourceProcessorSource
      */
     ResourceTransformer createCompiler(String contentType, String sourceName, String targetName, ResourceTransformer transformer, CacheMode cacheMode);
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Translate.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Translate.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Translate.java
index a5c7b2e..d0634b3 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Translate.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Translate.java
@@ -1,5 +1,3 @@
-// Copyright 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
@@ -14,23 +12,20 @@
 
 package org.apache.tapestry5.beaneditor;
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.BEAN;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.COMPONENT;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.MIXIN;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.PAGE;
+import org.apache.tapestry5.ioc.annotations.UseWith;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.apache.tapestry5.ioc.annotations.UseWith;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
 
 /**
  * Used to attach the name of a Translator used to convert the associated property between server-side and
  * client-side representations.
- * <p/>
+ *
  * May be placed on any getter or setter method, or on the matching field.
  * 
  * @see Validate

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
index d5c12e7..842e91c 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
@@ -1,5 +1,3 @@
-// Copyright 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
@@ -14,18 +12,15 @@
 
 package org.apache.tapestry5.beaneditor;
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.BEAN;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.COMPONENT;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.MIXIN;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.PAGE;
+import org.apache.tapestry5.ioc.annotations.UseWith;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.apache.tapestry5.ioc.annotations.UseWith;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
 
 /**
  * Used to attach validation constraints directly to a property (either the getter or the setter method). The annotation
@@ -33,7 +28,7 @@ import org.apache.tapestry5.ioc.annotations.UseWith;
  * "required", "minlength") and optionally, a constraint value. Most validators need a constraint value, which is
  * separated from the type by an equals size (i.e., "maxlength=30"). In addition, the value may include
  * validator macros.
- * <p/>
+ *
  * May be placed on any getter or setter method, or on the matching field.
  * 
  * @see Translate

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
index 5b1faed..8cdfc58 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
@@ -1,5 +1,3 @@
-// Copyright 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
@@ -15,17 +13,18 @@
 package org.apache.tapestry5.beaneditor;
 
 import org.apache.tapestry5.ioc.annotations.UseWith;
-import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
 
 import java.lang.annotation.*;
 
+import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
+
 
 /**
  * Defines the desired width of the field used to edit the property.  Note that width (generally equivalent to the size
  * attribute of an HTML &lt;input&gt; element) is only used for presentation; validation must be used to actually
  * enforce a maximum input length.
- * <p/>
- * <p/>
+ *
+ *
  * May be placed on an getter or setter method, or on the matching field.
  */
 @Target({ ElementType.FIELD, ElementType.METHOD })

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
index f09e1a1..45a5369 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.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
@@ -15,35 +13,35 @@
 package org.apache.tapestry5.ioc.annotations;
 
 import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
 
 /**
  * This annotation serves is something of the Swiss Army knife for operations related to injection of dependencies into
  * an arbitrary method of Java Bean.
- * <p/>
- * <p>
+ *
+ *
  * It marks parameters that should be injected in the IoC container, and it marks fields that should be injected inside
  * Tapestry components.
- * <p/>
+ *
  * In terms of the IoC container; normally, resources take precedence over annotations when injecting. The Inject
  * annotation overrides this default, forcing the resolution of the parameters value via the master
  * {@link org.apache.tapestry5.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a
  * resource.
- * <p/>
+ *
  * For service implementations, module classes, and other objects constructed via
  * {@link org.apache.tapestry5.ioc.ObjectLocator#autobuild(Class)}, this annotation indicates that an injection is
  * desired on the field, as with fields of a Tapestry component.
- * <p/>
+ *
  * In terms of the IoC container, the Inject annotation is only used on parameters to service builder methods (and
  * contributor and decorator methods) and on module class constructors. constructors. However, inside Tapestry
  * components (<em>and only inside components</em>), it may be applied to fields. On fields that require injection, the
  * Inject annotation is <em>required</em>.
- * <p/>
+ *
  * Finally, on a constructor, this is used to indicate <em>which</em> constructor should be used when more than one is
  * available.
  * 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
index 0e1eb34..f57c256 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectResource.java
@@ -1,5 +1,3 @@
-// Copyright 2008, 2009, 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
@@ -20,7 +18,7 @@ import java.lang.annotation.*;
 /**
  * Annotation used with field injection when the desired injection value is a resource (such as a service id, service
  * configuration, or logger) and not an object obtained from the {@link org.apache.tapestry5.ioc.services.MasterObjectProvider}.
- * <p/>
+ *
  * In Tapestry 5.3, the logic for this was changed so that it is treated the same as {@link Inject}. This reflects what people usually want.
  *
  * @deprecated Deprecated in Tapestry 5.3, to be removed in a later release. Use {@link Inject} instead.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
index 38eaa03..80be73c 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.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
@@ -15,18 +13,19 @@
 package org.apache.tapestry5.ioc.annotations;
 
 import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
 
 
 /**
  * Annotation used with parameters of service builder methods to identify the service to be injected into the service
  * builder method via the parameter. In many cases the {@link org.apache.tapestry5.ioc.annotations.Inject} annotation is
  * more flexible or appropriate.
- * <p/>
+ *
  * This annotation may also be used with fields of service implementation classes, modules, or other objects constructed
  * via {@link org.apache.tapestry5.ioc.ObjectLocator#autobuild(Class)}.
  */

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/PostInjection.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/PostInjection.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/PostInjection.java
index 60d3169..c905aba 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/PostInjection.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/PostInjection.java
@@ -1,5 +1,3 @@
-// Copyright 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,7 +20,7 @@ import java.lang.annotation.*;
  * after field injection. It should be placed on a <strong>public method</strong>. Any return value from the method is
  * ignored. The order of invocation for classes with multiple marked methods (including methods inherited from
  * super-classes) is not, at this time, defined.
- * <p/>
+ *
  * Tapestry also honors the {@link javax.annotation.PostConstruct} annotation, and treats it identically to
  * PostInjection. This is both more flexible than PostConstruct (in that methods may have parameters, and multiple methods
  * may be annotated) but also falls short (Tapestry will only seek out public methods).

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
index eb007dd..7cfa3bd 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.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
@@ -27,8 +25,8 @@ import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*;
  * Used to inject a symbol value, via a symbol name. This is used much like {@link
  * org.apache.tapestry5.ioc.annotations.Value} annotation, except that symbols are not expanded ... the entire value is
  * a symbol name. This allows the annotation to reference a public constant variable.
- * <p/>
- * <p/>
+ *
+ *
  * The injected value may be coerced from string to an alternate type (defined by the field or parameter to which
  * the @Symbol annotation is attached). For better control, use the {@link IntermediateType} annotation as well, which
  * allows the string to be coerced to an alternate type before being coerced a second time to the field or parameter type.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java
----------------------------------------------------------------------
diff --git a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java
index a336365..f2a1fc8 100644
--- a/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java
+++ b/tapestry5-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java
@@ -1,5 +1,3 @@
-//  Copyright 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
@@ -19,8 +17,8 @@ import java.lang.annotation.*;
 /**
  * A documentation-only interface placed on service interfaces for services which have a {@linkplain
  * org.apache.tapestry5.ioc.MappedConfiguration mapped configuration}, to identify the type of key (often, a String),
- * and type ofcontribution.
- * <p/>
+ * and type of contribution.
+ *
  * Remember that when the key type is String, the map will be case-insensitive.
  */
 @Target(ElementType.TYPE)


Mime
View raw message