You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/05/23 16:26:59 UTC

[2/7] Required Java version is now 1.6, this applies to building as well as to using Tapestry

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
index 9c51680..a01ad5a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
 public class EagerLoadViaAnnotationServiceImpl implements Runnable
 {
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
index f4c9013..d4b8637 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
@@ -24,6 +24,7 @@ public class ExceptionInConstructorServiceImpl implements Pingable
         throw new RuntimeException("Yes, we have no tomatoes.");
     }
 
+    @Override
     public void ping()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
index 0d7a8d2..6d0bfdb 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
@@ -42,6 +42,7 @@ public class ExtraPublicConstructorsModule
     {
         return new UpcaseService()
         {
+            @Override
             public String upcase(String input)
             {
                 return source.expandSymbols(input).toUpperCase();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
index dda2326..3c38f05 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
@@ -31,11 +31,13 @@ public class MultipleConstructorsAutobuildService implements StringHolder
         this.delegate = delegate;
     }
 
+    @Override
     public String getValue()
     {
         return delegate.getValue();
     }
 
+    @Override
     public void setValue(String value)
     {
         delegate.setValue(value);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
index 11291a6..ed57f2c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NamedViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import javax.inject.Named;
 public class NamedViaAnnotationServiceImpl implements Runnable
 {
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
index 5470c24..a15bfba 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonAnnotatedServiceInterfaceImpl.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.ioc.annotations.IntermediateType;
 public class NonAnnotatedServiceInterfaceImpl implements NonAnnotatedServiceInterface
 {
 
+    @Override
     @Advise(id = "id", serviceInterface = NonAnnotatedServiceInterface.class)
     public String execute(@IntermediateType(String.class) int i) // annotation just for checking too
     { 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
index ddc8446..0395697 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoopClassLoaderDelegate.java
@@ -18,11 +18,13 @@ import org.apache.tapestry5.internal.plastic.ClassLoaderDelegate;
 
 public class NoopClassLoaderDelegate implements ClassLoaderDelegate
 {
+    @Override
     public boolean shouldInterceptClassLoading(String className)
     {
         return false;
     }
 
+    @Override
     public Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
     {
         throw new IllegalStateException();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
index 75b5bb5..21f66b9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
@@ -23,6 +23,7 @@ public class RunnableServiceImpl implements Runnable
     {
     }
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
index 82bfaeb..21f7406 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaAnnotationServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.ServiceId;
 public class ServiceIdViaAnnotationServiceImpl implements Runnable
 {
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
index 57992b6..bde2ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdViaMethodAnnotationServiceImpl.java
@@ -18,6 +18,7 @@ package org.apache.tapestry5.ioc.internal;
 public class ServiceIdViaMethodAnnotationServiceImpl implements Runnable
 {
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
index f61944d..0709437 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TestAdvice.java
@@ -25,6 +25,7 @@ final public class TestAdvice implements MethodAdvice {
 
     public static final String ANNOTATION_FOUND = "Annotation found!";
 
+    @Override
     public void advise(MethodInvocation invocation) {
 
         final Method method = invocation.getMethod();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
index da1b5e7..22b8ab5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
@@ -2,5 +2,6 @@ package org.apache.tapestry5.ioc.internal;
 
 public interface ToStringService
 {
+    @Override
     String toString();
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
index 19d7d24..04915ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
@@ -20,11 +20,13 @@ public class ToUpperCaseStringHolder implements StringHolder
 {
     private String value;
 
+    @Override
     public String getValue()
     {
         return value;
     }
 
+    @Override
     public void setValue(String value)
     {
         this.value = value.toUpperCase();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
index 4c214de..36ae8ac 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc.internal;
 public class UpcaseServiceImpl implements UpcaseService
 {
 
+    @Override
     public String upcase(String input)
     {
         return input.toUpperCase();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
index 2787917..2fb671e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
@@ -24,6 +24,7 @@ public class StartupModule
     {
         Runnable r = new Runnable()
         {
+            @Override
             public void run()
             {
                 startupInvoked = true;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
index b8e0484..adbbe45 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
@@ -16,5 +16,6 @@ package org.apache.tapestry5.ioc.internal.services;
 
 public interface ToStringService
 {
+    @Override
     public String toString();
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
index cc598af..2a0f8f4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
@@ -31,6 +31,7 @@ public class ConcurrentTarget
     {
         return barrier.withRead(new Invokable<Integer>()
         {
+            @Override
             public Integer invoke()
             {
                 return getCounter();
@@ -42,6 +43,7 @@ public class ConcurrentTarget
     {
         return barrier.withRead(new Invokable<Integer>()
         {
+            @Override
             public Integer invoke()
             {
                 return counter;
@@ -53,6 +55,7 @@ public class ConcurrentTarget
     {
         barrier.withWrite(new Runnable()
         {
+            @Override
             public void run()
             {
                 counter++;
@@ -64,6 +67,7 @@ public class ConcurrentTarget
     {
         barrier.withWrite(new Runnable()
         {
+            @Override
             public void run()
             {
                 ConcurrentTarget.this.counter = counter;
@@ -75,6 +79,7 @@ public class ConcurrentTarget
     {
         barrier.withRead(new Runnable()
         {
+            @Override
             public void run()
             {
                 if (counter >= 0)
@@ -87,10 +92,12 @@ public class ConcurrentTarget
     {
         barrier.withRead(new Runnable()
         {
+            @Override
             public void run()
             {
                 Runnable r = new Runnable()
                 {
+                    @Override
                     public void run()
                     {
                         incrementCounter();
@@ -106,6 +113,7 @@ public class ConcurrentTarget
     {
         barrier.withWrite(new Runnable()
         {
+            @Override
             public void run()
             {
                 counter = getCounter() + 1;
@@ -117,6 +125,7 @@ public class ConcurrentTarget
     {
         return barrier.tryWithWrite(new Runnable()
         {
+            @Override
             public void run()
             {
                 counter++;
@@ -128,6 +137,7 @@ public class ConcurrentTarget
     {
         return barrier.tryWithWrite(new Runnable()
         {
+            @Override
             public void run()
             {
                 counter = getCounter() + 1;
@@ -140,6 +150,7 @@ public class ConcurrentTarget
         final List<Boolean> result = new ArrayList<Boolean>();
         barrier.withRead(new Runnable()
         {
+            @Override
             public void run()
             {
                 if (counter >= 0)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
index 6a16a7f..96fea8a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
@@ -26,10 +26,12 @@ public class ConcurrentTargetWrapper implements Runnable
         this.target = target;
     }
 
+    @Override
     public void run()
     {
         barrier.withRead(new Runnable()
         {
+            @Override
             public void run()
             {
                 target.incrementCounter();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
index 523e665..a5d0520 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DrivableImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
 public class DrivableImpl implements Drivable
 {
 
+    @Override
     public void drive()
     {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
index 307501b..3c99ef1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/PlayableImpl.java
@@ -6,6 +6,7 @@ package org.apache.tapestry5.ioc.internal.util;
 public class PlayableImpl extends DrivableImpl implements Playable
 {
 
+    @Override
     public void play()
     {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
index db6c7e7..99b4782 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ToyTruckImpl.java
@@ -7,6 +7,7 @@ package org.apache.tapestry5.ioc.internal.util;
 public class ToyTruckImpl extends PlayableImpl implements Drivable, ToyTruck
 {
 
+    @Override
     public void playDrive()
     {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
index 4f19aaf..c086280 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
@@ -47,46 +47,55 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
         paramMap.put(NAME, new TapestryDocTaglet());
     }
 
+    @Override
     public boolean inField()
     {
         return false;
     }
 
+    @Override
     public boolean inConstructor()
     {
         return false;
     }
 
+    @Override
     public boolean inMethod()
     {
         return false;
     }
 
+    @Override
     public boolean inOverview()
     {
         return false;
     }
 
+    @Override
     public boolean inPackage()
     {
         return false;
     }
 
+    @Override
     public boolean inType()
     {
         return true;
     }
 
+    @Override
     public boolean isInlineTag()
     {
         return false;
     }
 
+    @Override
     public String getName()
     {
         return NAME;
     }
 
+    @Override
     public ClassDescription getDescription(String className)
     {
         ClassDescription result = classDescriptions.get(className);
@@ -107,11 +116,13 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
         return result;
     }
 
+    @Override
     public String toString(Tag tag)
     {
         throw new IllegalStateException("toString(Tag) should not be called for a non-inline tag.");
     }
 
+    @Override
     public String toString(Tag[] tags)
     {
         if (tags.length == 0)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
index 5d6235b..d71c611 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
@@ -30,6 +30,7 @@ public class XDocStreamer
 
     private static final Runnable NO_OP = new Runnable()
     {
+        @Override
         public void run()
         {
         }
@@ -51,6 +52,7 @@ public class XDocStreamer
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
                 write("</");
@@ -77,22 +79,27 @@ public class XDocStreamer
 
         ParserState state = ParserState.IGNORING;
 
+        @Override
         public void startDTD(String name, String publicId, String systemId) throws SAXException
         {
         }
 
+        @Override
         public void endDTD() throws SAXException
         {
         }
 
+        @Override
         public void startEntity(String name) throws SAXException
         {
         }
 
+        @Override
         public void endEntity(String name) throws SAXException
         {
         }
 
+        @Override
         public void startCDATA() throws SAXException
         {
             if (state == ParserState.IGNORING)
@@ -105,6 +112,7 @@ public class XDocStreamer
 
             endElementHandlers.push(new Runnable()
             {
+                @Override
                 public void run()
                 {
                     state = ParserState.COPYING;
@@ -112,36 +120,44 @@ public class XDocStreamer
             });
         }
 
+        @Override
         public void endCDATA() throws SAXException
         {
             endElementHandlers.pop().run();
         }
 
         /** Does nothing; comments are always stripped out. */
+        @Override
         public void comment(char[] ch, int start, int length) throws SAXException
         {
         }
 
+        @Override
         public void setDocumentLocator(Locator locator)
         {
         }
 
+        @Override
         public void startDocument() throws SAXException
         {
         }
 
+        @Override
         public void endDocument() throws SAXException
         {
         }
 
+        @Override
         public void startPrefixMapping(String prefix, String uri) throws SAXException
         {
         }
 
+        @Override
         public void endPrefixMapping(String prefix) throws SAXException
         {
         }
 
+        @Override
         public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
         {
             if (state == ParserState.IGNORING)
@@ -218,11 +234,13 @@ public class XDocStreamer
             throw new RuntimeException(String.format("No '%s' attribute present.", name));
         }
 
+        @Override
         public void endElement(String uri, String localName, String qName) throws SAXException
         {
             endElementHandlers.pop().run();
         }
 
+        @Override
         public void characters(char[] ch, int start, int length) throws SAXException
         {
             try
@@ -265,14 +283,17 @@ public class XDocStreamer
             }
         }
 
+        @Override
         public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
         {
         }
 
+        @Override
         public void processingInstruction(String target, String data) throws SAXException
         {
         }
 
+        @Override
         public void skippedEntity(String name) throws SAXException
         {
         }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
index 1c31ebe..4cbc773 100644
--- a/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
+++ b/tapestry-jmx/src/main/java/org/apache/tapestry5/internal/jmx/MBeanSupportImpl.java
@@ -67,6 +67,7 @@ public class MBeanSupportImpl implements MBeanSupport
     {
         hub.addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 registryDidShutdown();
@@ -74,6 +75,7 @@ public class MBeanSupportImpl implements MBeanSupport
         });
     }
 
+    @Override
     public void register(Object bean, String name)
     {
         register(bean, toObjectName(name));
@@ -90,6 +92,7 @@ public class MBeanSupportImpl implements MBeanSupport
         }
     }
 
+    @Override
     public void register(final Object object, final ObjectName objectName)
     {
         lock.check();
@@ -110,6 +113,7 @@ public class MBeanSupportImpl implements MBeanSupport
         }
     }
 
+    @Override
     public void unregister(final ObjectName objectName)
     {
         lock.check();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
index 729d9df..770efc5 100644
--- a/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
+++ b/tapestry-jmx/src/test/java/org/example/testapp/services/SampleImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.EagerLoad;
 @EagerLoad
 public class SampleImpl implements Sample, SampleImplMBean
 {
+    @Override
     public int getSampleValue()
     {
         return 42;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
index f0f1d28..a0f58f7 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterMethodAdvice.java
@@ -32,6 +32,7 @@ public class CommitAfterMethodAdvice implements MethodAdvice
         this.manager = manager;
     }
 
+    @Override
     public void advise(final MethodInvocation invocation)
     {
     	

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
index fc9ff8a..ac84dc3 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
@@ -39,6 +39,7 @@ public class CommitAfterWorker implements ComponentClassTransformWorker2
         shared = new CommitAfterMethodAdvice(manager);
     }
 
+    @Override
     public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
     {
         for (final PlasticMethod method : plasticClass

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
index 93e493c..70793ff 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerManagerImpl.java
@@ -46,6 +46,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
     /**
      * {@inheritDoc}
      */
+    @Override
     public EntityManager getEntityManager(final String persistenceUnitName)
     {
         return getOrCreateEntityManager(persistenceUnitName);
@@ -54,6 +55,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
     /**
      * {@inheritDoc}
      */
+    @Override
     public Map<String, EntityManager> getEntityManagers()
     {
         createAllEntityManagers();
@@ -83,6 +85,7 @@ public class EntityManagerManagerImpl implements EntityManagerManager, ThreadCle
         return em;
     }
 
+    @Override
     public void threadDidCleanup()
     {
         for (final Entry<String, EntityManager> next : entityManagers.entrySet())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
index e3ced6d..bb2f9ae 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerObjectProvider.java
@@ -29,6 +29,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
 
     private EntityManager proxy;
 
+    @Override
     public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
                          final ObjectLocator locator)
     {
@@ -51,6 +52,7 @@ public class EntityManagerObjectProvider implements ObjectProvider
 
             proxy = proxyFactory.createProxy(EntityManager.class, new ObjectCreator()
             {
+                @Override
                 public Object createObject()
                 {
                     final EntityManagerManager entityManagerManager = objectLocator

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
index 39da3c4..f7aa979 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
@@ -78,6 +78,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
     {
         hub.addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 registryDidShutdown();
@@ -89,12 +90,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
     {
         final List<String> affectedUnits = F.flow(persistenceUnitInfos).filter(new Predicate<TapestryPersistenceUnitInfo>()
         {
+            @Override
             public boolean accept(TapestryPersistenceUnitInfo info)
             {
                 return !info.excludeUnlistedClasses();
             }
         }).map(new Mapper<TapestryPersistenceUnitInfo, String>()
         {
+            @Override
             public String map(TapestryPersistenceUnitInfo info)
             {
                 return info.getPersistenceUnitName();
@@ -176,6 +179,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
     /**
      * {@inheritDoc}
      */
+    @Override
     public EntityManagerFactory getEntityManagerFactory(final String persistenceUnitName)
     {
         EntityManagerFactory emf = entityManagerFactories.get(persistenceUnitName);
@@ -245,6 +249,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
     private PersistenceProvider findPersistenceProviderByName(final List<PersistenceProvider> providers, final String providerClassName)
     {
         PersistenceProvider provider = F.flow(providers).filter(new Predicate<PersistenceProvider>() {
+            @Override
             public boolean accept(PersistenceProvider next) {
                 return next.getClass().getName().equals(providerClassName);
             }
@@ -263,12 +268,14 @@ public class EntityManagerSourceImpl implements EntityManagerSource
     private List<Class> toProviderClasses(final List<PersistenceProvider> providers)
     {
        return F.flow(providers).map(new Mapper<PersistenceProvider, Class>() {
+           @Override
            public Class map(PersistenceProvider element) {
                return element.getClass();
            }
        }).toList();
     }
 
+    @Override
     public EntityManager create(final String persistenceUnitName)
     {
         return getEntityManagerFactory(persistenceUnitName).createEntityManager();
@@ -296,6 +303,7 @@ public class EntityManagerSourceImpl implements EntityManagerSource
 
     }
 
+    @Override
     public List<PersistenceUnitInfo> getPersistenceUnitInfos()
     {
         return Collections.<PersistenceUnitInfo>unmodifiableList(persistenceUnitInfos);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
index ad4abef..a74b93b 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
@@ -27,6 +27,7 @@ public class JpaTransactionAdvisorImpl implements JpaTransactionAdvisor
         this.manager = manager;
     }
 
+    @Override
     public void addTransactionCommitAdvice(final MethodAdviceReceiver receiver)
     {
     	receiver.adviseAllMethods(new CommitAfterMethodAdvice(manager));

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
index d60c9b3..a250203 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaValueEncoder.java
@@ -63,6 +63,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toClient(final E value)
     {
         if (value == null)
@@ -81,6 +82,7 @@ public class JpaValueEncoder<E> implements ValueEncoder<E>
     /**
      * {@inheritDoc}
      */
+    @Override
     public E toValue(final String clientValue)
     {
         if (InternalUtils.isBlank(clientValue))

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
index 5d0e90f..f85d598 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PackageNamePersistenceUnitConfigurer.java
@@ -35,6 +35,7 @@ public class PackageNamePersistenceUnitConfigurer implements PersistenceUnitConf
     /**
      * {@inheritDoc}
      */
+    @Override
     public void configure(TapestryPersistenceUnitInfo unitInfo)
     {
         for (String packageName : packageManager.getPackageNames())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
index e53eacf..9dcf8c9 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
@@ -54,26 +54,32 @@ public class PersistenceContentHandler implements ContentHandler
         return persistenceUnits;
     }
 
+    @Override
     public void setDocumentLocator(final Locator locator)
     {
     }
 
+    @Override
     public void startDocument() throws SAXException
     {
     }
 
+    @Override
     public void endDocument() throws SAXException
     {
     }
 
+    @Override
     public void startPrefixMapping(final String prefix, final String uri) throws SAXException
     {
     }
 
+    @Override
     public void endPrefixMapping(final String prefix) throws SAXException
     {
     }
 
+    @Override
     public void startElement(final String namespaceURI, final String localName, final String qName,
                              final Attributes atts) throws SAXException
     {
@@ -101,6 +107,7 @@ public class PersistenceContentHandler implements ContentHandler
         }
     }
 
+    @Override
     public void endElement(final String namespaceURI, final String localName, final String qName)
             throws SAXException
     {
@@ -156,6 +163,7 @@ public class PersistenceContentHandler implements ContentHandler
         }
     }
 
+    @Override
     public void characters(final char[] ch, final int start, final int length) throws SAXException
     {
         final String s = new String(ch, start, length);
@@ -170,15 +178,18 @@ public class PersistenceContentHandler implements ContentHandler
 
     }
 
+    @Override
     public void ignorableWhitespace(final char[] ch, final int start, final int length)
             throws SAXException
     {
     }
 
+    @Override
     public void processingInstruction(final String target, final String data) throws SAXException
     {
     }
 
+    @Override
     public void skippedEntity(final String name) throws SAXException
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
index 5bd1bcd..e00d108 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContextWorker.java
@@ -34,6 +34,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
         this.entityManagerManager = entityManagerManager;
     }
 
+    @Override
     public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
     {
         for (final PlasticField field : plasticClass
@@ -45,6 +46,7 @@ public class PersistenceContextWorker implements ComponentClassTransformWorker2
 
             field.setConduit(new ReadOnlyComponentFieldConduit(plasticClass.getClassName(), field.getName())
             {
+                @Override
                 public Object get(Object instance, InstanceContext context)
                 {
                     return JpaInternalUtils.getEntityManager(entityManagerManager, annotation);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
index 463a4dd..a25bace 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
@@ -71,6 +71,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getPersistenceUnitName()
     {
         return persistenceUnitName;
@@ -79,6 +80,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getPersistenceProviderClassName()
     {
         return persistenceProviderClassName;
@@ -87,6 +89,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo persistenceProviderClassName(final String persistenceProviderClassName)
     {
         this.persistenceProviderClassName = persistenceProviderClassName;
@@ -97,6 +100,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public PersistenceUnitTransactionType getTransactionType()
     {
         return transactionType;
@@ -105,6 +109,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo transactionType(final PersistenceUnitTransactionType transactionType)
     {
         this.transactionType = transactionType;
@@ -115,6 +120,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public DataSource getJtaDataSource()
     {
         return jtaDataSource;
@@ -123,6 +129,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public DataSource getNonJtaDataSource()
     {
         return nonJtaDataSource;
@@ -131,6 +138,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo nonJtaDataSource(final String nonJtaDataSource)
     {
         this.nonJtaDataSource = lookupDataSource(nonJtaDataSource);
@@ -141,6 +149,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo jtaDataSource(final String jtaDataSource)
     {
         this.jtaDataSource = lookupDataSource(jtaDataSource);
@@ -151,6 +160,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getMappingFileNames()
     {
         List<String> tmp = CollectionFactory.newList(mappingFilesNames);
@@ -160,6 +170,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addMappingFileName(final String fileName)
     {
         mappingFilesNames.add(fileName);
@@ -171,6 +182,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addJarFileUrl(URL url)
     {
         jarFileUrls.add(url);
@@ -181,6 +193,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addJarFileUrl(String url)
     {
         try
@@ -196,6 +209,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addProperty(String name, String value)
     {
         getProperties().put(name, value);
@@ -207,6 +221,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo excludeUnlistedClasses(boolean exclude)
     {
         this.excludeUnlistedClasses = exclude;
@@ -217,6 +232,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<URL> getJarFileUrls()
     {
         return Collections.unmodifiableList(jarFileUrls);
@@ -225,6 +241,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public URL getPersistenceUnitRootUrl()
     {
         return getClass().getResource("/");
@@ -233,6 +250,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getManagedClassNames()
     {
         List<String> tmp = CollectionFactory.newList(managedClassNames);
@@ -242,6 +260,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addManagedClassName(final String className)
     {
         managedClassNames.add(className);
@@ -252,6 +271,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo addManagedClass(final Class<?> clazz)
     {
         addManagedClassName(clazz.getName());
@@ -262,6 +282,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean excludeUnlistedClasses()
     {
         return excludeUnlistedClasses;
@@ -270,6 +291,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public SharedCacheMode getSharedCacheMode()
     {
         return sharedCacheMode;
@@ -278,6 +300,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo sharedCacheMode(final SharedCacheMode cacheMode)
     {
         sharedCacheMode = cacheMode;
@@ -288,6 +311,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public ValidationMode getValidationMode()
     {
         return validationMode;
@@ -296,6 +320,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public TapestryPersistenceUnitInfo validationMode(final ValidationMode validationMode)
     {
         this.validationMode = validationMode;
@@ -306,6 +331,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public Properties getProperties()
     {
         return properties;
@@ -314,6 +340,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getPersistenceXMLSchemaVersion()
     {
         return persistenceXMLSchemaVersion;
@@ -327,6 +354,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getClassLoader()
     {
         return Thread.currentThread().getContextClassLoader();
@@ -335,6 +363,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addTransformer(final ClassTransformer transformer)
     {
 
@@ -343,6 +372,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
     /**
      * {@inheritDoc}
      */
+    @Override
     public ClassLoader getNewTempClassLoader()
     {
         return getClassLoader();
@@ -366,11 +396,13 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
 
     }
 
+    @Override
     public TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties) {
     	entityManagerProperties = properties;
     	return this;
     }
 
+    @Override
     public Map getEntityManagerProperties() {
     	return entityManagerProperties;
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 c572d00..040afdd 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
@@ -61,6 +61,7 @@ public class JpaGridDataSource<E> implements GridDataSource
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getAvailableRows()
     {
         final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
@@ -79,6 +80,7 @@ public class JpaGridDataSource<E> implements GridDataSource
     /**
      * {@inheritDoc}
      */
+    @Override
     public void prepare(final int startIndex, final int endIndex,
             final List<SortConstraint> sortConstraints)
     {
@@ -132,6 +134,7 @@ public class JpaGridDataSource<E> implements GridDataSource
     /**
      * {@inheritDoc}
      */
+    @Override
     public Object getRowValue(final int index)
     {
         return preparedResults.get(index - startIndex);
@@ -140,6 +143,7 @@ public class JpaGridDataSource<E> implements GridDataSource
     /**
      * {@inheritDoc}
      */
+    @Override
     public Class<E> getRowType()
     {
         return entityType;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
index acb0db9..a9c824a 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/modules/JpaModule.java
@@ -50,6 +50,7 @@ public class JpaModule
     {
         return new JpaEntityPackageManager()
         {
+            @Override
             public Collection<String> getPackageNames()
             {
                 return packageNames;
@@ -139,6 +140,7 @@ public class JpaModule
 
                 final ValueEncoderFactory factory = new ValueEncoderFactory()
                 {
+                    @Override
                     public ValueEncoder create(final Class type)
                     {
                         return new JpaValueEncoder(entity, entityManagerManager, info.getPersistenceUnitName(),

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
index 0cab6d4..e1f819f 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java
@@ -60,6 +60,7 @@ public class EntityManagerSourceImplTest extends TapestryTestCase
     {
         PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
+            @Override
             @SuppressWarnings(
                     {"unchecked", "rawtypes"})
             public void configure(TapestryPersistenceUnitInfo unitInfo)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
index cde68f9..78173c8 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
@@ -458,11 +458,13 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
         return new ReturnTypeService()
         {
 
+            @Override
             public String returnTypeMethod()
             {
                 return "Foo";
             }
 
+            @Override
             public int returnTypeMethodWithParam(final int first, final int second)
             {
                 return first + second;
@@ -486,6 +488,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
         @PersistenceContext(unitName = UNIT_NAME)
         int returnTypeMethodWithParam(int first, int second);
 
+        @Override
         String toString();
     }
 
@@ -522,6 +525,7 @@ public class JpaTransactionAdvisorImplTest extends IOCTestCase
     }
     
     public class ServiceImpl implements Service {
+    	@Override
     	@CommitAfter
     	@PersistenceContext(unitName = UNIT_NAME)
     	public void perform() 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
index 23a350c..75697ab 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManager.java
@@ -35,203 +35,243 @@ public class DummyEntityManager implements EntityManager
         
     }
     
+    @Override
     public void persist(Object entity)
     {
         
     }
 
+    @Override
     public <T> T merge(T entity)
     {
         return null;
     }
 
+    @Override
     public void remove(Object entity)
     {
         
     }
 
+    @Override
     public <T> T find(Class<T> entityClass, Object primaryKey)
     {
         return null;
     }
 
+    @Override
     public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties)
     {
         return null;
     }
 
+    @Override
     public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode)
     {
         return null;
     }
 
+    @Override
     public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode,
             Map<String, Object> properties)
     {
         return null;
     }
 
+    @Override
     public <T> T getReference(Class<T> entityClass, Object primaryKey)
     {
         return null;
     }
 
+    @Override
     public void flush()
     {
         
     }
 
+    @Override
     public void setFlushMode(FlushModeType flushMode)
     {
         
     }
 
+    @Override
     public FlushModeType getFlushMode()
     {
         return null;
     }
 
+    @Override
     public void lock(Object entity, LockModeType lockMode)
     {
         
     }
 
+    @Override
     public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
     {
         
     }
 
+    @Override
     public void refresh(Object entity)
     {
         
     }
 
+    @Override
     public void refresh(Object entity, Map<String, Object> properties)
     {
         
     }
 
+    @Override
     public void refresh(Object entity, LockModeType lockMode)
     {
         
     }
 
+    @Override
     public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties)
     {
         
     }
 
+    @Override
     public void clear()
     {
         
     }
 
+    @Override
     public void detach(Object entity)
     {
         
     }
 
+    @Override
     public boolean contains(Object entity)
     {
         return false;
     }
 
+    @Override
     public LockModeType getLockMode(Object entity)
     {
         return null;
     }
 
+    @Override
     public void setProperty(String propertyName, Object value)
     {
         
     }
 
+    @Override
     public Map<String, Object> getProperties()
     {
         return null;
     }
 
+    @Override
     public Query createQuery(String qlString)
     {
         return null;
     }
 
+    @Override
     public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery)
     {
         return null;
     }
 
+    @Override
     public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass)
     {
         return null;
     }
 
+    @Override
     public Query createNamedQuery(String name)
     {
         return null;
     }
 
+    @Override
     public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass)
     {
         return null;
     }
 
+    @Override
     public Query createNativeQuery(String sqlString)
     {
         return null;
     }
 
+    @Override
     @SuppressWarnings("rawtypes")
     public Query createNativeQuery(String sqlString, Class resultClass)
     {
         return null;
     }
 
+    @Override
     public Query createNativeQuery(String sqlString, String resultSetMapping)
     {
         return null;
     }
 
+    @Override
     public void joinTransaction()
     {
         
     }
 
+    @Override
     public <T> T unwrap(Class<T> cls)
     {
         return null;
     }
 
+    @Override
     public Object getDelegate()
     {
         return null;
     }
 
+    @Override
     public void close()
     {
         
     }
 
+    @Override
     public boolean isOpen()
     {
         return false;
     }
 
+    @Override
     public EntityTransaction getTransaction()
     {
         return null;
     }
 
+    @Override
     public EntityManagerFactory getEntityManagerFactory()
     {
         return null;
     }
 
+    @Override
     public CriteriaBuilder getCriteriaBuilder()
     {
         return null;
     }
 
+    @Override
     public Metamodel getMetamodel()
     {
         return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
index 395686c..f4ab8da 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyEntityManagerFactory.java
@@ -24,47 +24,56 @@ import java.util.Map;
 
 final class DummyEntityManagerFactory implements EntityManagerFactory
 {
+    @Override
     public boolean isOpen()
     {
         return false;
     }
 
+    @Override
     public Map<String, Object> getProperties()
     {
         return null;
     }
 
+    @Override
     public PersistenceUnitUtil getPersistenceUnitUtil()
     {
         return null;
     }
 
+    @Override
     public Metamodel getMetamodel()
     {
         return null;
     }
 
+    @Override
     public CriteriaBuilder getCriteriaBuilder()
     {
         return null;
     }
 
+    @Override
     public Cache getCache()
     {
         return null;
     }
 
+    @Override
     @SuppressWarnings("rawtypes")
     public EntityManager createEntityManager(Map map)
     {
         return new DummyEntityManager();
     }
 
+    @Override
     public EntityManager createEntityManager()
     {
         return new DummyEntityManager();
     }
 
+    @Override
     public void close()
     {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
index 796aed4..723b677 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/DummyPersistenceProvider.java
@@ -23,16 +23,19 @@ import java.util.Map;
 @SuppressWarnings("rawtypes")
 public class DummyPersistenceProvider implements PersistenceProvider
 {
+    @Override
     public EntityManagerFactory createEntityManagerFactory(String emName, Map map)
     {
         return new DummyEntityManagerFactory();
     }
 
+    @Override
     public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map)
     {
         return new DummyEntityManagerFactory();
     }
 
+    @Override
     public ProviderUtil getProviderUtil()
     {
         return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
index 6713f5c..926d803 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
     {
         final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
+            @Override
             public void configure(final TapestryPersistenceUnitInfo unitInfo)
             {
                 unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
 
         final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
         {
+            @Override
             public void configure(final TapestryPersistenceUnitInfo unitInfo)
             {
                 unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
index ee2a564..ae2bf8b 100644
--- a/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app1/services/impl/UserDAOImpl.java
@@ -30,11 +30,13 @@ public class UserDAOImpl implements UserDAO
     @PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
     private EntityManager entityManager;
 
+    @Override
     public void add(final User user)
     {
         entityManager.persist(user);
     }
 
+    @Override
     @SuppressWarnings(
     { "unchecked" })
     public List<User> findAll()
@@ -42,12 +44,14 @@ public class UserDAOImpl implements UserDAO
         return entityManager.createQuery("select u from User u order by u.id desc").getResultList();
     }
 
+    @Override
     public void delete(final User... users)
     {
         for (final User user : users)
             entityManager.remove(user);
     }
 
+    @Override
     public void deleteAll()
     {
         for (final User u : findAll())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
index 9df4186..c8ee8e8 100644
--- a/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app2/services/impl/UserDAOImpl.java
@@ -10,6 +10,7 @@ public class UserDAOImpl implements UserDAO
     @Inject
     private EntityManager entityManager;
 
+    @Override
     public void persist(Object entity)
     {
         entityManager.persist(entity);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
index f0c47de..22a6e63 100644
--- a/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app3/services/AppModule.java
@@ -43,6 +43,7 @@ public class AppModule
 
         final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
+            @Override
             public void configure(final TapestryPersistenceUnitInfo unitInfo)
             {
                 unitInfo.nonJtaDataSource("jdbc/JPATest")

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
index 23221d4..05d2488 100644
--- a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
@@ -37,11 +37,13 @@ public class AppModule
         PersistenceProviderResolverHolder.setPersistenceProviderResolver(
                 new PersistenceProviderResolver()
                 {
+                    @Override
                     public List<PersistenceProvider> getPersistenceProviders()
                     {
                         return Arrays.<PersistenceProvider>asList(new DummyPersistenceProvider(), new org.eclipse.persistence.jpa.PersistenceProvider());
                     }
 
+                    @Override
                     public void clearCachedProviders()
                     {
                     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
index 3973ec3..3883b54 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/AppModule.java
@@ -54,6 +54,7 @@ public class AppModule
     {
         final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
         {
+            @Override
             public void configure(final TapestryPersistenceUnitInfo unitInfo)
             {
                 unitInfo.addManagedClass(User.class);
@@ -63,6 +64,7 @@ public class AppModule
 
         final PersistenceUnitConfigurer configurer2 = new PersistenceUnitConfigurer()
         {
+            @Override
             public void configure(final TapestryPersistenceUnitInfo unitInfo)
             {
                 unitInfo.addProperty("javax.persistence.jdbc.driver", "org.h2.Driver")

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
index 98f7b6e..cff6e2c 100644
--- a/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
+++ b/tapestry-jpa/src/test/java/org/example/app6/services/impl/UserDAOImpl.java
@@ -31,6 +31,7 @@ public class UserDAOImpl implements UserDAO
     @PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
     private EntityManager entityManager;
 
+    @Override
     @CommitAfter
     @PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
     public void add(final User user)
@@ -38,6 +39,7 @@ public class UserDAOImpl implements UserDAO
         entityManager.persist(user);
     }
 
+    @Override
     @SuppressWarnings(
     { "unchecked" })
     public List<User> findAll()
@@ -46,6 +48,7 @@ public class UserDAOImpl implements UserDAO
 		return resultList;
     }
 
+    @Override
     @CommitAfter
     @PersistenceContext(unitName = AppConstants.TEST_PERSISTENCE_UNIT)
     public void delete(final User... users)
@@ -54,6 +57,7 @@ public class UserDAOImpl implements UserDAO
             entityManager.remove(user);
     }
 
+    @Override
     public void deleteAll()
     {
         for (final User u : findAll())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
index 3c58779..71602a0 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONArray.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONArray;
  * @since 5.3
  */
 public class StringToJSONArray implements Coercion<String,JSONArray> {
+    @Override
     public JSONArray coerce(String input) {
         return new JSONArray(input);
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
index 0ffb2c3..faf1f1f 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/internal/json/StringToJSONObject.java
@@ -21,6 +21,7 @@ import org.apache.tapestry5.json.JSONObject;
  * @since 5.3
  */
 public class StringToJSONObject  implements Coercion<String,JSONObject> {
+    @Override
     public JSONObject coerce(String input) {
         return new JSONObject(input);
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
index 563d17e..8eced69 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/CompactSession.java
@@ -30,21 +30,25 @@ class CompactSession implements JSONPrintSession
         this.writer = writer;
     }
 
+    @Override
     public JSONPrintSession indent()
     {
         return this;
     }
 
+    @Override
     public JSONPrintSession newline()
     {
         return this;
     }
 
+    @Override
     public JSONPrintSession outdent()
     {
         return this;
     }
 
+    @Override
     public JSONPrintSession print(String value)
     {
         writer.print(value);
@@ -52,11 +56,13 @@ class CompactSession implements JSONPrintSession
         return this;
     }
 
+    @Override
     public JSONPrintSession printQuoted(String value)
     {
         return print(JSONObject.quote(value));
     }
 
+    @Override
     public JSONPrintSession printSymbol(char symbol)
     {
         writer.print(symbol);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 055ae43..b679bc7 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
@@ -117,6 +117,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
         return new JSONArray().putAll(iterable);
     }
 
+    @Override
     public Iterator<Object> iterator()
     {
         return list.iterator();
@@ -446,6 +447,7 @@ public final class JSONArray extends JSONCollection implements Iterable<Object>
         return list.equals(other.list);
     }
 
+    @Override
     void print(JSONPrintSession session)
     {
         session.printSymbol('[');

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
index 8627134..a1e3b21 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONLiteral.java
@@ -43,6 +43,7 @@ public class JSONLiteral implements JSONString, Serializable
         return text;
     }
 
+    @Override
     public String toJSONString()
     {
         return text;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 c8dd777..8c42bc4 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
@@ -126,6 +126,7 @@ public final class JSONObject extends JSONCollection
             return "null";
         }
 
+        @Override
         public String toJSONString()
         {
             return "null";
@@ -871,6 +872,7 @@ public final class JSONObject extends JSONCollection
      *
      * @since 5.2.0
      */
+    @Override
     void print(JSONPrintSession session)
     {
         session.printSymbol('{');

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
----------------------------------------------------------------------
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
index 6316fbd..c371993 100644
--- a/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
+++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/PrettyPrintSession.java
@@ -54,6 +54,7 @@ class PrettyPrintSession implements JSONPrintSession
         this.indentString = indentString;
     }
 
+    @Override
     public JSONPrintSession indent()
     {
         indentLevel++;
@@ -61,6 +62,7 @@ class PrettyPrintSession implements JSONPrintSession
         return this;
     }
 
+    @Override
     public JSONPrintSession newline()
     {
         if (position != Position.MARGIN)
@@ -72,6 +74,7 @@ class PrettyPrintSession implements JSONPrintSession
         return this;
     }
 
+    @Override
     public JSONPrintSession outdent()
     {
         indentLevel--;
@@ -105,6 +108,7 @@ class PrettyPrintSession implements JSONPrintSession
         addSep();
     }
 
+    @Override
     public JSONPrintSession print(String value)
     {
         prepareToPrint();
@@ -116,11 +120,13 @@ class PrettyPrintSession implements JSONPrintSession
         return this;
     }
 
+    @Override
     public JSONPrintSession printQuoted(String value)
     {
         return print(JSONObject.quote(value));
     }
 
+    @Override
     public JSONPrintSession printSymbol(char symbol)
     {
         addIndentation();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
index 820439a..c7f3016 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaDataTypeAnalyzer.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.services.DataTypeAnalyzer;
 
 public class KaptchaDataTypeAnalyzer implements DataTypeAnalyzer
 {
+    @Override
     public String identifyDataType(PropertyAdapter adapter)
     {
         final Kaptcha annotation = adapter.getAnnotation(Kaptcha.class);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
index d61e3c4..cdeae23 100644
--- a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
+++ b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/internal/services/KaptchaProducerImpl.java
@@ -42,21 +42,25 @@ public class KaptchaProducerImpl implements KaptchaProducer
         width = config.getWidth();
     }
 
+    @Override
     public int getHeight()
     {
         return height;
     }
 
+    @Override
     public int getWidth()
     {
         return width;
     }
 
+    @Override
     public BufferedImage createImage(String text)
     {
         return producer.createImage(text);
     }
 
+    @Override
     public String createText()
     {
         return producer.createText();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
index b141291..463e0ff 100644
--- a/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
+++ b/tapestry-kaptcha/src/test/java/kaptcha/demo/services/AppModule.java
@@ -41,21 +41,25 @@ public class AppModule
         return new KaptchaProducer()
         {
 
+            @Override
             public int getWidth()
             {
                 return producer.getWidth();
             }
 
+            @Override
             public int getHeight()
             {
                 return producer.getHeight();
             }
 
+            @Override
             public BufferedImage createImage(String text)
             {
                 return producer.createImage(text);
             }
 
+            @Override
             public String createText()
             {
                 logger.info(String.format("Kaptcha text: '%s'", producer.createText()));

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
index a87ec7b..4138528 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
@@ -84,6 +84,7 @@ public class Jetty7Runner implements ServletContainerRunner
     }
 
     /** Immediately shuts down the server instance. */
+    @Override
     public void stop()
     {
         System.out.printf("Stopping Jetty instance on port %d/%d\n", port, sslPort);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
----------------------------------------------------------------------
diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
index 3367a15..03a4e9b 100644
--- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
+++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/Tomcat6Runner.java
@@ -104,6 +104,7 @@ public class Tomcat6Runner implements ServletContainerRunner
     /**
      * Immediately shuts down the server instance.
      */
+    @Override
     public void stop()
     {
         System.out.printf("Stopping Tomcat instance on port %d/%d\n", port, sslPort);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
index cce8095..4af153e 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringBeanServiceDef.java
@@ -35,15 +35,18 @@ public class SpringBeanServiceDef implements ServiceDef2
         this.context = context;
     }
 
+    @Override
     public boolean isPreventDecoration()
     {
         return true;
     }
 
+    @Override
     public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
     {
         return new ObjectCreator()
         {
+            @Override
             public Object createObject()
             {
                 return context.getBean(beanName);
@@ -57,26 +60,31 @@ public class SpringBeanServiceDef implements ServiceDef2
         };
     }
 
+    @Override
     public String getServiceId()
     {
         return beanName;
     }
 
+    @Override
     public Set<Class> getMarkers()
     {
         return Collections.emptySet();
     }
 
+    @Override
     public Class getServiceInterface()
     {
         return context.getType(beanName);
     }
 
+    @Override
     public String getServiceScope()
     {
         return ScopeConstants.DEFAULT;
     }
 
+    @Override
     public boolean isEagerLoad()
     {
         return false;