diff --git a/src/java/org/jivesoftware/multiplexer/ClientSession.java b/src/java/org/jivesoftware/multiplexer/ClientSession.java
index 1408659..5e39edc 100644
--- a/src/java/org/jivesoftware/multiplexer/ClientSession.java
+++ b/src/java/org/jivesoftware/multiplexer/ClientSession.java
@@ -190,7 +190,8 @@
         super(serverName, connection, streamID);
     }
 
-    public String getAvailableStreamFeatures() {
+    @Override
+	public String getAvailableStreamFeatures() {
         // Offer authenticate and registration only if TLS was not required or if required
         // then the connection is already secured
         if (conn.getTlsPolicy() == Connection.TLSPolicy.required && !conn.isSecure()) {
@@ -231,7 +232,8 @@
      *
      * @param stanza the stanza sent by the server.
      */
-    public void deliver(Element stanza) {
+    @Override
+	public void deliver(Element stanza) {
         // Until session is not authenticated we need to inspect server traffic
         if (status != Session.STATUS_AUTHENTICATED) {
             String tag = stanza.getName();
@@ -259,7 +261,8 @@
         }
     }
 
-    public void close() {
+    @Override
+	public void close() {
         close(false);
     }
 
@@ -271,7 +274,8 @@
      * @param systemStopped true when the server is no longer available or the
      *        connection manager is being shutdown.
      */
-    public void close(boolean systemStopped) {
+    @Override
+	public void close(boolean systemStopped) {
         if (status != STATUS_CLOSED) {
             // Change the status to closed
             status = STATUS_CLOSED;
@@ -289,7 +293,8 @@
         }
     }
 
-    public boolean isClosed() {
+    @Override
+	public boolean isClosed() {
         return status == STATUS_CLOSED;
     }
 }
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
index f3b6437..cd73acd 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
@@ -189,7 +189,8 @@
             serverName = JiveGlobals.getXMLProperty("xmpp.domain").toLowerCase();
 
             Thread finishSetup = new Thread() {
-                public void run() {
+                @Override
+				public void run() {
                     try {
                         // Start modules
                         startModules();
@@ -741,7 +742,8 @@
         /**
          * <p>Logs the server shutdown.</p>
          */
-        public void run() {
+        @Override
+		public void run() {
             shutdownServer();
             Log.info("Connection Manager halted");
             System.err.println("Connection Manager halted");
@@ -760,7 +762,8 @@
         /**
          * <p>Shuts down the JVM after a 5 second delay.</p>
          */
-        public void run() {
+        @Override
+		public void run() {
             try {
                 Thread.sleep(5000);
                 // No matter what, we make sure it's dead
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionWorkerThread.java b/src/java/org/jivesoftware/multiplexer/ConnectionWorkerThread.java
index f316d03..5c03e12 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionWorkerThread.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionWorkerThread.java
@@ -458,7 +458,8 @@
         connection.deliver(sb.toString());
     }
 
-    public void run() {
+    @Override
+	public void run() {
         try {
             super.run();
         }
diff --git a/src/java/org/jivesoftware/multiplexer/ServerPacketReader.java b/src/java/org/jivesoftware/multiplexer/ServerPacketReader.java
index 572c7ca..0f05fd4 100644
--- a/src/java/org/jivesoftware/multiplexer/ServerPacketReader.java
+++ b/src/java/org/jivesoftware/multiplexer/ServerPacketReader.java
@@ -66,7 +66,8 @@
 
         // Create a thread that will read and store DOM Elements.
         Thread thread = new Thread("Server Packet Reader") {
-            public void run() {
+            @Override
+			public void run() {
                 while (open) {
                     Element doc;
                     try {
diff --git a/src/java/org/jivesoftware/multiplexer/ServerSurrogate.java b/src/java/org/jivesoftware/multiplexer/ServerSurrogate.java
index 7716cd2..b1a1c24 100644
--- a/src/java/org/jivesoftware/multiplexer/ServerSurrogate.java
+++ b/src/java/org/jivesoftware/multiplexer/ServerSurrogate.java
@@ -89,7 +89,8 @@
         // Start thread that will send heartbeats to the server every 30 seconds
         // to keep connections to the server open.
         Thread hearbeatThread = new Thread() {
-            public void run() {
+            @Override
+			public void run() {
                 while (true) {
                     try {
                         Thread.sleep(30000);
@@ -319,7 +320,8 @@
                     handler);
         }
 
-        protected void beforeExecute(Thread thread, Runnable task) {
+        @Override
+		protected void beforeExecute(Thread thread, Runnable task) {
             super.beforeExecute(thread, task);
             ConnectionWorkerThread workerThread = (ConnectionWorkerThread) thread;
             // Check that the worker thread is valid. This means that it has a valid connection
@@ -334,7 +336,8 @@
             }
         }
 
-        public void shutdown() {
+        @Override
+		public void shutdown() {
             // Notify the server that the connection manager is being shut down
             execute(new Runnable() {
                 public void run() {
diff --git a/src/java/org/jivesoftware/multiplexer/Session.java b/src/java/org/jivesoftware/multiplexer/Session.java
index a674933..1f964fa 100644
--- a/src/java/org/jivesoftware/multiplexer/Session.java
+++ b/src/java/org/jivesoftware/multiplexer/Session.java
@@ -179,7 +179,8 @@
 
     public abstract void deliver(Element stanza);
 
-    public String toString() {
+    @Override
+	public String toString() {
         return super.toString() + " status: " + status + " id: " + streamID;
     }
 
diff --git a/src/java/org/jivesoftware/multiplexer/StreamError.java b/src/java/org/jivesoftware/multiplexer/StreamError.java
index 6b126c0..dbf4741 100644
--- a/src/java/org/jivesoftware/multiplexer/StreamError.java
+++ b/src/java/org/jivesoftware/multiplexer/StreamError.java
@@ -208,7 +208,8 @@
         return element.asXML();
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringWriter out = new StringWriter();
         XMLWriter writer = new XMLWriter(out, OutputFormat.createPrettyPrint());
         try {
diff --git a/src/java/org/jivesoftware/multiplexer/net/ClientConnectionHandler.java b/src/java/org/jivesoftware/multiplexer/net/ClientConnectionHandler.java
index d1a7e2b..5df86eb 100644
--- a/src/java/org/jivesoftware/multiplexer/net/ClientConnectionHandler.java
+++ b/src/java/org/jivesoftware/multiplexer/net/ClientConnectionHandler.java
@@ -24,15 +24,18 @@
  */
 public class ClientConnectionHandler extends ConnectionHandler {
 
-    StanzaHandler createStanzaHandler(NIOConnection connection) throws XmlPullParserException {
+    @Override
+	StanzaHandler createStanzaHandler(NIOConnection connection) throws XmlPullParserException {
         return new ClientStanzaHandler(router, serverName, connection);
     }
 
-    NIOConnection createNIOConnection(IoSession session) {
+    @Override
+	NIOConnection createNIOConnection(IoSession session) {
         return new NIOConnection(session, new ClientFailoverDeliverer());
     }
 
-    int getMaxIdleTime() {
+    @Override
+	int getMaxIdleTime() {
         // Return 30 minuntes
         return JiveGlobals.getIntProperty("xmpp.client.idle", 30 * 60 * 1000) / 1000;
     }
diff --git a/src/java/org/jivesoftware/multiplexer/net/ClientStanzaHandler.java b/src/java/org/jivesoftware/multiplexer/net/ClientStanzaHandler.java
index 9d345e6..3ee7247 100644
--- a/src/java/org/jivesoftware/multiplexer/net/ClientStanzaHandler.java
+++ b/src/java/org/jivesoftware/multiplexer/net/ClientStanzaHandler.java
@@ -30,15 +30,18 @@
         super(router, serverName, connection);
     }
 
-    String getNamespace() {
+    @Override
+	String getNamespace() {
         return "jabber:client";
     }
 
-    boolean validateHost() {
+    @Override
+	boolean validateHost() {
         return JiveGlobals.getBooleanProperty("xmpp.client.validate.host",false);
     }
 
-    boolean createSession(String namespace, String serverName, XmlPullParser xpp, Connection connection)
+    @Override
+	boolean createSession(String namespace, String serverName, XmlPullParser xpp, Connection connection)
             throws XmlPullParserException {
         if ("jabber:client".equals(namespace)) {
             // The connected client is a regular client so create a ClientSession
diff --git a/src/java/org/jivesoftware/multiplexer/net/ConnectionHandler.java b/src/java/org/jivesoftware/multiplexer/net/ConnectionHandler.java
index b33a0c7..7b4a8c6 100644
--- a/src/java/org/jivesoftware/multiplexer/net/ConnectionHandler.java
+++ b/src/java/org/jivesoftware/multiplexer/net/ConnectionHandler.java
@@ -62,7 +62,8 @@
         }
     }
 
-    public void sessionOpened(IoSession session) throws Exception {
+    @Override
+	public void sessionOpened(IoSession session) throws Exception {
         // Create a new XML parser for the new connection. The parser will be used by the XMPPDecoder filter.
         XMLLightweightParser parser = new XMLLightweightParser(CHARSET);
         session.setAttribute(XML_PARSER, parser);
@@ -77,14 +78,16 @@
         }
     }
 
-    public void sessionClosed(IoSession session) throws Exception {
+    @Override
+	public void sessionClosed(IoSession session) throws Exception {
         // Get the connection for this session
         Connection connection = (Connection) session.getAttribute(CONNECTION);
         // Inform the connection that it was closed
         connection.close();
     }
 
-    public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+    @Override
+	public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
         // Get the connection for this session
         Connection connection = (Connection) session.getAttribute(CONNECTION);
         // Close idle connection
@@ -94,7 +97,8 @@
         connection.close();
     }
 
-    public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+    @Override
+	public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
         if (cause instanceof IOException) {
             // TODO Verify if there were packets pending to be sent and decide what to do with them
             Log.debug(cause);
@@ -108,7 +112,8 @@
         }
     }
 
-    public void messageReceived(IoSession session, Object message) throws Exception {
+    @Override
+	public void messageReceived(IoSession session, Object message) throws Exception {
         //System.out.println("RCVD: " + message);
         // Get the stanza handler for this session
         StanzaHandler handler = (StanzaHandler) session.getAttribute(HANDLER);
diff --git a/src/java/org/jivesoftware/multiplexer/net/DNSUtil.java b/src/java/org/jivesoftware/multiplexer/net/DNSUtil.java
index abb6c89..40101ad 100644
--- a/src/java/org/jivesoftware/multiplexer/net/DNSUtil.java
+++ b/src/java/org/jivesoftware/multiplexer/net/DNSUtil.java
@@ -246,7 +246,8 @@
             return port;
         }
 
-        public String toString() {
+        @Override
+		public String toString() {
             return host + ":" + port;
         }
     }
diff --git a/src/java/org/jivesoftware/multiplexer/net/MXParser.java b/src/java/org/jivesoftware/multiplexer/net/MXParser.java
index 01c3351..7fa746c 100644
--- a/src/java/org/jivesoftware/multiplexer/net/MXParser.java
+++ b/src/java/org/jivesoftware/multiplexer/net/MXParser.java
@@ -34,7 +34,8 @@
      */
     private long lastHeartbeat = 0;
 
-    protected int nextImpl()
+    @Override
+	protected int nextImpl()
         throws XmlPullParserException, IOException
     {
         text = null;
diff --git a/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java b/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
index 47dbc6c..d79224d 100644
--- a/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
+++ b/src/java/org/jivesoftware/multiplexer/net/NIOConnection.java
@@ -398,7 +398,8 @@
         this.tlsPolicy = tlsPolicy;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         return super.toString() + " MINA Session: " + ioSession;
     }
 }
diff --git a/src/java/org/jivesoftware/multiplexer/net/SSLJiveServerSocketFactory.java b/src/java/org/jivesoftware/multiplexer/net/SSLJiveServerSocketFactory.java
index 728fa60..4650b4b 100644
--- a/src/java/org/jivesoftware/multiplexer/net/SSLJiveServerSocketFactory.java
+++ b/src/java/org/jivesoftware/multiplexer/net/SSLJiveServerSocketFactory.java
@@ -63,23 +63,28 @@
         this.factory = factory;
     }
 
-    public ServerSocket createServerSocket(int i) throws IOException {
+    @Override
+	public ServerSocket createServerSocket(int i) throws IOException {
         return factory.createServerSocket(i);
     }
 
-    public ServerSocket createServerSocket(int i, int i1) throws IOException {
+    @Override
+	public ServerSocket createServerSocket(int i, int i1) throws IOException {
         return factory.createServerSocket(i, i1);
     }
 
-    public ServerSocket createServerSocket(int i, int i1, InetAddress inetAddress) throws IOException {
+    @Override
+	public ServerSocket createServerSocket(int i, int i1, InetAddress inetAddress) throws IOException {
         return factory.createServerSocket(i, i1, inetAddress);
     }
 
-    public String[] getDefaultCipherSuites() {
+    @Override
+	public String[] getDefaultCipherSuites() {
         return factory.getDefaultCipherSuites();
     }
 
-    public String[] getSupportedCipherSuites() {
+    @Override
+	public String[] getSupportedCipherSuites() {
         return factory.getSupportedCipherSuites();
     }
 }
diff --git a/src/java/org/jivesoftware/multiplexer/net/SocketConnection.java b/src/java/org/jivesoftware/multiplexer/net/SocketConnection.java
index 5f6d368..8e4244d 100644
--- a/src/java/org/jivesoftware/multiplexer/net/SocketConnection.java
+++ b/src/java/org/jivesoftware/multiplexer/net/SocketConnection.java
@@ -626,7 +626,8 @@
         writing.compareAndSet(true, false);
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         return super.toString() + " socket: " + socket;
     }
 
diff --git a/src/java/org/jivesoftware/multiplexer/net/SocketSendingTracker.java b/src/java/org/jivesoftware/multiplexer/net/SocketSendingTracker.java
index e260c56..2c7e5a2 100644
--- a/src/java/org/jivesoftware/multiplexer/net/SocketSendingTracker.java
+++ b/src/java/org/jivesoftware/multiplexer/net/SocketSendingTracker.java
@@ -67,7 +67,8 @@
     public void start() {
         shutdown = false;
         checkingThread = new Thread("SocketSendingTracker") {
-            public void run() {
+            @Override
+			public void run() {
                 while (!shutdown) {
                     checkHealth();
                     synchronized (this) {
diff --git a/src/java/org/jivesoftware/multiplexer/net/TLSStreamReader.java b/src/java/org/jivesoftware/multiplexer/net/TLSStreamReader.java
index d886b2a..322f0c3 100644
--- a/src/java/org/jivesoftware/multiplexer/net/TLSStreamReader.java
+++ b/src/java/org/jivesoftware/multiplexer/net/TLSStreamReader.java
@@ -141,6 +141,7 @@
 	 */
 	private InputStream createInputStream() {
 		return new InputStream() {
+			@Override
 			public synchronized int read() throws IOException {
 				doRead();
 				if (!inAppBB.hasRemaining()) {
@@ -149,6 +150,7 @@
 				return inAppBB.get();
 			}
 
+			@Override
 			public synchronized int read(byte[] bytes, int off, int len) throws IOException {
                 // Check if in the previous read the inAppBB ByteBuffer remained with unread data.
                 // If all the data was consumed then read from the socket channel. Otherwise,
diff --git a/src/java/org/jivesoftware/multiplexer/net/TLSStreamWriter.java b/src/java/org/jivesoftware/multiplexer/net/TLSStreamWriter.java
index 5d1bc64..101c866 100644
--- a/src/java/org/jivesoftware/multiplexer/net/TLSStreamWriter.java
+++ b/src/java/org/jivesoftware/multiplexer/net/TLSStreamWriter.java
@@ -103,6 +103,7 @@
 	 */
 	private OutputStream createOutputStream() {
 		return new OutputStream() {
+			@Override
 			public synchronized void write(int b) throws IOException {
 				outAppData.put((byte) b);
 				outAppData.flip();
@@ -110,6 +111,7 @@
 				outAppData.clear();
 			}
 
+			@Override
 			public synchronized void write(byte[] bytes, int off, int len) throws IOException {
                 outAppData = resizeApplicationBuffer(bytes.length);
                 outAppData.put(bytes, off, len);
diff --git a/src/java/org/jivesoftware/multiplexer/net/XMLSocketWriter.java b/src/java/org/jivesoftware/multiplexer/net/XMLSocketWriter.java
index e9553e6..5623040 100644
--- a/src/java/org/jivesoftware/multiplexer/net/XMLSocketWriter.java
+++ b/src/java/org/jivesoftware/multiplexer/net/XMLSocketWriter.java
@@ -35,7 +35,8 @@
      *
      * @throws IOException if an I/O error occurs while flushing the writer.
      */
-    public void flush() throws IOException {
+    @Override
+	public void flush() throws IOException {
         // Register that we have started sending data
         connection.writeStarted();
         try {
diff --git a/src/java/org/jivesoftware/multiplexer/net/XMPPDecoder.java b/src/java/org/jivesoftware/multiplexer/net/XMPPDecoder.java
index e50a916..f774267 100644
--- a/src/java/org/jivesoftware/multiplexer/net/XMPPDecoder.java
+++ b/src/java/org/jivesoftware/multiplexer/net/XMPPDecoder.java
@@ -24,7 +24,8 @@
  */
 public class XMPPDecoder extends CumulativeProtocolDecoder {
 
-    protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out)
+    @Override
+	protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out)
             throws Exception {
         // Get the XML light parser from the IoSession
         XMLLightweightParser parser = (XMLLightweightParser) session.getAttribute(ConnectionHandler.XML_PARSER);
diff --git a/src/java/org/jivesoftware/multiplexer/net/http/HttpSession.java b/src/java/org/jivesoftware/multiplexer/net/http/HttpSession.java
index 9e2a13c..93f2f0c 100644
--- a/src/java/org/jivesoftware/multiplexer/net/http/HttpSession.java
+++ b/src/java/org/jivesoftware/multiplexer/net/http/HttpSession.java
@@ -51,7 +51,8 @@
         }
         // Create xmpp parser to keep in each thread
         localParser = new ThreadLocal<XMPPPacketReader>() {
-            protected XMPPPacketReader initialValue() {
+            @Override
+			protected XMPPPacketReader initialValue() {
                 XMPPPacketReader parser = new XMPPPacketReader();
                 factory.setNamespaceAware(true);
                 parser.setXPPFactory(factory);
@@ -123,7 +124,8 @@
         return elements;
     }
 
-    public String getAvailableStreamFeatures() {
+    @Override
+	public String getAvailableStreamFeatures() {
         StringBuilder sb = new StringBuilder(200);
         for (Element element : getAvailableStreamFeaturesElements()) {
             sb.append(element.asXML());
@@ -131,11 +133,13 @@
         return sb.toString();
     }
 
-    public void close() {
+    @Override
+	public void close() {
         closeConnection();
     }
 
-    public void close(boolean isServerShuttingDown) {
+    @Override
+	public void close(boolean isServerShuttingDown) {
         closeConnection();
     }
 
@@ -144,7 +148,8 @@
      *
      * @return true if this session has been closed and no longer activley accepting connections.
      */
-    public synchronized boolean isClosed() {
+    @Override
+	public synchronized boolean isClosed() {
         return isClosed;
     }
 
@@ -742,7 +747,8 @@
         }
     }
 
-    public void deliver(Element stanza) {
+    @Override
+	public void deliver(Element stanza) {
     	// Until session is not authenticated we need to inspect server traffic
         if (status != Session.STATUS_AUTHENTICATED) {
             String tag = stanza.getName();
diff --git a/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java b/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
index cc9176d..5ce8206 100644
--- a/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/net/http/HttpSessionManager.java
@@ -346,7 +346,8 @@
 
     private class HttpSessionReaper extends TimerTask {
 
-        public void run() {
+        @Override
+		public void run() {
             long currentTime = System.currentTimeMillis();
             for (HttpSession session : sessionMap.values()) {
                 long lastActive = currentTime - session.getLastActivity();
diff --git a/src/java/org/jivesoftware/multiplexer/task/CloseSessionTask.java b/src/java/org/jivesoftware/multiplexer/task/CloseSessionTask.java
index 5131ceb..ff5d13d 100644
--- a/src/java/org/jivesoftware/multiplexer/task/CloseSessionTask.java
+++ b/src/java/org/jivesoftware/multiplexer/task/CloseSessionTask.java
@@ -31,7 +31,8 @@
         workerThread.clientSessionClosed(streamID);
     }
 
-    public void serverNotAvailable() {
+    @Override
+	public void serverNotAvailable() {
         // Do nothing;
     }
 }
\ No newline at end of file
diff --git a/src/java/org/jivesoftware/multiplexer/task/DeliveryFailedTask.java b/src/java/org/jivesoftware/multiplexer/task/DeliveryFailedTask.java
index d8c7507..74a8fae 100644
--- a/src/java/org/jivesoftware/multiplexer/task/DeliveryFailedTask.java
+++ b/src/java/org/jivesoftware/multiplexer/task/DeliveryFailedTask.java
@@ -35,7 +35,8 @@
         workerThread.deliveryFailed(stanza, streamID);
     }
 
-    public void serverNotAvailable() {
+    @Override
+	public void serverNotAvailable() {
         // Do nothing;
     }
 }
diff --git a/src/java/org/jivesoftware/multiplexer/task/NewSessionTask.java b/src/java/org/jivesoftware/multiplexer/task/NewSessionTask.java
index 87ef45a..8ffa28c 100644
--- a/src/java/org/jivesoftware/multiplexer/task/NewSessionTask.java
+++ b/src/java/org/jivesoftware/multiplexer/task/NewSessionTask.java
@@ -36,7 +36,8 @@
         workerThread.clientSessionCreated(streamID, address);
     }
 
-    public void serverNotAvailable() {
+    @Override
+	public void serverNotAvailable() {
         // Close client session indicating that the server is not available
         ClientSession.getSession(streamID).close(true);
     }
diff --git a/src/java/org/jivesoftware/multiplexer/task/RouteTask.java b/src/java/org/jivesoftware/multiplexer/task/RouteTask.java
index 4ccbd9c..00ebf3d 100644
--- a/src/java/org/jivesoftware/multiplexer/task/RouteTask.java
+++ b/src/java/org/jivesoftware/multiplexer/task/RouteTask.java
@@ -33,7 +33,8 @@
         workerThread.deliver(stanza, streamID);
     }
 
-    public void serverNotAvailable() {
+    @Override
+	public void serverNotAvailable() {
         // Close client session indicating that the server is not available
         ClientSession.getSession(streamID).close(true);
     }
diff --git a/src/java/org/jivesoftware/util/Base64.java b/src/java/org/jivesoftware/util/Base64.java
index 4c136fb..968ee3d 100644
--- a/src/java/org/jivesoftware/util/Base64.java
+++ b/src/java/org/jivesoftware/util/Base64.java
@@ -1056,6 +1056,7 @@
 		 * @return next byte
 		 * @since 1.3
 		 */
+		@Override
 		public int read() throws java.io.IOException {
 			// Do we need to get data?
 			if (position < 0) {
@@ -1176,6 +1177,7 @@
 		 * @return bytes read into array or -1 if end of stream is encountered.
 		 * @since 1.3
 		 */
+		@Override
 		public int read(byte[] dest, int off, int len)
 				throws java.io.IOException {
 			int i;
@@ -1284,6 +1286,7 @@
 		 *            the byte to write
 		 * @since 1.3
 		 */
+		@Override
 		public void write(int theByte) throws java.io.IOException {
 			// Encoding suspended?
 			if (suspendEncoding) {
@@ -1340,6 +1343,7 @@
 		 *            max number of bytes to read into array
 		 * @since 1.3
 		 */
+		@Override
 		public void write(byte[] theBytes, int off, int len)
 				throws java.io.IOException {
 			// Encoding suspended?
@@ -1377,6 +1381,7 @@
 		 * 
 		 * @since 1.3
 		 */
+		@Override
 		public void close() throws java.io.IOException {
 			// 1. Ensure that pending characters are written
 			flushBase64();
diff --git a/src/java/org/jivesoftware/util/FastDateFormat.java b/src/java/org/jivesoftware/util/FastDateFormat.java
index 8866ee0..e7118da 100644
--- a/src/java/org/jivesoftware/util/FastDateFormat.java
+++ b/src/java/org/jivesoftware/util/FastDateFormat.java
@@ -1082,11 +1082,13 @@
             mLocale = locale;
         }
 
-        public int hashCode() {
+        @Override
+		public int hashCode() {
             return mStyle * 31 + mLocale.hashCode();
         }
 
-        public boolean equals(Object obj) {
+        @Override
+		public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -1160,7 +1162,8 @@
             return ((Comparable)a).compareTo(b);
         }
 
-        public boolean equals(Object obj) {
+        @Override
+		public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -1178,13 +1181,15 @@
                  key.mObj2 == null : mObj2.equals(key.mObj2));
         }
 
-        public int hashCode() {
+        @Override
+		public int hashCode() {
             return
                 (mObj1 == null ? 0 : mObj1.hashCode()) +
                 (mObj2 == null ? 0 : mObj2.hashCode());
         }
 
-        public String toString() {
+        @Override
+		public String toString() {
             return "[" + mObj1 + ':' + mObj2 + ']';
         }
     }
diff --git a/src/java/org/jivesoftware/util/Log.java b/src/java/org/jivesoftware/util/Log.java
index bb90b6b..c74cd25 100644
--- a/src/java/org/jivesoftware/util/Log.java
+++ b/src/java/org/jivesoftware/util/Log.java
@@ -417,7 +417,8 @@
 
     private static final class JiveLogHandler extends Handler {
 
-        public void publish(LogRecord record) {
+        @Override
+		public void publish(LogRecord record) {
 
             Level level = record.getLevel();
             Throwable throwable = record.getThrown();
@@ -467,11 +468,13 @@
             }
         }
 
-        public void flush() {
+        @Override
+		public void flush() {
             // do nothing
         }
 
-        public void close() throws SecurityException {
+        @Override
+		public void close() throws SecurityException {
             // do nothing
         }
     }
diff --git a/src/java/org/jivesoftware/util/StringUtils.java b/src/java/org/jivesoftware/util/StringUtils.java
index c990a47..4ac2790 100644
--- a/src/java/org/jivesoftware/util/StringUtils.java
+++ b/src/java/org/jivesoftware/util/StringUtils.java
@@ -1117,7 +1117,8 @@
             this.maxSize = maxSize;
         }
 
-        protected boolean removeEldestEntry(Map.Entry eldest) {
+        @Override
+		protected boolean removeEldestEntry(Map.Entry eldest) {
             return size() > maxSize;
         }
     }
diff --git a/src/java/org/jivesoftware/util/TaskEngine.java b/src/java/org/jivesoftware/util/TaskEngine.java
index be5b747..3b94936 100644
--- a/src/java/org/jivesoftware/util/TaskEngine.java
+++ b/src/java/org/jivesoftware/util/TaskEngine.java
@@ -295,7 +295,8 @@
             this.task = task;
         }
 
-        public void run() {
+        @Override
+		public void run() {
             executor.submit(task);
         }
     }
diff --git a/src/java/org/jivesoftware/util/XMLWriter.java b/src/java/org/jivesoftware/util/XMLWriter.java
index 154b435..0135a42 100644
--- a/src/java/org/jivesoftware/util/XMLWriter.java
+++ b/src/java/org/jivesoftware/util/XMLWriter.java
@@ -430,13 +430,15 @@
 
     // XMLFilterImpl methods
     //-------------------------------------------------------------------------
-    public void parse(InputSource source) throws IOException, SAXException {
+    @Override
+	public void parse(InputSource source) throws IOException, SAXException {
         installLexicalHandler();
         super.parse(source);
     }
 
 
-    public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
+    @Override
+	public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
         for (int i = 0; i < LEXICAL_HANDLER_NAMES.length; i++) {
             if (LEXICAL_HANDLER_NAMES[i].equals(name)) {
                 setLexicalHandler((LexicalHandler) value);
@@ -446,7 +448,8 @@
         super.setProperty(name, value);
     }
 
-    public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+    @Override
+	public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
         for (int i = 0; i < LEXICAL_HANDLER_NAMES.length; i++) {
             if (LEXICAL_HANDLER_NAMES[i].equals(name)) {
                 return getLexicalHandler();
@@ -471,11 +474,13 @@
 
     // ContentHandler interface
     //-------------------------------------------------------------------------
-    public void setDocumentLocator(Locator locator) {
+    @Override
+	public void setDocumentLocator(Locator locator) {
         super.setDocumentLocator(locator);
     }
 
-    public void startDocument() throws SAXException {
+    @Override
+	public void startDocument() throws SAXException {
         try {
             writeDeclaration();
             super.startDocument();
@@ -485,7 +490,8 @@
         }
     }
 
-    public void endDocument() throws SAXException {
+    @Override
+	public void endDocument() throws SAXException {
         super.endDocument();
 
         if ( autoFlush ) {
@@ -495,7 +501,8 @@
         }
     }
 
-    public void startPrefixMapping(String prefix, String uri) throws SAXException {
+    @Override
+	public void startPrefixMapping(String prefix, String uri) throws SAXException {
         if ( namespacesMap == null ) {
             namespacesMap = new HashMap();
         }
@@ -503,11 +510,13 @@
         super.startPrefixMapping(prefix, uri);
     }
 
-    public void endPrefixMapping(String prefix) throws SAXException {
+    @Override
+	public void endPrefixMapping(String prefix) throws SAXException {
         super.endPrefixMapping(prefix);
     }
 
-    public void startElement(String namespaceURI, String localName, String qName, Attributes attributes) throws SAXException {
+    @Override
+	public void startElement(String namespaceURI, String localName, String qName, Attributes attributes) throws SAXException {
         try {
             charactersAdded = false;
 
@@ -528,7 +537,8 @@
         }
     }
 
-    public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
+    @Override
+	public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
         try {
             charactersAdded = false;
             --indentLevel;
@@ -555,7 +565,8 @@
         }
     }
 
-    public void characters(char[] ch, int start, int length) throws SAXException {
+    @Override
+	public void characters(char[] ch, int start, int length) throws SAXException {
         if (ch == null || ch.length == 0 || length <= 0) {
             return;
         }
@@ -602,11 +613,13 @@
         }
     }
 
-    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+    @Override
+	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
         super.ignorableWhitespace(ch, start, length);
     }
 
-    public void processingInstruction(String target, String data) throws SAXException {
+    @Override
+	public void processingInstruction(String target, String data) throws SAXException {
         try {
             indent();
             writer.write("<?");
@@ -628,11 +641,13 @@
 
     // DTDHandler interface
     //-------------------------------------------------------------------------
-    public void notationDecl(String name, String publicID, String systemID) throws SAXException {
+    @Override
+	public void notationDecl(String name, String publicID, String systemID) throws SAXException {
         super.notationDecl(name, publicID, systemID);
     }
 
-    public void unparsedEntityDecl(String name, String publicID, String systemID, String notationName) throws SAXException {
+    @Override
+	public void unparsedEntityDecl(String name, String publicID, String systemID, String notationName) throws SAXException {
         super.unparsedEntityDecl(name, publicID, systemID, notationName);
     }
 
diff --git a/src/java/org/jivesoftware/util/log/Logger.java b/src/java/org/jivesoftware/util/log/Logger.java
index fdf2d34..47da6d2 100644
--- a/src/java/org/jivesoftware/util/log/Logger.java
+++ b/src/java/org/jivesoftware/util/log/Logger.java
@@ -442,7 +442,8 @@
      *             release. When user needs to check priority it is advised
      *             that they use the is[Priority]Enabled() functions.
      */
-    public final Priority getPriority() {
+    @Deprecated
+	public final Priority getPriority() {
         return m_priority;
     }
 
@@ -454,7 +455,8 @@
      *             If you are relying on its presence then there may be
      *             something wrong with the design of your system
      */
-    public final String getCategory() {
+    @Deprecated
+	public final String getCategory() {
         return m_category;
     }
 
diff --git a/src/java/org/jivesoftware/util/log/Priority.java b/src/java/org/jivesoftware/util/log/Priority.java
index 7848442..45febd7 100644
--- a/src/java/org/jivesoftware/util/log/Priority.java
+++ b/src/java/org/jivesoftware/util/log/Priority.java
@@ -84,7 +84,8 @@
      *
      * @return the string describing priority
      */
-    public String toString() {
+    @Override
+	public String toString() {
         return "Priority[" + getName() + "/" + getValue() + "]";
     }
 
diff --git a/src/java/org/jivesoftware/util/log/filter/PriorityFilter.java b/src/java/org/jivesoftware/util/log/filter/PriorityFilter.java
index c9c8474..782bbd3 100644
--- a/src/java/org/jivesoftware/util/log/filter/PriorityFilter.java
+++ b/src/java/org/jivesoftware/util/log/filter/PriorityFilter.java
@@ -46,7 +46,8 @@
      * @param event the event
      * @return return true to discard event, false otherwise
      */
-    protected boolean filter(final LogEvent event) {
+    @Override
+	protected boolean filter(final LogEvent event) {
         return (!m_priority.isLower(event.getPriority()));
     }
 }
diff --git a/src/java/org/jivesoftware/util/log/format/ExtendedPatternFormatter.java b/src/java/org/jivesoftware/util/log/format/ExtendedPatternFormatter.java
index 3cd3369..7d38506 100644
--- a/src/java/org/jivesoftware/util/log/format/ExtendedPatternFormatter.java
+++ b/src/java/org/jivesoftware/util/log/format/ExtendedPatternFormatter.java
@@ -43,7 +43,8 @@
      * @param type the string
      * @return the type-id
      */
-    protected int getTypeIdFor(final String type) {
+    @Override
+	protected int getTypeIdFor(final String type) {
         if (type.equalsIgnoreCase(TYPE_METHOD_STR))
             return TYPE_METHOD;
         else if (type.equalsIgnoreCase(TYPE_THREAD_STR))
@@ -59,7 +60,8 @@
      * @param run the pattern run to format.
      * @return the formatted result.
      */
-    protected String formatPatternRun(final LogEvent event, final PatternRun run) {
+    @Override
+	protected String formatPatternRun(final LogEvent event, final PatternRun run) {
         switch (run.m_type) {
             case TYPE_METHOD:
                 return getMethod(event, run.m_format);
diff --git a/src/java/org/jivesoftware/util/log/format/PatternFormatter.java b/src/java/org/jivesoftware/util/log/format/PatternFormatter.java
index 0960c32..9ea1896 100644
--- a/src/java/org/jivesoftware/util/log/format/PatternFormatter.java
+++ b/src/java/org/jivesoftware/util/log/format/PatternFormatter.java
@@ -125,7 +125,8 @@
      * @deprecated Use constructor PatternFormatter(String pattern) as this does not
      *             correctly initialize object
      */
-    public PatternFormatter() {
+    @Deprecated
+	public PatternFormatter() {
     }
 
     public PatternFormatter(final String pattern) {
@@ -587,7 +588,8 @@
      * @param format the string format
      * @deprecated Parse format in via constructor rather than use this method
      */
-    public void setFormat(final String format) {
+    @Deprecated
+	public void setFormat(final String format) {
         parse(format);
     }
 }
diff --git a/src/java/org/jivesoftware/util/log/output/AbstractOutputTarget.java b/src/java/org/jivesoftware/util/log/output/AbstractOutputTarget.java
index b289146..3938a39 100644
--- a/src/java/org/jivesoftware/util/log/output/AbstractOutputTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/AbstractOutputTarget.java
@@ -41,7 +41,8 @@
      * @deprecated Access to formatter is not advised and this method will be removed
      *             in future iterations. It remains only for backwards compatability.
      */
-    public synchronized Formatter getFormatter() {
+    @Deprecated
+	public synchronized Formatter getFormatter() {
         return m_formatter;
     }
 
@@ -51,7 +52,8 @@
      * @param formatter the formatter
      * @deprecated In future this method will become protected access.
      */
-    public synchronized void setFormatter(final Formatter formatter) {
+    @Deprecated
+	public synchronized void setFormatter(final Formatter formatter) {
         writeTail();
         m_formatter = formatter;
         writeHead();
@@ -73,10 +75,12 @@
      * @deprecated User should overide send() instead of output(). Output exists
      *             for backwards compatability and will be removed in future.
      */
-    protected void output(final String data) {
+    @Deprecated
+	protected void output(final String data) {
     }
 
-    protected void doProcessEvent(LogEvent event) {
+    @Override
+	protected void doProcessEvent(LogEvent event) {
         final String data = format(event);
         write(data);
     }
@@ -84,7 +88,8 @@
     /**
      * Startup log session.
      */
-    protected synchronized void open() {
+    @Override
+	protected synchronized void open() {
         if (!isOpen()) {
             super.open();
             writeHead();
@@ -95,7 +100,8 @@
      * Shutdown target.
      * Attempting to send to target after close() will cause errors to be logged.
      */
-    public synchronized void close() {
+    @Override
+	public synchronized void close() {
         if (isOpen()) {
             writeTail();
             super.close();
diff --git a/src/java/org/jivesoftware/util/log/output/AbstractTarget.java b/src/java/org/jivesoftware/util/log/output/AbstractTarget.java
index b900c77..6e680da 100644
--- a/src/java/org/jivesoftware/util/log/output/AbstractTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/AbstractTarget.java
@@ -101,7 +101,8 @@
      * @param throwable the exception if any
      * @deprecated Use getErrorHandler().error(...) directly
      */
-    protected final void error(final String message, final Throwable throwable) {
+    @Deprecated
+	protected final void error(final String message, final Throwable throwable) {
         getErrorHandler().error(message, throwable, null);
     }
 }
diff --git a/src/java/org/jivesoftware/util/log/output/AsyncLogTarget.java b/src/java/org/jivesoftware/util/log/output/AsyncLogTarget.java
index 5106ed2..e78b6cb 100644
--- a/src/java/org/jivesoftware/util/log/output/AsyncLogTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/AsyncLogTarget.java
@@ -52,7 +52,8 @@
      *
      * @param errorHandler the errorHandler
      */
-    public synchronized void setErrorHandler(final ErrorHandler errorHandler) {
+    @Override
+	public synchronized void setErrorHandler(final ErrorHandler errorHandler) {
         super.setErrorHandler(errorHandler);
 
         if (m_logTarget instanceof ErrorAware) {
@@ -65,7 +66,8 @@
      *
      * @param event the log event
      */
-    public void doProcessEvent(final LogEvent event) {
+    @Override
+	public void doProcessEvent(final LogEvent event) {
         synchronized (m_list) {
             final int size = m_list.size();
             while (m_queueSize <= size) {
diff --git a/src/java/org/jivesoftware/util/log/output/io/StreamTarget.java b/src/java/org/jivesoftware/util/log/output/io/StreamTarget.java
index 4e5a135..1a61892 100644
--- a/src/java/org/jivesoftware/util/log/output/io/StreamTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/io/StreamTarget.java
@@ -55,7 +55,8 @@
      *
      * @param data the data to be output
      */
-    protected synchronized void write(final String data) {
+    @Override
+	protected synchronized void write(final String data) {
         //Cache method local version
         //so that can be replaced in another thread
         final OutputStream outputStream = m_outputStream;
@@ -81,7 +82,8 @@
      * Shutdown target.
      * Attempting to send to target after close() will cause errors to be logged.
      */
-    public synchronized void close() {
+    @Override
+	public synchronized void close() {
         super.close();
         shutdownStream();
     }
diff --git a/src/java/org/jivesoftware/util/log/output/io/WriterTarget.java b/src/java/org/jivesoftware/util/log/output/io/WriterTarget.java
index 75ec78a..00f1d09 100644
--- a/src/java/org/jivesoftware/util/log/output/io/WriterTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/io/WriterTarget.java
@@ -55,7 +55,8 @@
      *
      * @param data the data to output
      */
-    protected void write(final String data) {
+    @Override
+	protected void write(final String data) {
         try {
             m_output.write(data);
             m_output.flush();
@@ -69,7 +70,8 @@
      * Shutdown target.
      * Attempting to send to target after close() will cause errors to be logged.
      */
-    public synchronized void close() {
+    @Override
+	public synchronized void close() {
         super.close();
         shutdownWriter();
     }
diff --git a/src/java/org/jivesoftware/util/log/output/io/rotate/RotatingFileTarget.java b/src/java/org/jivesoftware/util/log/output/io/rotate/RotatingFileTarget.java
index 312f128..ac11f3d 100644
--- a/src/java/org/jivesoftware/util/log/output/io/rotate/RotatingFileTarget.java
+++ b/src/java/org/jivesoftware/util/log/output/io/rotate/RotatingFileTarget.java
@@ -56,7 +56,8 @@
     /**
      * Output the log message, and check if rotation is needed.
      */
-    public synchronized void write(final String data) {
+    @Override
+	public synchronized void write(final String data) {
         // send the log message
         super.write(data);
 
diff --git a/src/java/org/jivesoftware/util/log/util/LoggerOutputStream.java b/src/java/org/jivesoftware/util/log/util/LoggerOutputStream.java
index 906437e..7dd5811 100644
--- a/src/java/org/jivesoftware/util/log/util/LoggerOutputStream.java
+++ b/src/java/org/jivesoftware/util/log/util/LoggerOutputStream.java
@@ -57,7 +57,8 @@
     /**
      * Shutdown stream.
      */
-    public void close()
+    @Override
+	public void close()
             throws IOException {
         flush();
         super.close();
@@ -70,7 +71,8 @@
      * @param data the byte of data
      * @throws IOException if an error occurs
      */
-    public void write(final int data)
+    @Override
+	public void write(final int data)
             throws IOException {
         checkValid();
 
@@ -87,7 +89,8 @@
      *
      * @throws IOException if an error occurs
      */
-    public synchronized void flush()
+    @Override
+	public synchronized void flush()
             throws IOException {
         checkValid();
 
diff --git a/src/java/org/jivesoftware/util/log/util/OutputStreamLogger.java b/src/java/org/jivesoftware/util/log/util/OutputStreamLogger.java
index 92c2561..0f08962 100644
--- a/src/java/org/jivesoftware/util/log/util/OutputStreamLogger.java
+++ b/src/java/org/jivesoftware/util/log/util/OutputStreamLogger.java
@@ -26,6 +26,7 @@
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @deprecated Use LoggerOutputStream as this class was misnamed.
  */
+@Deprecated
 public class OutputStreamLogger
         extends LoggerOutputStream {
 
@@ -36,7 +37,8 @@
      * @param priority the priority at which to log
      * @deprecated Use LoggerOutputStream as this class was misnamed.
      */
-    public OutputStreamLogger(final Logger logger,
+    @Deprecated
+	public OutputStreamLogger(final Logger logger,
                               final Priority priority) {
         super(logger, priority);
     }