diff --git a/app/src/main/java/org/apache/roller/RollerException.java b/app/src/main/java/org/apache/roller/RollerException.java
index f6bbd1e7ff..6ff0f33160 100644
--- a/app/src/main/java/org/apache/roller/RollerException.java
+++ b/app/src/main/java/org/apache/roller/RollerException.java
@@ -100,6 +100,7 @@ public String getRootCauseMessage() {
      * Print stack trace for exception and for root cause exception if there is one.
      * @see java.lang.Throwable#printStackTrace()
      */
+    @Override
     public void printStackTrace() {
         super.printStackTrace();
         if (mRootCause != null) {
@@ -113,6 +114,7 @@ public void printStackTrace() {
      * Print stack trace for exception and for root cause exception if there is one.
      * @param s Stream to print to.
      */
+    @Override
     public void printStackTrace(PrintStream s) {
         super.printStackTrace(s);
         if (mRootCause != null) {
@@ -126,6 +128,7 @@ public void printStackTrace(PrintStream s) {
      * Print stack trace for exception and for root cause exception if there is one.
      * @param s Writer to write to.
      */
+    @Override
     public void printStackTrace(PrintWriter s) {
         super.printStackTrace(s);
         if (null != mRootCause) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java b/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
index d0b85d9a47..91768a9d82 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
@@ -117,6 +117,7 @@ public String getWeblogEntryURL(Weblog weblog,
     /**
      * Get url for a collection of entries on a given weblog.
      */
+    @Override
     public String getWeblogCollectionURL(Weblog weblog,
                                                       String locale,
                                                       String category,
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
index 0cc005d7f6..b76ec5b6f8 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
@@ -97,13 +97,15 @@ public void flush() throws WebloggerException {
     }
 
     
+    @Override
     public void release() {
         super.release();
         // tell JPA to close down
         this.strategy.release();
     }
 
-    
+
+    @Override
     public void shutdown() {
         // do our own shutdown first
         this.release();
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java b/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
index 7659ff52a7..ad7b13c662 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
@@ -78,6 +78,7 @@ public void init() throws WebloggerException {
         this.init(PingQueueTask.NAME);
     }
 
+    @Override
     public void init(String name) throws WebloggerException {
         super.init(name);
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
index 098d9f905a..b99683f750 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
@@ -56,6 +56,7 @@ public ContinuousWorkerThread(String id, Job job, long sleep) {
      *
      * If we ever get interrupted then we quit.
      */
+    @Override
     public void run() {
         
         mLogger.info(this.id+" Started.");
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
index 8ef02e4f23..e254abdbba 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
@@ -75,6 +75,7 @@ public void init() throws WebloggerException {
         this.init(ResetHitCountsTask.NAME);
     }
 
+    @Override
     public void init(String name) throws WebloggerException {
         super.init(name);
         
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java b/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
index 6675c0fa01..ae64d7a433 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
@@ -59,6 +59,7 @@ public WorkerThread(String id, Job job) {
      *
      * We just execute the job we were given if it's non-null.
      */
+    @Override
     public void run() {
         
         // we only run once
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
index e1dce1c70a..b6cef109d0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
@@ -35,6 +35,7 @@ public WriteToIndexOperation(IndexManagerImpl mgr) {
     private static Log mLogger =
             LogFactory.getFactory().getInstance(WriteToIndexOperation.class);
     
+    @Override
     public void run() {
         try {
             manager.getReadWriteLock().writeLock().lock();
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java b/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
index 367516ba64..2645badf21 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
@@ -32,6 +32,7 @@ public class PlanetURLStrategy extends MultiPlanetURLStrategy {
      * Get URL configured for Planet.
      * @param planet There's only one planet in Roller, so this is ignored.
      */
+    @Override
     public String getPlanetURL(String planet) {
         StringBuilder url = new StringBuilder();
         url.append(WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
@@ -45,6 +46,7 @@ public String getPlanetURL(String planet) {
      * @param group   Handle of planet group (or null for default group).
      * @param pageNum Page number of results to return.
      */
+    @Override
     public String getPlanetGroupURL(String planet, String group, int pageNum) {
 
         StringBuilder url = new StringBuilder();
@@ -73,6 +75,7 @@ public String getPlanetGroupURL(String planet, String group, int pageNum) {
      * @param group Handle of planet group (or null for default group).
      * @param format  Feed format to be returned (ignored, currently only RSS is supported).
      */
+    @Override
     public String getPlanetGroupFeedURL(String planet, String group, String format) {
         
         StringBuilder url = new StringBuilder();
@@ -95,6 +98,7 @@ public String getPlanetGroupFeedURL(String planet, String group, String format)
      * @param planet There's only one planet in Roller, so this is ignored.
      * @param group Handle of planet group.
      */
+    @Override
     public String getPlanetGroupOpmlURL(String planet, String group) {
         return null;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java b/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
index 358e492631..85f1985987 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
@@ -90,6 +90,7 @@ public void init() throws WebloggerException {
         this.init(RefreshRollerPlanetTask.NAME);
     }
 
+    @Override
     public void init(String name) throws WebloggerException {
         super.init(name);
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
index d110e694f0..d3f8ede6b4 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
@@ -64,6 +64,7 @@ public PlanetConfig() {
     }
     
     
+    @Override
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
@@ -97,7 +98,8 @@ public void myPrepare() {
         }
     }
 
-    
+
+    @Override
     public String execute() {
         return INPUT;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
index 26586d0f15..7d6ed549e3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
@@ -105,6 +105,7 @@ static PlanetGroup getGroupFromRequest(HttpServletRequest request, Planet planet
     /**
      * Populate page model and forward to subscription page
      */
+    @Override
     public String execute() {
         return LIST;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
index ee3dff9d7f..3140b97bd6 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
@@ -58,6 +58,7 @@ public void setServletRequest(HttpServletRequest request) {
     /**
      * Show planet groups page.
      */
+    @Override
     public String execute() {
         return LIST;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java b/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
index ed909a883c..2c9ed1ce58 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
@@ -136,6 +136,7 @@ private boolean actionImplies(String action1, String action2) {
         return action1.equals(ADMIN) || (action1.equals(WEBLOG) && action2.equals(LOGIN));
     }
     
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("GlobalPermission: ");
diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
index fa643d32f7..6126b54b7c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
@@ -115,6 +115,7 @@ public boolean implies(Permission perm) {
         return false;
     }
     
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("GlobalPermission: ");
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/CmaRollerContext.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/CmaRollerContext.java
index 7d9f85fc97..3e2d544987 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/CmaRollerContext.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/CmaRollerContext.java
@@ -36,6 +36,7 @@ public CmaRollerContext() {
     /**
      * Setup Spring Security features.
      */
+    @Override
     protected void initializeSecurityFeatures(ServletContext context) { 
         // no need to setup Spring Security
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
index b4862dd3b3..3946e753f2 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
@@ -93,6 +93,7 @@ public static ServletContext getServletContext() {
     /**
      * Responds to app-init event and triggers startup procedures.
      */
+    @Override
     public void contextInitialized(ServletContextEvent sce) {
 
         // First, initialize everything that requires no database
@@ -194,6 +195,7 @@ public void contextInitialized(ServletContextEvent sce) {
     /**
      * Responds to app-destroy event and triggers shutdown sequence.
      */
+    @Override
     public void contextDestroyed(ServletContextEvent sce) {
         WebloggerFactory.getWeblogger().shutdown();
         // do we need a more generic mechanism for presentation layer shutdown?
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
index 968845c9b7..79e4c5e9f9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
@@ -122,12 +122,14 @@ public static RollerSession getRollerSession(HttpServletRequest request) {
     
     
     /** Create session's Roller instance */
+    @Override
     public void sessionCreated(HttpSessionEvent se) {
         RollerSession rollerSession = new RollerSession();
         se.getSession().setAttribute(ROLLER_SESSION, rollerSession);
     }
-    
-    
+
+
+    @Override
     public void sessionDestroyed(HttpSessionEvent se) {
         clearSession(se);
     }
@@ -144,6 +146,7 @@ public void sessionDidActivate(HttpSessionEvent se) {
      * to call it when sessions are saved and then restored at some later
      * point in time.
      */
+    @Override
     public void sessionWillPassivate(HttpSessionEvent se) {
         clearSession(se);
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
index 979b1181fa..790e4b98e1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
@@ -81,9 +81,11 @@ private boolean isInstallUrl(String uri) {
     }
     
     
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         context = filterConfig.getServletContext();
     }
-    
+
+    @Override
     public void destroy() {}    
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
index ea01e3f3ec..eae80f8a5e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
@@ -46,12 +46,14 @@ public class CharEncodingFilter implements Filter {
     /**
      * init
      */
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
     
     /**
      * destroy
      */
+    @Override
     public void destroy() {
     }
     
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
index c2834be6d4..263cd53eec 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
@@ -69,10 +69,10 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
         log.info("");
     }
     
-    
+    @Override
     public void destroy() {}
     
-    
+    @Override
     public void init(FilterConfig filterConfig) {}
     
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/IPBanFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/IPBanFilter.java
index 6caa1a6be1..2ceda14c91 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/IPBanFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/IPBanFilter.java
@@ -42,6 +42,7 @@ public class IPBanFilter implements Filter {
     private static Log log = LogFactory.getLog(IPBanFilter.class);
     
     
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         
         log.info("INIT IPBanFilter");
@@ -64,7 +65,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
         }
     }
     
-    
+    @Override
     public void destroy() {}
     
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
index 2ae29e76a6..294b1518ea 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
@@ -79,9 +79,11 @@ private String getAbsoluteUrl(HttpServletRequest request) {
                 request.getRequestURI(), request.getRequestURL().toString());
     }
 
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
 
+    @Override
     public void destroy() {
     }
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
index 543c8edbf8..d96ad69b0b 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
@@ -44,11 +44,11 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         chain.doFilter(request, response);
     }
  
-    //@Override
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
  
-    //@Override
+    @Override
     public void destroy() {
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
index ab24515270..354424c30a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
@@ -68,8 +68,10 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
     }
     
     
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {}
     
+    @Override
     public void destroy() {}
     
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/RoleAssignmentFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/RoleAssignmentFilter.java
index 410033e83c..d663b97cec 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/RoleAssignmentFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/RoleAssignmentFilter.java
@@ -56,9 +56,11 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
     }
     
     
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {}
     
-    public void destroy() {}    
+    @Override
+    public void destroy() {}
 }
 
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
index a6ac2de10f..502aea649e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
@@ -74,6 +74,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
         chain.doFilter(request, response);
     }
 
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
 
         // Construct our list of ignored urls
@@ -84,6 +85,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
         }
     }
 
+    @Override
     public void destroy() {
     }
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
index ec705183a2..ca765af17a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
@@ -54,6 +54,7 @@ public RollerRememberMeServices() {
      *
      * If LDAP is enabled then a configurable dummy password is used in the calculation.
      */
+    @Override
     protected String makeTokenSignature(long tokenExpiryTime, String username, String password) {
 
         boolean usingLDAP = WebloggerConfig.getAuthMethod() == AuthMethod.LDAP;
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
index 18f876ed2a..543a20f45c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
@@ -57,6 +57,7 @@ public BigWeblogCalendarModel(WeblogPageRequest pRequest, String cat) {
     }
     
     
+    @Override
     protected void loadWeblogEntries(Date startDate, Date endDate, String catName) {
         try {
             WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
@@ -75,6 +76,7 @@ protected void loadWeblogEntries(Date startDate, Date endDate, String catName) {
     }
     
     
+    @Override
     public String getContent(Date day) {
         String content = null;
         try {
@@ -136,6 +138,7 @@ public String getContent(Date day) {
      * @param alwaysURL        Always return a URL, never return null
      * @return URL for day, or null if no weblog entry on that day
      */
+    @Override
     public String computeUrl(Date day, boolean nextPrevMonthURL, boolean alwaysURL) {
         String url = null;
         // get the 8 char YYYYMMDD datestring for day, returns null
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
index 0a5cf4adbb..a9d6f64d36 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
@@ -356,11 +356,13 @@ public String emit() {
         return toString();
     }
     
+    @Override
     public int doStartTag() throws JspException {
         return doStartTag( new PrintWriter( pageContext.getOut(), true) );
     }
     
-    
+
+    @Override
     public int doEndTag() throws JspException {
         return doEndTag( new PrintWriter( pageContext.getOut(), true) );
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
index 153586f70c..18fe7ea13a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
@@ -49,6 +49,7 @@ public class RequestMappingFilter implements Filter {
     // list of RequestMappers that want to inspect the request
     private final List<RequestMapper> requestMappers = new ArrayList<RequestMapper>();
     
+    @Override
     public void init(FilterConfig filterConfig) {
         
         // lookup set of request mappers we are going to use
@@ -134,7 +135,8 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
         log.debug("exiting");
     }
     
-    
+
+    @Override
     public void destroy() {}
     
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
index ab0d2537b0..bf4eaeda3e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
@@ -159,6 +159,7 @@ public FeedEntriesPager(WeblogFeedRequest feedRequest) {
             this.feedRequest = feedRequest;
         }
         
+        @Override
         protected String createURL(String url, Map params) {
             List tags = feedRequest.getTags();
             if(tags != null && tags.size() > 0) {
@@ -174,6 +175,7 @@ protected String createURL(String url, Map params) {
             return super.createURL(url, params);
         }
         
+        @Override
         public String getUrl() {
             return createURL(super.getUrl(), new HashMap());
         }
@@ -191,6 +193,7 @@ public FeedCommentsPager(WeblogFeedRequest feedRequest) {
             this.feedRequest = feedRequest;
         }
         
+        @Override
         protected String createURL(String url, Map params) {
             List tags = feedRequest.getTags();
             if(tags != null && tags.size() > 0) {
@@ -206,6 +209,7 @@ protected String createURL(String url, Map params) {
             return super.createURL(url, params);
         }
         
+        @Override
         public String getUrl() {
             return createURL(super.getUrl(), new HashMap());
         }
@@ -223,6 +227,7 @@ public FeedFilesPager(WeblogFeedRequest feedRequest) {
             this.feedRequest = feedRequest;
         }
         
+        @Override
         protected String createURL(String url, Map params) {
             List tags = feedRequest.getTags();
             if(tags != null && tags.size() > 0) {
@@ -238,6 +243,7 @@ protected String createURL(String url, Map params) {
             return super.createURL(url, params);
         }
         
+        @Override
         public String getUrl() {
             return createURL(super.getUrl(), new HashMap());
         }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
index f627c136dc..f9873db1cf 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
@@ -42,6 +42,7 @@ public class PreviewPageModel extends PageModel {
     /** 
      * Init model.
      */
+    @Override
     public void init(Map initData) throws WebloggerException {
         
         // we expect the init data to contain a weblogRequest object
@@ -69,12 +70,14 @@ public void init(Map initData) throws WebloggerException {
     }    
     
     
+    @Override
     public boolean isPermalink() {
         return (previewRequest.getPreviewEntry() != null ||
                 previewRequest.getWeblogAnchor() != null);
     }
     
     
+    @Override
     public WeblogEntryWrapper getWeblogEntry() {
         
         if(previewRequest.getPreviewEntry() != null ||
@@ -90,6 +93,7 @@ public WeblogEntryWrapper getWeblogEntry() {
      * pager for preview pages which can display things that we don't want
      * available on the "live" weblog, like DRAFT entries.
      */
+    @Override
     public WeblogEntriesPager getWeblogEntriesPager(String catArgument) {
         
         String anchor = previewRequest.getPreviewEntry();
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
index 30390008f0..f2392b69c8 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
@@ -37,6 +37,7 @@ public class PreviewURLModel extends URLModel {
     private URLStrategy urlStrategy = null;
     
     
+    @Override
     public void init(Map initData) throws WebloggerException {
         
         // need a weblog request so that we can know the weblog and locale
@@ -71,6 +72,7 @@ public void init(Map initData) throws WebloggerException {
      * knowing what theme you are previewing and thus couldn't find the
      * resources for that theme.
      */
+    @Override
     public String resource(String filePath) {
         return urlStrategy.getWeblogResourceURL(weblog, filePath, true);
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
index a4c9470a2d..1796b3cbc4 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
@@ -78,6 +78,7 @@ public class SearchResultsModel extends PageModel {
 	private boolean websiteSpecificSearch = true;
 	private String errorMessage = null;
 
+	@Override
 	public void init(Map initData) throws WebloggerException {
 
 		// we expect the init data to contain a searchRequest object
@@ -152,16 +153,19 @@ public void init(Map initData) throws WebloggerException {
 	/**
 	 * Is this page showing search results?
 	 */
+	@Override
 	public boolean isSearchResults() {
 		return true;
 	}
 
 	// override page model and return search results pager
+	@Override
 	public WeblogEntriesPager getWeblogEntriesPager() {
 		return pager;
 	}
 
 	// override page model and return search results pager
+	@Override
 	public WeblogEntriesPager getWeblogEntriesPager(String category) {
 		return pager;
 	}
@@ -285,6 +289,7 @@ public String getWeblogCategoryName() {
 		return searchRequest.getWeblogCategoryName();
 	}
 
+	@Override
 	public WeblogCategoryWrapper getWeblogCategory() {
 		if (searchRequest.getWeblogCategory() != null) {
 			return WeblogCategoryWrapper.wrap(
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
index b706154c72..1ab1402f14 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
@@ -126,6 +126,7 @@ public List<WeblogEntryCommentWrapper> getItems() {
     }
     
     
+    @Override
     public boolean hasMoreItems() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
index 151f0c32d2..2fc48cf4bc 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
@@ -80,6 +80,7 @@ public List<MediaFile> getItems() {
     }
     
     
+    @Override
     public boolean hasMoreItems() {
         return false;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
index fdaaf72af4..b8d91bc5bb 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
@@ -125,7 +125,8 @@ public List<SubscriptionEntry> getItems() {
         return entries;
     }
     
-    
+
+    @Override
     public boolean hasMoreItems() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
index 5599d40c47..4b97e943eb 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
@@ -84,18 +84,22 @@ public List getItems() {
         return this.entries;
     }
     
+    @Override
     public boolean hasMoreItems() {
         return this.moreResults;
     }
     
+    @Override
     public String getHomeLink() {
         return urlStrategy.getWeblogURL(weblog, weblog.getLocale(), false);
     }
 
+    @Override
     public String getHomeName() {
         return messageUtils.getString("searchPager.home");
     }  
     
+    @Override
     protected String createURL(String url, Map params) {
         String category = feedRequest.getWeblogCategoryName();
         if(category != null && category.trim().length() > 0) {
@@ -115,6 +119,7 @@ protected String createURL(String url, Map params) {
         return super.createURL(url, params);
     }
     
+    @Override
     public String getUrl() {
         return createURL(url, new HashMap());
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
index 424a51f7bc..6d578ab8b9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
@@ -85,6 +85,7 @@ public UsersPager(
     }
     
     
+    @Override
     public String getNextLink() {
         // need to add letter param if it exists
         if(letter != null) {
@@ -102,6 +103,7 @@ public String getNextLink() {
     }
     
     
+    @Override
     public String getPrevLink() {
         // need to add letter param if it exists
         if(letter != null) {
@@ -157,6 +159,7 @@ public List<UserWrapper> getItems() {
     }
     
     
+    @Override
     public boolean hasMoreItems() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
index 13fbe944a3..5f57972102 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
@@ -159,16 +159,19 @@ public Map<Date, List<WeblogEntryWrapper>> getEntries() {
     }
     
     
+    @Override
     public String getHomeLink() {
         return createURL(0, 0, weblog, locale, pageLink, null, null, catName, tags);
     }
     
     
+    @Override
     public String getHomeName() {
         return messageUtils.getString("weblogEntriesPager.day.home");
     }
     
     
+    @Override
     public String getNextLink() {
         if (more) {
             return createURL(page, 1, weblog, locale, pageLink, null, dateString, catName, tags);
@@ -177,6 +180,7 @@ public String getNextLink() {
     }
     
     
+    @Override
     public String getNextName() {
         if (getNextLink() != null) {
             return messageUtils.getString("weblogEntriesPager.day.next", new Object[] {dayFormat.format(day)});
@@ -185,6 +189,7 @@ public String getNextName() {
     }
     
     
+    @Override
     public String getPrevLink() {
         if (page > 0) {
             return createURL(page, -1, weblog, locale, pageLink, null, dateString, catName, tags);
@@ -193,6 +198,7 @@ public String getPrevLink() {
     }
     
     
+    @Override
     public String getPrevName() {
         if (getPrevLink() != null) {
             return messageUtils.getString("weblogEntriesPager.day.prev", new Object[] {dayFormat.format(day)});
@@ -200,7 +206,8 @@ public String getPrevName() {
         return null;
     }
     
-    
+
+    @Override
     public String getNextCollectionLink() {
         if (nextDay != null) {
             String next = DateUtil.format8chars(nextDay, weblog.getTimeZoneInstance());
@@ -210,6 +217,7 @@ public String getNextCollectionLink() {
     }
     
     
+    @Override
     public String getNextCollectionName() {
         if (nextDay != null) {
             return messageUtils.getString("weblogEntriesPager.day.nextCollection", new Object[] {dayFormat.format(nextDay)});
@@ -218,6 +226,7 @@ public String getNextCollectionName() {
     }
     
     
+    @Override
     public String getPrevCollectionLink() {
         if (prevDay != null) {
             String prev = DateUtil.format8chars(prevDay, weblog.getTimeZoneInstance());
@@ -227,6 +236,7 @@ public String getPrevCollectionLink() {
     }
     
     
+    @Override
     public String getPrevCollectionName() {
         if (prevDay != null) {
             return messageUtils.getString("weblogEntriesPager.day.prevCollection", new Object[] {dayFormat.format(prevDay)});
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
index 82d8b7e474..2e7a257470 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
@@ -110,6 +110,7 @@ public Map<Date, List<WeblogEntryWrapper>> getEntries() {
     }
     
     
+    @Override
     public boolean hasMoreEntries() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
index d9b5798c4f..1fe31831f3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
@@ -140,6 +140,7 @@ public List<WeblogEntryWrapper> getItems() {
     }
     
     
+    @Override
     public boolean hasMoreItems() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
index f0cf037504..3979761f4c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
@@ -147,16 +147,19 @@ public Map<Date, List<WeblogEntryWrapper>> getEntries() {
     }
     
     
+    @Override
     public String getHomeLink() {
         return createURL(0, 0, weblog, locale, pageLink, null, null, catName, tags);
     }
     
     
+    @Override
     public String getHomeName() {
         return messageUtils.getString("weblogEntriesPager.month.home");
     }
     
     
+    @Override
     public String getNextLink() {
         if (more) {
             return createURL(page, 1, weblog, locale, pageLink, null, dateString, catName, tags);
@@ -165,6 +168,7 @@ public String getNextLink() {
     }
     
     
+    @Override
     public String getNextName() {
         if (getNextLink() != null) {
             return messageUtils.getString("weblogEntriesPager.month.next", new Object[] {monthFormat.format(month)});
@@ -173,6 +177,7 @@ public String getNextName() {
     }
     
     
+    @Override
     public String getPrevLink() {
         if (offset > 0) {
             return createURL(page, -1, weblog, locale, pageLink, null, dateString, catName, tags);
@@ -181,6 +186,7 @@ public String getPrevLink() {
     }
     
     
+    @Override
     public String getPrevName() {
         if (getPrevLink() != null) {
             return messageUtils.getString("weblogEntriesPager.month.prev", new Object[] {monthFormat.format(month)});
@@ -189,6 +195,7 @@ public String getPrevName() {
     }
     
     
+    @Override
     public String getNextCollectionLink() {
         if (nextMonth != null) {
             String next = DateUtil.format6chars(nextMonth, weblog.getTimeZoneInstance());
@@ -198,6 +205,7 @@ public String getNextCollectionLink() {
     }
     
     
+    @Override
     public String getNextCollectionName() {
         if (nextMonth != null) {
             return messageUtils.getString("weblogEntriesPager.month.nextCollection", new Object[] {monthFormat.format(nextMonth)});
@@ -205,7 +213,8 @@ public String getNextCollectionName() {
         return null;
     }
     
-    
+
+    @Override
     public String getPrevCollectionLink() {
         if (prevMonth != null) {
             String prev = DateUtil.format6chars(prevMonth, weblog.getTimeZoneInstance());
@@ -215,6 +224,7 @@ public String getPrevCollectionLink() {
     }
     
     
+    @Override
     public String getPrevCollectionName() {
         if (prevMonth != null) {
             return messageUtils.getString("weblogEntriesPager.month.prevCollection", new Object[] {monthFormat.format(prevMonth)});
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
index d7bfa3d9d0..79f1613a9a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
@@ -90,16 +90,19 @@ public Map getEntries() {
     }
     
     
+    @Override
     public String getHomeLink() {
         return createURL(0, 0, weblog, locale, pageLink, null, dateString, catName, tags);
     }
     
     
+    @Override
     public String getHomeName() {
         return messageUtils.getString("weblogEntriesPager.single.home");
     }
     
     
+    @Override
     public String getNextLink() {
         if (getNextEntry() != null) {
             return createURL(0, 0, weblog, locale, pageLink, nextEntry.getAnchor(), dateString, catName, tags);
@@ -108,6 +111,7 @@ public String getNextLink() {
     }
     
     
+    @Override
     public String getNextName() {
         if (getNextEntry() != null) {
             String title = Utilities.truncateNicely(getNextEntry().getTitle(), 15, 20, "...");
@@ -117,6 +121,7 @@ public String getNextName() {
     }
     
     
+    @Override
     public String getPrevLink() {
         if (getPrevEntry() != null) {
             return createURL(0, 0, weblog, locale, pageLink, prevEntry.getAnchor(), dateString, catName, tags);
@@ -125,6 +130,7 @@ public String getPrevLink() {
     }
     
     
+    @Override
     public String getPrevName() {
         if (getPrevEntry() != null) {
             String title = Utilities.truncateNicely(getPrevEntry().getTitle(), 15, 20, "...");
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
index 17897b40d5..118430df31 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
@@ -61,6 +61,7 @@ public WeblogEntriesPreviewPager(
     }
     
     
+    @Override
     public Map getEntries() {
         if (entries == null) {
             try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
index a3339ae3e7..82d2edef5e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
@@ -90,6 +90,7 @@ public WeblogsPager(
     }
     
     
+    @Override
     public String getNextLink() {
         // need to add letter param if it exists
         if(letter != null) {
@@ -107,6 +108,7 @@ public String getNextLink() {
     }
     
     
+    @Override
     public String getPrevLink() {
         // need to add letter param if it exists
         if(letter != null) {
@@ -169,6 +171,7 @@ public List<WeblogWrapper> getItems() {
     }
     
     
+    @Override
     public boolean hasMoreItems() {
         return more;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
index 09672b8c76..b54836a1d9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
@@ -51,6 +51,7 @@ public class CommentAuthenticatorServlet extends HttpServlet {
      *
      * We only handle get requests.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
         throws IOException, ServletException {
 
@@ -69,6 +70,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
     /** 
      * Initialization.
      */
+    @Override
     public void init(ServletConfig config) throws ServletException {
         
         super.init(config);
@@ -90,6 +92,7 @@ public void init(ServletConfig config) throws ServletException {
     /** 
      * Destruction.
      */
+    @Override
     public void destroy() {}
     
 }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
index a701810641..5516399c80 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
@@ -64,6 +64,7 @@ public class FeedServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
 
         super.init(servletConfig);
@@ -81,6 +82,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog feeds.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
index eb3356d3ca..713e4c2d17 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
@@ -50,6 +50,7 @@ public class MediaResourceServlet extends HttpServlet {
 
     private static Log log = LogFactory.getLog(MediaResourceServlet.class);
 
+    @Override
     public void init(ServletConfig config) throws ServletException {
 
         super.init(config);
@@ -60,6 +61,7 @@ public void init(ServletConfig config) throws ServletException {
     /**
      * Handles requests for user uploaded media file resources.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
index 7be6b92307..bffffb998c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
@@ -83,6 +83,7 @@ public class PageServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
 
         super.init(servletConfig);
@@ -128,6 +129,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog pages.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
@@ -553,6 +555,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
      * want to revisit this approach in the future and see if we can do this in
      * a different way, but for now this is the easy way.
      */
+    @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
index 45f0668dab..6494e24efc 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
@@ -60,6 +60,7 @@ public class PlanetFeedServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
 
         super.init(servletConfig);
@@ -72,6 +73,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog pages.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
index eb85f0eaff..d0f6a8fc9d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
@@ -54,6 +54,7 @@ public class PreviewResourceServlet extends HttpServlet {
 
     private ServletContext context = null;
 
+    @Override
     public void init(ServletConfig config) throws ServletException {
 
         super.init(config);
@@ -66,6 +67,7 @@ public void init(ServletConfig config) throws ServletException {
     /**
      * Handles requests for user uploaded resources.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
index 0405c63e95..54dca836b7 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
@@ -65,6 +65,7 @@ public class PreviewServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
         
         super.init(servletConfig);
@@ -76,6 +77,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog pages.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
index ce7f5e4bf4..5c154ee48c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
@@ -58,6 +58,7 @@ public class RSDServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
 
         super.init(servletConfig);
@@ -68,6 +69,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog pages.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
index ebf918d884..e4f1f3843e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
@@ -54,6 +54,7 @@ public class ResourceServlet extends HttpServlet {
 
     private ServletContext context = null;
 
+    @Override
     public void init(ServletConfig config) throws ServletException {
 
         super.init(config);
@@ -66,6 +67,7 @@ public void init(ServletConfig config) throws ServletException {
     /**
      * Handles requests for user uploaded resources.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
index c1b32895a5..79c441f585 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
@@ -67,6 +67,7 @@ public class SearchServlet extends HttpServlet {
     /**
      * Init method for this servlet
      */
+    @Override
     public void init(ServletConfig servletConfig) throws ServletException {
 
         super.init(servletConfig);
@@ -80,6 +81,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
     /**
      * Handle GET requests for weblog pages.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
index dcd0303c71..2b43a4e755 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
@@ -59,6 +59,7 @@ public class TrackbackServlet extends HttpServlet {
     private CommentValidationManager commentValidationManager = null;
     
 
+    @Override
     public void init(ServletConfig config) throws ServletException {
         commentValidationManager = new CommentValidationManager();
         
@@ -72,6 +73,7 @@ public void init(ServletConfig config) throws ServletException {
      *
      * The TrackbackServlet does not support GET requests, it's a 404.
      */
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws IOException, ServletException {
         
@@ -84,6 +86,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
      *
      * Here we handle incoming trackback posts.
      */
+    @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
index facdd08677..ee94984aea 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
@@ -90,6 +90,7 @@ public void setResourceId(String resourceId) {
         this.resourceId = resourceId;
     }
             
+    @Override
     protected boolean isLocale(String potentialLocale) {
         // We don't support locales in the resource Servlet so we've got to 
         // keep parent from treating upload sub-directory name as a locale.
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
index 3fb228010f..5df599d4ea 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
@@ -76,6 +76,7 @@ public WeblogPreviewRequest(HttpServletRequest request)
     }
     
     
+    @Override
     boolean isValidDestination(String servlet) {
         return (servlet != null && PREVIEW_SERVLET.equals(servlet));
     }
@@ -90,11 +91,13 @@ public void setThemeName(String theme) {
     }
     
     // override so that previews never show login status
+    @Override
     public String getAuthenticUser() {
         return null;
     }
     
     // override so that previews never show login status
+    @Override
     public boolean isLoggedIn() {
         return false;
     }
@@ -128,6 +131,7 @@ public void setPreviewEntry(String previewEntry) {
     }
     
     // if we have a preview entry we would prefer to return that
+    @Override
     public WeblogEntry getWeblogEntry() {
         
         if(weblogEntry == null && 
@@ -149,6 +153,7 @@ public WeblogEntry getWeblogEntry() {
         return weblogEntry;
     }
     
+    @Override
     public void setWeblogEntry(WeblogEntry weblogEntry) {
         this.weblogEntry = weblogEntry;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
index 1d4c40e58c..d689d2c8fa 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
@@ -71,11 +71,13 @@ public void setThemeName(String theme) {
     }
     
     // override so that previews never show login status
+    @Override
     public String getAuthenticUser() {
         return null;
     }
     
     // override so that previews never show login status
+    @Override
     public boolean isLoggedIn() {
         return false;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
index 0cc52f40f2..c91c264155 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
@@ -96,6 +96,7 @@ public void setResourcePath(String resourcePath) {
         this.resourcePath = resourcePath;
     }
             
+    @Override
     protected boolean isLocale(String potentialLocale) {
         // We don't support locales in the resource Servlet so we've got to 
         // keep parent from treating upload sub-directory name as a locale.
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java
index e75f2661fe..920ab6c77a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java
@@ -47,21 +47,25 @@ public CacheInfo() {
     }
     
     
+    @Override
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
     
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
     
     
+    @Override
     public void myPrepare() {
         Map cacheStats = CacheManager.getStats();
         setStats(cacheStats);
     }
     
     
+    @Override
     public String execute() {
         return SUCCESS;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
index 750a8f1490..5beb89ae0f 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
@@ -85,11 +85,13 @@ public GlobalCommentManagement() {
     
     
     // admin role required
+    @Override
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
     
     // no weblog required
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
@@ -159,6 +161,7 @@ private String buildBaseUrl() {
     
     
     // show comment management page
+    @Override
     public String execute() {
         
         // load list of comments from query
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
index fb7dd4b92d..148dbc9625 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java
@@ -52,10 +52,12 @@ public void setPageTitle(String pageTitle) {
     }
 
     // no weblog required
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
 
+    @Override
     public void myPrepare() {
         PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
 
@@ -80,6 +82,7 @@ public void myPrepare() {
     /**
      * Save ping target.
      */
+    @Override
     public String execute() {
         myValidate();
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
index fa7529a8d1..c34fbc1904 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java
@@ -55,6 +55,7 @@ public PingTargets() {
     private String pingTargetId = null;
 
     // no weblog required
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
@@ -70,6 +71,7 @@ public void loadPingTargets() {
     }
 
     // prepare method needs to set ping targets list
+    @Override
     public void myPrepare() {
 
         // load list of ping targets
@@ -89,6 +91,7 @@ public void myPrepare() {
     /**
      * Display the ping targets.
      */
+    @Override
     public String execute() {
         return LIST;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
index 29b0e2416e..53c0daa60a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
@@ -44,17 +44,20 @@ public UserAdmin() {
 
     private AuthMethod authMethod = WebloggerConfig.getAuthMethod();
 
-    // admin role required    
+    // admin role required
+    @Override
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
     
     // no weblog required
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
 
     // show user admin search page
+    @Override
     public String execute() {
         return SUCCESS;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
index 2cb4399565..73107b9259 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
@@ -69,16 +69,19 @@ public void setPageTitle(String pageTitle) {
     }
 
     // admin role required
+    @Override
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
     
     // no weblog required
+    @Override
     public boolean isWeblogRequired() { 
         return false;
     }
 
     // prepare for action by loading user object we are modifying
+    @Override
     public void myPrepare() {
 
         if (isAdd()) {
@@ -109,6 +112,7 @@ public void myPrepare() {
      * Show admin user edit page.
      */
     @SkipValidation
+    @Override
     public String execute() {
         if (isAdd()) {
             // initial user create
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
index 75cb170c62..54f619a4e0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
@@ -49,7 +49,8 @@ public void checkAuth(HttpServletRequest request, Weblog weblog) {
      * content "hi there" will be represented as:
      *    {id : "3454545346", content : "hi there"}
      */
-    public void doGet(HttpServletRequest request, 
+    @Override
+    public void doGet(HttpServletRequest request,
                       HttpServletResponse response)
             throws ServletException, IOException {
         
@@ -88,6 +89,7 @@ public void doGet(HttpServletRequest request,
      * Accepts request with comment 'id' parameter and replaces specified
      * comment's content with the content in the request.
      */
+    @Override
     public void doPut(HttpServletRequest request,
                       HttpServletResponse response)
             throws ServletException, IOException {
@@ -132,6 +134,7 @@ public void doPut(HttpServletRequest request,
         }
     }
 
+    @Override
     public void doPost(HttpServletRequest request,
                       HttpServletResponse response)
             throws ServletException, IOException {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java
index 97bff15c67..2f4b87c414 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java
@@ -42,12 +42,14 @@
  */
 public class ThemeDataServlet extends HttpServlet {
 
+    @Override
     protected void doPost(
             HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         doGet(request, response);
     }
 
+    @Override
     public void doGet(
             HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
index c9d70564bd..b3739ce408 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
@@ -56,6 +56,7 @@ public class UserDataServlet extends HttpServlet {
     private static final long serialVersionUID = -7596671919118637768L;
     private static final int MAX_LENGTH = 50;
 
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
index 8795442dc9..e8101959d8 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
@@ -57,12 +57,14 @@ public CreateWeblog() {
     
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
     
     
     @SkipValidation
+    @Override
     public String execute() {
 
         // check if blog administrator has enabled creation of new blogs
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
index 12de2670e1..7ad0522c08 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
@@ -55,15 +55,18 @@ public class Install extends UIAction {
     private String databaseName = "Unknown";
 
 
+    @Override
     public boolean isUserRequired() {
         return false;
     }
 
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
 
 
+    @Override
     public String execute() {
 
         if (WebloggerFactory.isBootstrapped()) {
@@ -208,6 +211,7 @@ public String getDatabaseProductName() {
         return name;
     }
 
+    @Override
     public String getProp(String key) {
         // Static config only, we don't have database yet
         String value = WebloggerConfig.getProperty(key);
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
index f0fbe767f6..0cd3a83860 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
@@ -46,11 +46,13 @@ public Login() {
     }
 
     // override default security, we do not require an authenticated user
+    @Override
     public boolean isUserRequired() {
         return false;
     }
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
@@ -59,6 +61,7 @@ public String getAuthMethod() {
         return authMethod.name();
     }
 
+    @Override
     public String execute() {
         
         // set action error message if there was login error
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
index 937801875a..566db7fc9d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
@@ -50,11 +50,13 @@ public MainMenu() {
     
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
     
     
+    @Override
     public String execute() {
         
         return SUCCESS;
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java
index 6b6fa5187e..52546b647b 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java
@@ -45,12 +45,14 @@ public OAuthKeys() {
     
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
 
 
     @SkipValidation
+    @Override
     public String execute() {
         boolean flush = false;
         
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
index 37e01d5809..8f6e60fbac 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
@@ -48,12 +48,14 @@ public Profile() {
     
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
 
 
     @SkipValidation
+    @Override
     public String execute() {
         User ud = getAuthenticatedUser();
         // load up the form from the users existing profile data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
index baadc5e561..7561ce9f19 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
@@ -72,11 +72,13 @@ public Register() {
     }
     
     // override default security, we do not require an authenticated user
+    @Override
     public boolean isUserRequired() {
         return false;
     }
     
     // override default security, we do not require an action weblog
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
@@ -86,6 +88,7 @@ public String getAuthMethod() {
     }
 
     @SkipValidation
+    @Override
     public String execute() {
         
         // if registration is disabled, then don't allow registration
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
index 0cd64fbddb..00ab7e19c7 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
@@ -62,6 +62,7 @@ public boolean isWeblogRequired() {
         return false;
     }
 
+    @Override
     public String execute() {
         
         try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
index c3e56422b3..9e556504af 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
@@ -58,6 +58,7 @@ public void setPageTitle(String pageTitle) {
         this.pageTitle = pageTitle;
     }
 
+    @Override
     public void myPrepare() {
         if (StringUtils.isEmpty(bean.getId())) {
             // Create and initialize new, not-yet-saved WeblogBookmark
@@ -85,6 +86,7 @@ public void myPrepare() {
     
     
     @SkipValidation
+    @Override
     public String execute() {
         if (!isAdd()) {
             // load bean with database values during initial load
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index cc86b44509..457cefc6cb 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -67,6 +67,7 @@ public Bookmarks() {
         this.pageTitle = "bookmarksForm.rootTitle";
     }
 
+    @Override
     public void myPrepare() {
         try {
             BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
@@ -86,6 +87,7 @@ public void myPrepare() {
     /**
      * Present the bookmarks available in the folder specified by the request.
      */
+    @Override
     public String execute() {
 
         // build list of folders that the user can navigate to
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
index b225cc2541..e85a053bca 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
@@ -65,6 +65,7 @@ public BookmarksImport() {
     /**
      * Request to import bookmarks
      */
+    @Override
     public String execute() {
         return INPUT;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
index dd9389fba3..1716d1aada 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
@@ -52,6 +52,7 @@ public List<String> requiredWeblogPermissionActions() {
 		return Collections.singletonList(WeblogPermission.POST);
 	}
 
+	@Override
 	public String execute() {
 		try {
             WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
index 17dc99a758..aef58ec7fe 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
@@ -62,6 +62,7 @@ public List<String> requiredWeblogPermissionActions() {
     }
     
     
+    @Override
     public void myPrepare() {
 
         if ( isAdd() ) {
@@ -84,6 +85,7 @@ public void myPrepare() {
      * Show category form.
      */
     @SkipValidation
+    @Override
     public String execute() {
         if (!isAdd()) {
             // make sure bean is properly loaded from pojo data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
index 206e89b213..572e8f954c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
@@ -68,6 +68,7 @@ public List<String> requiredWeblogPermissionActions() {
     }
     
     
+    @Override
     public void myPrepare() {
         try {
             WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
@@ -83,6 +84,7 @@ public void myPrepare() {
     /**
      * Display the remove template confirmation.
      */
+    @Override
     public String execute() {
         try {
             // Build list of categories that the removed category's blog entries (if any) can be moved to
@@ -136,6 +138,7 @@ public String remove() {
      * 
      * @return the string
      */
+    @Override
     public String cancel() {
         return CANCEL;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
index 3aee5dfc84..331530f09d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
@@ -159,6 +159,7 @@ private String buildBaseUrl() {
             .getActionURL("comments", "/roller-ui/authoring", getActionWeblog().getHandle(), params, false);
     }
 
+    @Override
     public String execute() {
 
         // load list of comments from query
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
index 9f15e2df69..040c2a551d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
@@ -76,6 +76,7 @@ public List<String> requiredWeblogPermissionActions() {
     }
     
     
+    @Override
     public String execute() {
         
         if (log.isDebugEnabled()) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
index 02a3677fd8..40c67e39b5 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
@@ -56,6 +56,7 @@ public EntryAddWithMediaFile() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         MediaFileManager manager =
              WebloggerFactory.getWeblogger().getMediaFileManager();
@@ -134,6 +135,7 @@ public void setSelectedImages(String[] selectedImages) {
     /**
      * @return the weblog
      */
+    @Override
     public String getWeblog() {
         return weblog;
     }
@@ -141,6 +143,7 @@ public String getWeblog() {
     /**
      * @param weblog the weblog to set
      */
+    @Override
     public void setWeblog(String weblog) {
         this.weblog = weblog;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
index 9ffcb2ef0e..50bfb47470 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
@@ -91,6 +91,7 @@ public List<String> requiredWeblogPermissionActions() {
         return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
     }
 
+    @Override
     public void myPrepare() {
         if (getBean().getId() == null) {
             // Create and initialize new, not-yet-saved Weblog Entry
@@ -118,6 +119,7 @@ public void myPrepare() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         if (getActionName().equals("entryEdit")) {
             // load bean with pojo data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
index 64266edad0..5555f70423 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
@@ -53,6 +53,7 @@ public EntryRemove() {
         this.pageTitle = "weblogEdit.deleteEntry";
     }
 
+    @Override
     public void myPrepare() {
         if (getRemoveId() != null) {
             try {
@@ -65,6 +66,7 @@ public void myPrepare() {
         }
     }
 
+    @Override
     public String execute() {
         return INPUT;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
index c3658c27ff..91dc0aed51 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
@@ -64,6 +64,7 @@ public void setPageTitle(String pageTitle) {
     }
 
     // load folder to edit
+    @Override
     public void myPrepare() {
         if (StringUtils.isEmpty(bean.getId())) {
             // Create and initialize new folder but don't save yet
@@ -89,6 +90,7 @@ public void setServletResponse(HttpServletResponse httpServletResponse) {
      * Show folder edit page.
      */
     @SkipValidation
+    @Override
     public String execute() {
         if (!isAdd()) {
             // load bean with database values during initial load
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
index 8b57dd978b..63c9443ef4 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
@@ -45,6 +45,7 @@ public Maintenance() {
         this.pageTitle = "maintenance.title";
     }
 
+    @Override
     public String execute() {
         return SUCCESS;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
index d13247d8eb..2e18fffeaa 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
@@ -74,6 +74,7 @@ public MediaFileAdd() {
     /**
      * Prepares action class
      */
+    @Override
     public void myPrepare() {
         log.debug("Into myprepare");
         refreshAllDirectories();
@@ -116,6 +117,7 @@ public void myPrepare() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         return INPUT;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
index 810648ea05..76ff2dbb7c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
@@ -61,6 +61,7 @@ public MediaFileEdit() {
     /**
      * Prepares edit action.
      */
+    @Override
     public void myPrepare() {
         refreshAllDirectories();
         try {
@@ -90,6 +91,7 @@ public void myValidate() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
         try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
index 399d39ddbf..f02302139d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
@@ -59,6 +59,7 @@ public MediaFileImageChooser() {
     /**
      * Prepares view action
      */
+    @Override
     public void myPrepare() {
         refreshAllDirectories();
     }
@@ -75,6 +76,7 @@ public List<String> requiredWeblogPermissionActions() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
         try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
index df5d2e7d8b..67b91e5b2e 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
@@ -46,6 +46,7 @@ public MediaFileImageDim() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         try {
             MediaFileManager mgr = WebloggerFactory.getWeblogger().getMediaFileManager();
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
index f6801f12b8..c277a366ff 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
@@ -89,6 +89,7 @@ public MediaFileView() {
     /**
      * Prepares view action
      */
+    @Override
     public void myPrepare() {
 
         if (SIZE_FILTER_TYPES == null) {
@@ -193,6 +194,7 @@ public String fetchDirectoryContentLight() {
      * @return String The result of the action.
      */
     @SkipValidation
+    @Override
     public String execute() {
         MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
         try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
index 9f01f31e79..3d7c997486 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
@@ -48,6 +48,7 @@ public List<String> requiredWeblogPermissionActions() {
         return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
     }
 
+    @Override
     public boolean isWeblogRequired() {
         return false;
     }
@@ -55,6 +56,7 @@ public boolean isWeblogRequired() {
     /**
      * Show member resign confirmation
      */
+    @Override
     public String execute() {
         return INPUT;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
index ee89d9ad51..f2f2b7f6f5 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
@@ -58,6 +58,7 @@ public Members() {
         this.pageTitle = "memberPermissions.title";
     }
     
+    @Override
     public String execute() {
         log.debug("Showing weblog members page");
         return LIST;
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
index 46104b857b..6d589f9694 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
@@ -56,6 +56,7 @@ public MembersInvite() {
         this.pageTitle = "inviteMember.title";
     }
 
+    @Override
     public String execute() {
         
         // if group blogging is disabled then you can't change permissions
@@ -157,6 +158,7 @@ public String save() {
      * 
      * @return the string
      */
+    @Override
     public String cancel() {
         return CANCEL;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
index 737a649854..7aadf7dce5 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
@@ -75,6 +75,7 @@ public String requireWeblogPermissions() {
     }
     
     
+    @Override
     public void myPrepare() {
         
         PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
@@ -101,6 +102,7 @@ public void myPrepare() {
     /*
      * Display the common ping targets with page
      */
+    @Override
     public String execute() {
         
         // load map of enabled auto pings
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
index ce7956a4af..68da44ec52 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
@@ -90,6 +90,7 @@ public void myPrepare() {
     /**
      * Show stylesheet edit page.
      */
+    @Override
     public String execute() {
 
         if (template != null) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
index 4642808211..83ad4fc421 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
@@ -55,6 +55,7 @@ public TemplateEdit() {
         this.pageTitle = "pagesForm.title";
     }
 
+    @Override
     public void myPrepare() {
         try {
             setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getTemplate(getBean().getId()));
@@ -68,6 +69,7 @@ public void myPrepare() {
      * Show template edit page.
      */
     @SkipValidation
+    @Override
     public String execute() {
         try {
             if (getTemplate() == null) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
index 74468261de..80ae5af4d2 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
@@ -53,6 +53,7 @@ public TemplateRemove() {
         this.pageTitle = "editPages.title.removeOK";
     }
 
+    @Override
     public void myPrepare() {
         if (StringUtils.isNotEmpty(getRemoveId())) {
             try {
@@ -68,6 +69,7 @@ public void myPrepare() {
     /**
      * Display the remove template confirmation.
      */
+    @Override
     public String execute() {
         return "confirm";
     }
@@ -127,6 +129,7 @@ && getActionWeblog().getTheme().getStylesheet() != null
     }
 
 
+    @Override
     public String cancel() {
         return CANCEL;
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
index 2621d2ff14..ff92a8a70a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
@@ -64,6 +64,7 @@ public Templates() {
         this.pageTitle = "pagesForm.title";
     }
 
+    @Override
     public String execute() {
 
         // query for templates list
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
index c603fdb018..bf5a52725a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
@@ -73,6 +73,7 @@ public ThemeEdit() {
         this.pageTitle = "themeEditor.title";
     }
 
+    @Override
     public void myPrepare() {
         ThemeManager themeMgr = WebloggerFactory.getWeblogger()
                 .getThemeManager();
@@ -100,6 +101,7 @@ && getActionWeblog().getTheme().getStylesheet() != null) {
         }
     }
 
+    @Override
     public String execute() {
 
         // set theme to current value
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
index 9a7fde61d8..77688f17e9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
@@ -67,6 +67,7 @@ public WeblogConfig() {
         this.pageTitle = "websiteSettings.title";
     }
 
+    @Override
     public void myPrepare() {
         
         try {
@@ -100,6 +101,7 @@ public void myPrepare() {
     
     
     @SkipValidation
+    @Override
     public String execute() {
         
         // load bean with data from weblog
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
index b41a9ca2e5..e8d32f2170 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
@@ -43,6 +43,7 @@ public WeblogRemove() {
     /**
      * Show weblog remove confirmation.
      */
+    @Override
     public String execute() {
         return "confirm";
     }
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringTagSupport.java b/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringTagSupport.java
index 4924151a12..0286801c7d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringTagSupport.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringTagSupport.java
@@ -67,6 +67,7 @@ public void setVar(String var) {
      * evaluating the body of the tag. The evaluation 
      * is delegated to the changeString(String) method 
      */
+    @Override
     public int doEndTag() throws JspException {
 
         String text = "";
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/tags/TruncateNicelyTag.java b/app/src/main/java/org/apache/roller/weblogger/ui/tags/TruncateNicelyTag.java
index eae505dafb..3e74cfd836 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/tags/TruncateNicelyTag.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/tags/TruncateNicelyTag.java
@@ -105,6 +105,7 @@ public String changeString(String text) throws JspException {
         return truncateNicely(text, l, u, this.appendToEnd);
     }
 
+    @Override
     public void initAttributes() {
 
         this.lower = "10";
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/tags/WordWrapTag.java b/app/src/main/java/org/apache/roller/weblogger/ui/tags/WordWrapTag.java
index 71f3b51d56..030d78a0d7 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/tags/WordWrapTag.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/tags/WordWrapTag.java
@@ -138,6 +138,7 @@ public String changeString(String text) throws JspException {
         return wordWrap(text, NumberUtils.toInt(width), delimiter, split, delimiterInside);
     }
 
+    @Override
     public void initAttributes() {
         this.width = "80";
         this.delimiter = "\n";
diff --git a/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java b/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
index 383249137b..5ea22b1b65 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
@@ -160,6 +160,7 @@ public LRULinkedHashMap(int maxsize)
             this.maxsize = maxsize;
         }
 
+        @Override
         protected boolean removeEldestEntry(Map.Entry eldest)
         {
             return this.size() > this.maxsize;
diff --git a/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java b/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
index 1b4c16c9ab..6f0b927fb1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
@@ -104,6 +104,7 @@ private void extractByParsingHtml(String refererURL, String requestURL) throws I
         // Ignore inaccurate Sonar complaint about useless overriding method:
         //    http://jira.codehaus.org/browse/SONARJAVA-287
         Parser parser = (new HTMLEditorKit() {
+            @Override
             public Parser getParser() {
                 return super.getParser();
             }
@@ -254,6 +255,7 @@ private final class LinkbackCallback extends ParserCallback
          * @param pos
          *            Tag's position in file
          */
+        @Override
         public void handleStartTag(Tag tag, MutableAttributeSet atts, int pos)
         {
             if (mList.contains(tag) && !mFound)
@@ -288,6 +290,7 @@ else if (tag.equals(Tag.A))
         /**
          * Needed to handle SPAN tag.
          */
+        @Override
         public void handleSimpleTag(Tag tag, MutableAttributeSet atts, int pos)
         {
             if (mList.contains(tag) && mFound && mEnd == 0)
@@ -353,6 +356,7 @@ else if (!mRssLink.startsWith("http"))
          * @param pos
          *            Position in HTML file
          */
+        @Override
         public void handleEndTag(Tag tag, int pos)
         {
             if (mList.contains(tag) && mFound && mEnd == 0)
@@ -372,6 +376,7 @@ else if (mList.contains(tag) && !mFound)
         /**
          * Get the page title
          */
+        @Override
         public void handleText(char[] data, int pos)
         {
             if (mCurrentTag != null && mCurrentTag.equals(Tag.TITLE))
diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
index bf1df9e6d5..f2d702da3f 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
@@ -137,6 +137,7 @@ public LRULinkedHashMap(int maxsize) {
             this.maxsize = maxsize;
         }
         
+        @Override
         protected boolean removeEldestEntry(Map.Entry eldest) {
             return this.size() > this.maxsize;
         }
diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java b/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
index 8cd85f1155..39646a3737 100644
--- a/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
@@ -40,6 +40,7 @@
  */
 public class OpenSearchServlet extends HttpServlet {
     
+    @Override
     public void doGet(
             HttpServletRequest request, HttpServletResponse response) 
             throws ServletException, IOException {
diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
index e9ad619240..9d2fa31f8c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
+++ b/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
@@ -57,6 +57,7 @@ public class TagDataServlet extends HttpServlet {
     private static final int MAX = WebloggerConfig.getIntProperty("services.tagdata.max", 30);
 
     
+    @Override
     protected void doPost(
             HttpServletRequest request, HttpServletResponse response) 
             throws ServletException, IOException {
@@ -64,6 +65,7 @@ protected void doPost(
     }
 
     
+    @Override
     public void doGet(
             HttpServletRequest request, HttpServletResponse response) 
             throws ServletException, IOException {