You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2022/06/03 10:25:40 UTC

[synapse] branch master updated: Add missing @Override annotations

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/synapse.git


The following commit(s) were added to refs/heads/master by this push:
     new 88aa9796e Add missing @Override annotations
88aa9796e is described below

commit 88aa9796e15d91962742b658d0e478299c98be20
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Fri Jun 3 11:17:30 2022 +0100

    Add missing @Override annotations
    
    This should reduce the risk of leaving dead code behind when we migrate
    to Axis2 1.8.
---
 .../beanstalk/enterprise/EnterpriseBeanstalk.java  |  1 +
 .../enterprise/EnterpriseBeanstalkManager.java     |  1 +
 .../enterprise/EnterpriseBeanstalkView.java        |  8 ++++
 .../commons/builders/XFormURLEncodedBuilder.java   |  1 +
 .../synapse/commons/datasource/DBPoolView.java     |  5 ++
 .../datasource/DataSourceRepositoryManager.java    |  3 ++
 .../datasource/DatasourceMBeanRepository.java      |  4 ++
 .../datasource/InMemoryDataSourceRepository.java   |  6 +++
 .../datasource/JNDIBasedDataSourceRepository.java  |  6 +++
 .../synapse/commons/evaluators/AndEvaluator.java   |  2 +
 .../synapse/commons/evaluators/EqualEvaluator.java |  2 +
 .../synapse/commons/evaluators/MatchEvaluator.java |  2 +
 .../synapse/commons/evaluators/NotEvaluator.java   |  2 +
 .../synapse/commons/evaluators/OrEvaluator.java    |  2 +
 .../commons/evaluators/config/AndFactory.java      |  1 +
 .../commons/evaluators/config/AndSerializer.java   |  1 +
 .../commons/evaluators/config/EqualFactory.java    |  1 +
 .../commons/evaluators/config/EqualSerializer.java |  1 +
 .../commons/evaluators/config/MatchFactory.java    |  1 +
 .../commons/evaluators/config/MatchSerializer.java |  1 +
 .../commons/evaluators/config/NotFactory.java      |  1 +
 .../commons/evaluators/config/NotSerializer.java   |  1 +
 .../commons/evaluators/config/OrFactory.java       |  1 +
 .../commons/evaluators/config/OrSerializer.java    |  1 +
 .../evaluators/source/HeaderTextRetriever.java     |  2 +
 .../evaluators/source/ParameterTextRetriever.java  |  2 +
 .../evaluators/source/PropertyTextRetriever.java   |  2 +
 .../source/SOAPEnvelopeTextRetriever.java          |  2 +
 .../evaluators/source/URLTextRetriever.java        |  2 +
 .../executors/MultiPriorityBlockingQueue.java      | 23 +++++++++
 .../commons/executors/PRRNextQueueAlgorithm.java   |  2 +
 .../commons/executors/PriorityExecutor.java        |  5 ++
 .../commons/executors/queues/FixedSizeQueue.java   | 17 +++++++
 .../commons/executors/queues/UnboundedQueue.java   | 13 +++++
 .../commons/jmx/JmxSecretAuthenticator.java        |  1 +
 .../apache/synapse/commons/jmx/ThreadingView.java  | 15 ++++++
 .../apache/synapse/commons/util/TemporaryData.java | 14 ++++++
 .../synapse/commons/executors/DummyTask.java       |  5 ++
 .../MultiPriorityBlockingQueueStressTest.java      |  2 +
 .../executors/MultiPriorityBlockingQueueTest.java  |  2 +
 .../org/apache/synapse/Axis2SynapseController.java | 13 +++++
 .../synapse/SecretManagerAdminMBeanImpl.java       |  2 +
 .../synapse/ServerConfigurationInformation.java    |  1 +
 .../java/org/apache/synapse/ServerManagerView.java |  8 ++++
 .../main/java/org/apache/synapse/ServerState.java  |  6 +++
 .../java/org/apache/synapse/SynapseServer.java     |  1 +
 .../synapse/aspects/AspectConfiguration.java       |  4 ++
 .../aspects/statistics/StatisticsRecord.java       |  1 +
 .../aspects/statistics/mbean/StatisticsView.java   |  7 +++
 .../statistics/view/InOutStatisticsView.java       |  1 +
 .../statistics/view/PerUserDomainViewStrategy.java |  2 +
 .../statistics/view/PerUserIPViewStrategy.java     |  2 +
 .../aspects/statistics/view/Statistics.java        |  1 +
 .../statistics/view/SystemViewStrategy.java        |  2 +
 .../synapse/config/AbstractSynapseObserver.java    | 16 +++++++
 .../main/java/org/apache/synapse/config/Entry.java |  2 +
 .../apache/synapse/config/SynapseConfigUtils.java  |  1 +
 .../synapse/config/SynapseConfiguration.java       |  4 ++
 .../config/xml/AbstractMediatorFactory.java        |  1 +
 .../config/xml/AbstractMediatorSerializer.java     |  1 +
 .../config/xml/AggregateMediatorFactory.java       |  2 +
 .../config/xml/AggregateMediatorSerializer.java    |  2 +
 .../xml/AnnotatedCommandMediatorFactory.java       |  2 +
 .../synapse/config/xml/AnonymousListMediator.java  |  3 +-
 .../xml/AnonymousListMediatorSerializer.java       |  2 +
 .../synapse/config/xml/BeanMediatorFactory.java    |  2 +
 .../synapse/config/xml/BeanMediatorSerializer.java |  2 +
 .../synapse/config/xml/CacheMediatorFactory.java   |  2 +
 .../config/xml/CacheMediatorSerializer.java        |  2 +
 .../synapse/config/xml/CalloutMediatorFactory.java |  2 +
 .../config/xml/CalloutMediatorSerializer.java      |  2 +
 .../synapse/config/xml/ClassMediatorFactory.java   |  2 +
 .../config/xml/ClassMediatorSerializer.java        |  2 +
 .../synapse/config/xml/CloneMediatorFactory.java   |  2 +
 .../config/xml/CloneMediatorSerializer.java        |  2 +
 .../xml/ConditionalRouterMediatorFactory.java      |  2 +
 .../xml/ConditionalRouterMediatorSerializer.java   |  2 +
 .../ConfigurationFactoryAndSerializerFinder.java   |  1 +
 .../config/xml/DBLookupMediatorFactory.java        |  2 +
 .../config/xml/DBLookupMediatorSerializer.java     |  2 +
 .../config/xml/DBReportMediatorFactory.java        |  2 +
 .../config/xml/DBReportMediatorSerializer.java     |  2 +
 .../synapse/config/xml/DropMediatorFactory.java    |  2 +
 .../synapse/config/xml/DropMediatorSerializer.java |  2 +
 .../synapse/config/xml/EJBMediatorFactory.java     |  2 +
 .../synapse/config/xml/EJBMediatorSerializer.java  |  2 +
 .../synapse/config/xml/EnqueueMediatorFactory.java |  2 +
 .../config/xml/EnqueueMediatorSerializer.java      |  2 +
 .../synapse/config/xml/EnrichMediatorFactory.java  |  1 +
 .../config/xml/EnrichMediatorSerializer.java       |  1 +
 .../apache/synapse/config/xml/EntryFactory.java    |  1 +
 .../synapse/config/xml/FaultMediatorFactory.java   |  2 +
 .../config/xml/FaultMediatorSerializer.java        |  2 +
 .../synapse/config/xml/FilterMediatorFactory.java  |  2 +
 .../config/xml/FilterMediatorSerializer.java       |  2 +
 .../synapse/config/xml/HeaderMediatorFactory.java  |  2 +
 .../config/xml/HeaderMediatorSerializer.java       |  2 +
 .../synapse/config/xml/InMediatorFactory.java      |  2 +
 .../synapse/config/xml/InMediatorSerializer.java   |  2 +
 .../synapse/config/xml/InvokeMediatorFactory.java  |  1 +
 .../config/xml/InvokeMediatorSerializer.java       |  1 +
 .../synapse/config/xml/IterateMediatorFactory.java |  2 +
 .../config/xml/IterateMediatorSerializer.java      |  2 +
 .../synapse/config/xml/LogMediatorFactory.java     |  2 +
 .../synapse/config/xml/LogMediatorSerializer.java  |  2 +
 .../config/xml/LoopbackMediatorFactory.java        |  1 +
 .../config/xml/LoopbackMediatorSerializer.java     |  1 +
 .../synapse/config/xml/MediatorFactoryFinder.java  |  1 +
 .../config/xml/MessageStoreMediatorFactory.java    |  1 +
 .../config/xml/MessageStoreMediatorSerializer.java |  1 +
 .../synapse/config/xml/OutMediatorFactory.java     |  2 +
 .../synapse/config/xml/OutMediatorSerializer.java  |  2 +
 .../config/xml/POJOCommandMediatorFactory.java     |  2 +
 .../config/xml/POJOCommandMediatorSerializer.java  |  2 +
 .../config/xml/PayloadFactoryMediatorFactory.java  |  2 +
 .../xml/PayloadFactoryMediatorSerializer.java      |  2 +
 .../config/xml/PropertyMediatorFactory.java        |  2 +
 .../config/xml/PropertyMediatorSerializer.java     |  2 +
 .../synapse/config/xml/RespondMediatorFactory.java |  1 +
 .../config/xml/RespondMediatorSerializer.java      |  2 +
 .../xml/SamplingThrottleMediatorFactory.java       |  2 +
 .../xml/SamplingThrottleMediatorSerializer.java    |  2 +
 .../synapse/config/xml/SendMediatorFactory.java    |  2 +
 .../synapse/config/xml/SendMediatorSerializer.java |  2 +
 .../config/xml/SequenceMediatorFactory.java        |  2 +
 .../config/xml/SequenceMediatorSerializer.java     |  2 +
 .../apache/synapse/config/xml/StartupFinder.java   |  1 +
 .../org/apache/synapse/config/xml/SwitchCase.java  |  2 +
 .../synapse/config/xml/SwitchMediatorFactory.java  |  2 +
 .../config/xml/SwitchMediatorSerializer.java       |  2 +
 .../synapse/config/xml/SynapseMediatorFactory.java |  2 +
 .../config/xml/SynapseMediatorSerializer.java      |  2 +
 .../config/xml/SynapseXMLConfigurationFactory.java |  3 ++
 .../xml/SynapseXMLConfigurationSerializer.java     |  2 +
 .../config/xml/TemplateMediatorFactory.java        |  2 +
 .../config/xml/TemplateMediatorSerializer.java     |  1 +
 .../config/xml/TransactionMediatorFactory.java     |  2 +
 .../config/xml/TransactionMediatorSerializer.java  |  2 +
 .../config/xml/URLRewriteMediatorFactory.java      |  2 +
 .../config/xml/URLRewriteMediatorSerializer.java   |  2 +
 .../config/xml/ValidateMediatorFactory.java        |  2 +
 .../config/xml/ValidateMediatorSerializer.java     |  2 +
 .../synapse/config/xml/XMLToTemplateMapper.java    |  1 +
 .../synapse/config/xml/XSLTMediatorFactory.java    |  2 +
 .../synapse/config/xml/XSLTMediatorSerializer.java |  2 +
 .../config/xml/endpoints/ClassEndpointFactory.java |  1 +
 .../xml/endpoints/DefaultEndpointFactory.java      |  1 +
 .../xml/endpoints/DefaultEndpointSerializer.java   |  1 +
 .../DynamicLoadbalanceEndpointFactory.java         |  1 +
 .../DynamicLoadbalanceEndpointSerializer.java      |  1 +
 .../xml/endpoints/EndpointDefinitionFactory.java   |  1 +
 .../config/xml/endpoints/EndpointFactory.java      |  1 +
 .../xml/endpoints/FailoverEndpointFactory.java     |  1 +
 .../xml/endpoints/FailoverEndpointSerializer.java  |  1 +
 .../xml/endpoints/IndirectEndpointFactory.java     |  1 +
 .../xml/endpoints/IndirectEndpointSerializer.java  |  1 +
 .../xml/endpoints/LoadbalanceEndpointFactory.java  |  1 +
 .../endpoints/LoadbalanceEndpointSerializer.java   |  1 +
 .../xml/endpoints/ResolvingEndpointFactory.java    |  1 +
 .../xml/endpoints/ResolvingEndpointSerializer.java |  1 +
 .../endpoints/SALoadbalanceEndpointFactory.java    |  1 +
 .../endpoints/SALoadbalanceEndpointSerializer.java |  1 +
 .../ServiceDynamicLoadbalanceEndpointFactory.java  |  1 +
 .../xml/endpoints/TemplateEndpointFactory.java     |  1 +
 .../xml/endpoints/TemplateEndpointSerializer.java  |  1 +
 .../config/xml/endpoints/WSDLEndpointFactory.java  |  1 +
 .../xml/endpoints/WSDLEndpointSerializer.java      |  1 +
 .../config/xml/endpoints/XMLToEndpointMapper.java  |  1 +
 .../eventing/EventPublisherMediatorFactory.java    |  2 +
 .../eventing/EventPublisherMediatorSerializer.java |  2 +
 .../apache/synapse/core/axis2/AsyncCallback.java   |  4 ++
 .../axis2/Axis2LoadBalanceMembershipHandler.java   |  6 +++
 .../synapse/core/axis2/Axis2MessageContext.java    | 55 +++++++++++++++++++++
 .../core/axis2/Axis2SynapseEnvironment.java        | 15 ++++++
 .../core/axis2/CustomURIBasedDispatcher.java       |  3 ++
 .../synapse/core/axis2/DynamicAxisOperation.java   | 12 +++--
 .../apache/synapse/core/axis2/ProxyService.java    |  4 ++
 .../core/axis2/ProxyServiceMessageReceiver.java    |  1 +
 .../axis2/ServiceLoadBalanceMembershipHandler.java |  6 +++
 .../synapse/core/axis2/SynapseAxisServlet.java     |  3 ++
 .../core/axis2/SynapseCallbackReceiver.java        |  1 +
 .../core/axis2/SynapseCallbackStoreView.java       |  2 +
 .../synapse/core/axis2/SynapseDispatcher.java      |  3 ++
 .../synapse/core/axis2/SynapseMessageReceiver.java |  1 +
 .../core/axis2/SynapseMustUnderstandHandler.java   |  1 +
 .../synapse/core/axis2/SynapseStartUpServlet.java  |  4 ++
 .../apache/synapse/core/axis2/TimeoutHandler.java  |  1 +
 .../core/relay/ServiceRequestEarlyBuilder.java     |  1 +
 .../deployers/AbstractSynapseArtifactDeployer.java |  5 ++
 .../synapse/deployers/ExtensionDeployer.java       |  5 ++
 .../synapse/deployers/LibraryArtifactDeployer.java |  8 ++++
 .../apache/synapse/endpoints/AbstractEndpoint.java | 26 ++++++++++
 .../apache/synapse/endpoints/AddressEndpoint.java  |  3 ++
 .../apache/synapse/endpoints/DefaultEndpoint.java  |  3 ++
 .../endpoints/DynamicLoadbalanceEndpoint.java      |  6 +++
 .../apache/synapse/endpoints/EndpointContext.java  |  1 +
 .../synapse/endpoints/EndpointDefinition.java      |  3 ++
 .../org/apache/synapse/endpoints/EndpointView.java | 56 ++++++++++++++++++++++
 .../apache/synapse/endpoints/FailoverEndpoint.java |  3 ++
 .../apache/synapse/endpoints/IndirectEndpoint.java |  1 +
 .../synapse/endpoints/LoadbalanceEndpoint.java     |  4 ++
 .../synapse/endpoints/RecipientListEndpoint.java   |  1 +
 .../synapse/endpoints/ResolvingEndpoint.java       |  1 +
 .../synapse/endpoints/SALoadbalanceEndpoint.java   |  3 ++
 .../ServiceDynamicLoadbalanceEndpoint.java         |  7 +++
 .../org/apache/synapse/endpoints/Template.java     |  2 +
 .../apache/synapse/endpoints/TemplateEndpoint.java |  1 +
 .../org/apache/synapse/endpoints/WSDLEndpoint.java |  3 ++
 .../synapse/endpoints/algorithms/RoundRobin.java   |  7 +++
 .../algorithms/WeightedRRLCAlgorithm.java          | 10 ++++
 .../endpoints/algorithms/WeightedRoundRobin.java   | 11 +++++
 .../algorithms/WeightedRoundRobinView.java         |  2 +
 .../endpoints/dispatch/AbstractDispatcher.java     |  1 +
 .../endpoints/dispatch/HttpSessionDispatcher.java  |  5 ++
 .../dispatch/SimpleClientSessionDispatcher.java    |  5 ++
 .../endpoints/dispatch/SoapSessionDispatcher.java  |  5 ++
 .../synapse/eventing/SynapseEventSource.java       |  2 +
 .../eventing/filters/TopicBasedEventFilter.java    |  2 +
 .../eventing/filters/XPathBasedEventFilter.java    |  2 +
 .../DefaultInMemorySubscriptionManager.java        | 15 +++++-
 .../libraries/eip/CalloutBlockMediator.java        |  3 ++
 .../libraries/eip/ContentBasedRouterMediator.java  |  1 +
 .../libraries/eip/DynamicRouterMediator.java       |  1 +
 .../synapse/libraries/model/LibraryArtifact.java   |  3 ++
 .../synapse/libraries/model/SynapseLibrary.java    | 10 ++++
 .../synapse/mediators/AbstractListMediator.java    |  9 ++++
 .../apache/synapse/mediators/AbstractMediator.java |  8 ++++
 .../synapse/mediators/GetPropertyFunction.java     |  1 +
 .../synapse/mediators/MediatorFaultHandler.java    |  1 +
 .../org/apache/synapse/mediators/MediatorLog.java  | 13 +++++
 .../apache/synapse/mediators/MediatorWorker.java   |  1 +
 .../synapse/mediators/base/SequenceMediator.java   |  3 ++
 .../synapse/mediators/base/SynapseMediator.java    |  1 +
 .../synapse/mediators/bean/BeanMediator.java       |  1 +
 .../mediators/bean/enterprise/EJBMediator.java     |  3 ++
 .../synapse/mediators/builtin/CacheMediator.java   |  3 ++
 .../synapse/mediators/builtin/CalloutMediator.java |  3 ++
 .../synapse/mediators/builtin/DropMediator.java    |  1 +
 .../synapse/mediators/builtin/EnqueueMediator.java |  1 +
 .../synapse/mediators/builtin/LogMediator.java     |  1 +
 .../mediators/builtin/LoopbackMediator.java        |  1 +
 .../mediators/builtin/PropertyMediator.java        |  2 +
 .../synapse/mediators/builtin/RespondMediator.java |  1 +
 .../synapse/mediators/builtin/SendMediator.java    |  3 ++
 .../mediators/builtin/ValidateMediator.java        |  4 ++
 .../synapse/mediators/db/AbstractDBMediator.java   |  3 ++
 .../synapse/mediators/db/DBLookupMediator.java     |  1 +
 .../synapse/mediators/db/DBReportMediator.java     |  1 +
 .../mediators/eip/aggregator/Aggregate.java        |  2 +
 .../eip/aggregator/AggregateMediator.java          |  3 ++
 .../eip/sample/SamplingThrottleMediator.java       |  3 ++
 .../eip/sample/UnboundedMessageQueue.java          |  6 +++
 .../mediators/eip/splitter/CloneMediator.java      |  3 ++
 .../mediators/eip/splitter/IterateMediator.java    |  3 ++
 .../mediators/elementary/EnrichMediator.java       |  1 +
 .../mediators/eventing/EventPublisherMediator.java |  1 +
 .../synapse/mediators/ext/ClassMediator.java       |  5 +-
 .../synapse/mediators/ext/POJOCommandMediator.java |  1 +
 .../synapse/mediators/filters/FilterMediator.java  |  2 +
 .../synapse/mediators/filters/InMediator.java      |  2 +
 .../synapse/mediators/filters/OutMediator.java     |  2 +
 .../synapse/mediators/filters/SwitchMediator.java  |  3 ++
 .../filters/router/ConditionalRouterMediator.java  |  1 +
 .../mediators/store/MessageStoreMediator.java      |  1 +
 .../synapse/mediators/template/InvokeMediator.java |  1 +
 .../mediators/template/TemplateMediator.java       |  1 +
 .../mediators/transaction/TransactionMediator.java |  1 +
 .../synapse/mediators/transform/FaultMediator.java |  1 +
 .../mediators/transform/HeaderMediator.java        |  1 +
 .../transform/PayloadFactoryMediator.java          |  1 +
 .../synapse/mediators/transform/XSLTMediator.java  |  4 ++
 .../transform/url/URLRewriteMediator.java          |  1 +
 .../processors/AbstractMessageProcessor.java       | 14 ++++++
 .../processors/ScheduledMessageProcessor.java      |  5 ++
 .../message/processors/forward/ForwardingJob.java  |  1 +
 .../forward/MessageForwardingProcessorView.java    | 10 ++++
 .../processors/resequence/ResequencingJob.java     |  1 +
 .../message/processors/sampler/SamplingJob.java    |  2 +
 .../processors/sampler/SamplingProcessorView.java  |  3 ++
 .../message/store/AbstractMessageStore.java        | 13 +++++
 .../message/store/InMemoryMessageStore.java        | 10 ++++
 .../synapse/message/store/MessageStoreView.java    |  5 ++
 .../synapse/metrics/GlobalRequestCountHandler.java |  1 +
 .../synapse/metrics/MetricsAggregatorModule.java   |  5 ++
 .../apache/synapse/registry/AbstractRegistry.java  |  5 ++
 .../apache/synapse/registry/RegistryEntryImpl.java |  9 ++++
 .../synapse/registry/url/SimpleURLRegistry.java    |  9 ++++
 .../src/main/java/org/apache/synapse/rest/API.java |  4 ++
 .../java/org/apache/synapse/rest/Resource.java     |  3 ++
 .../synapse/rest/dispatch/DefaultDispatcher.java   |  1 +
 .../rest/dispatch/URITemplateBasedDispatcher.java  |  1 +
 .../synapse/rest/dispatch/URITemplateHelper.java   |  1 +
 .../rest/dispatch/URLMappingBasedDispatcher.java   |  1 +
 .../synapse/rest/dispatch/URLMappingHelper.java    |  1 +
 .../rest/version/AbstractVersionStrategy.java      |  2 +
 .../synapse/rest/version/DefaultStrategy.java      |  2 +
 .../rest/version/URLBasedVersionStrategy.java      |  2 +
 .../apache/synapse/startup/AbstractStartup.java    |  6 +++
 .../synapse/startup/quartz/SimpleQuartz.java       |  3 ++
 .../startup/quartz/SimpleQuartzFactory.java        |  3 ++
 .../synapse/startup/quartz/SimpleQuartzJob.java    |  1 +
 .../startup/quartz/SimpleQuartzSerializer.java     |  1 +
 .../synapse/startup/tasks/MessageInjector.java     |  3 ++
 .../synapse/util/ClasspathURLStreamHandler.java    |  4 ++
 .../synapse/util/FixedByteArrayOutputStream.java   |  2 +
 .../org/apache/synapse/util/MessageHelper.java     |  1 +
 .../org/apache/synapse/util/SimpleMapImpl.java     | 22 +++++++++
 .../synapse/util/SynapseBinaryDataSource.java      |  4 ++
 .../apache/synapse/util/TextFileDataSource.java    |  4 ++
 .../util/concurrent/SynapseThreadFactory.java      |  1 +
 .../synapse/util/jaxp/AXIOMResultBuilder.java      |  3 ++
 .../util/jaxp/AXIOMResultBuilderFactory.java       |  1 +
 .../synapse/util/jaxp/AXIOMSourceBuilder.java      |  2 +
 .../util/jaxp/AXIOMSourceBuilderFactory.java       |  1 +
 .../synapse/util/jaxp/DOOMResultBuilder.java       |  3 ++
 .../util/jaxp/DOOMResultBuilderFactory.java        |  1 +
 .../synapse/util/jaxp/DOOMSourceBuilder.java       |  2 +
 .../util/jaxp/DOOMSourceBuilderFactory.java        |  1 +
 .../synapse/util/jaxp/SchemaResourceLSInput.java   | 16 +++++++
 .../synapse/util/jaxp/SchemaResourceResolver.java  |  1 +
 .../synapse/util/jaxp/StreamResultBuilder.java     |  3 ++
 .../util/jaxp/StreamResultBuilderFactory.java      |  1 +
 .../synapse/util/jaxp/StreamSourceBuilder.java     |  2 +
 .../util/jaxp/StreamSourceBuilderFactory.java      |  1 +
 .../util/resolver/CustomJAXPURIResolver.java       |  1 +
 .../synapse/util/resolver/CustomWSDLLocator.java   |  5 ++
 .../util/resolver/CustomXmlSchemaURIResolver.java  |  1 +
 .../synapse/util/xpath/Base64DecodeFunction.java   |  1 +
 .../synapse/util/xpath/Base64EncodeFunction.java   |  1 +
 .../util/xpath/SynapseXPathFunctionContext.java    |  1 +
 .../util/xpath/SynapseXPathVariableContext.java    |  1 +
 .../synapse/util/xpath/URLEncodeFunction.java      |  1 +
 .../org/apache/synapse/TestMessageContext.java     | 54 +++++++++++++++++++++
 .../apache/synapse/config/SynapseObserverTest.java | 16 +++++++
 .../synapse/config/xml/AbstractTestCase.java       |  1 +
 .../config/xml/SendMediatorSerializationTest.java  |  1 +
 .../apache/synapse/config/xml/TestMediator.java    |  2 +
 .../synapse/config/xml/rest/TestHandler.java       |  2 +
 .../algorithms/RoundRobinAlgorithmTest.java        |  1 +
 .../synapse/eventing/SynapseEventSourceTest.java   |  1 +
 .../apache/synapse/libraries/eip/EipLibTest.java   |  1 +
 .../libraries/util/LibDeployerUtilsTest.java       |  1 +
 .../apache/synapse/mediators/AbstractTestCase.java |  1 +
 .../org/apache/synapse/mediators/TestMediator.java |  2 +
 .../mediators/base/SequenceMediatorTest.java       |  7 +++
 .../mediators/builtin/ValidateMediatorTest.java    |  1 +
 .../eip/AbstractSplitMediatorTestCase.java         |  2 +
 .../synapse/mediators/eip/CloneMediatorTest.java   |  2 +
 .../synapse/mediators/eip/IterateMediatorTest.java |  2 +
 .../mediators/eip/SplitTestHelperMediator.java     |  3 ++
 .../mediators/ext/ClassMediatorTestMediator.java   |  4 ++
 .../ext/POJOCommandTestImplementedMediator.java    |  1 +
 .../mediators/filters/FilterMediatorTest.java      |  2 +
 .../mediators/filters/SwitchMediatorTest.java      |  4 ++
 .../message/store/InMemoryMessageStoreTest.java    |  2 +
 .../synapse/n2n/SynapseCommodityServiceTest.java   |  2 +
 .../synapse/registry/DynamicResourceTest.java      |  1 +
 .../synapse/registry/InMemoryRegistryEntry.java    |  8 ++++
 .../synapse/registry/SimpleInMemoryRegistry.java   |  8 ++++
 .../registry/url/SimpleURLRegistryTest.java        |  2 +
 .../java/org/apache/synapse/util/TestTask.java     |  1 +
 .../synapse/experimental/DetachMediator.java       |  1 +
 .../experimental/DetachMediatorFactory.java        |  2 +
 .../synapse/experimental/ReplaceMediator.java      |  1 +
 .../experimental/ReplaceMediatorFactory.java       |  2 +
 .../mediators/seda/DefaultConsumer.java            |  2 +
 .../experimental/mediators/seda/SEDAMediator.java  |  3 ++
 .../mediators/seda/SEDAMediatorFactory.java        |  2 +
 .../mediators/seda/SEDAQueueConsumerWorker.java    |  1 +
 .../format/hessian/HessianMessageBuilder.java      |  1 +
 .../format/hessian/HessianMessageFormatter.java    |  5 ++
 .../format/syslog/SyslogMessageBuilder.java        |  1 +
 .../synapse/mediators/bsf/JavaScriptXmlHelper.java |  2 +
 .../synapse/mediators/bsf/ScriptMediator.java      |  1 +
 .../mediators/bsf/ScriptMediatorFactory.java       |  2 +
 .../mediators/bsf/ScriptMediatorSerializer.java    |  2 +
 .../mediators/bsf/ScriptMessageContext.java        | 54 +++++++++++++++++++++
 .../synapse/mediators/spring/SpringMediator.java   |  3 ++
 .../mediators/spring/SpringMediatorFactory.java    |  2 +
 .../mediators/spring/SpringMediatorSerializer.java |  2 +
 .../mediators/throttle/ThrottleMediator.java       |  3 ++
 .../throttle/ThrottleMediatorFactory.java          |  2 +
 .../throttle/ThrottleMediatorSerializer.java       |  2 +
 .../mediators/xquery/MediatorBaseVariable.java     |  1 +
 .../mediators/xquery/MediatorCustomVariable.java   |  1 +
 .../synapse/mediators/xquery/XQueryMediator.java   |  1 +
 .../mediators/xquery/XQueryMediatorFactory.java    |  2 +
 .../mediators/xquery/XQueryMediatorSerializer.java |  2 +
 .../test/java/org/apache/synapse/TestMediator.java |  2 +
 .../format/syslog/SyslogMessageBuilderTest.java    |  3 ++
 .../synapse/mediators/spring/SpringTestBean.java   |  2 +
 .../mediators/spring/TestMediateHandlerImpl.java   |  1 +
 .../mediators/throttle/ThrottleMediatorTest.java   |  2 +
 .../apache/synapse/handler/SynapseInHandler.java   |  1 +
 .../org/apache/synapse/handler/SynapseModule.java  |  5 ++
 .../apache/synapse/handler/SynapseOutHandler.java  |  1 +
 .../framework/AbstractBackEndServerController.java |  1 +
 .../samples/framework/ActiveMQController.java      |  2 +
 .../framework/Axis2BackEndServerController.java    |  3 ++
 .../samples/framework/DerbyServerController.java   |  2 +
 .../framework/EchoHttpServerController.java        |  3 ++
 .../synapse/samples/framework/MessageCounter.java  |  1 +
 .../framework/SynapseProcessController.java        |  4 ++
 .../synapse/samples/framework/SynapseTestCase.java |  2 +
 .../framework/clients/StockQuoteCallback.java      |  4 ++
 .../samples/framework/tests/endpoint/Sample55.java |  1 +
 .../samples/framework/tests/endpoint/Sample57.java |  1 +
 .../samples/framework/tests/endpoint/Sample58.java |  1 +
 .../commons/vfs2/provider/AbstractFileName.java    | 17 +++++++
 .../vfs2/provider/ftp/FtpFileNameParser.java       |  1 +
 .../commons/vfs2/provider/ftp/FtpFileProvider.java |  1 +
 .../samples/mediators/BinaryExtractMediator.java   |  4 ++
 .../samples/mediators/DiscountQuoteMediator.java   |  4 ++
 .../mediators/extensions/SpringCustomLogger.java   |  1 +
 .../main/java/samples/userguide/AMQPConsumer.java  |  1 +
 .../main/java/samples/userguide/MDDConsumer.java   |  1 +
 .../main/java/samples/userguide/PWCallback.java    |  1 +
 .../java/samples/userguide/ServiceInvoker.java     |  1 +
 .../java/samples/userguide/StockQuoteCallback.java |  4 ++
 .../main/java/samples/util/SampleAxis2Server.java  |  1 +
 .../samples/util/SampleAxis2ServerManager.java     |  1 +
 .../samples/n2n/AbstractAutomationTestCase.java    |  2 +
 .../samples/n2n/SynapseSample_0_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_100_Integration.java |  1 +
 .../samples/n2n/SynapseSample_101_Integration.java |  1 +
 .../samples/n2n/SynapseSample_102_Integration.java |  1 +
 .../samples/n2n/SynapseSample_103_Integration.java |  1 +
 .../samples/n2n/SynapseSample_104_Integration.java |  1 +
 .../samples/n2n/SynapseSample_10_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_110_Integration.java |  1 +
 .../samples/n2n/SynapseSample_111_Integration.java |  1 +
 .../samples/n2n/SynapseSample_112_Integration.java |  1 +
 .../samples/n2n/SynapseSample_113_Integration.java |  1 +
 .../samples/n2n/SynapseSample_114_Integration.java |  1 +
 .../samples/n2n/SynapseSample_11_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_1_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_2_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_3_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_4_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_500_Integration.java |  1 +
 .../samples/n2n/SynapseSample_501_Integration.java |  1 +
 .../samples/n2n/SynapseSample_502_Integration.java |  1 +
 .../samples/n2n/SynapseSample_503_Integration.java |  1 +
 .../samples/n2n/SynapseSample_50_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_510_Integration.java |  1 +
 .../samples/n2n/SynapseSample_51_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_52_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_53_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_54_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_55_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_56_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_57_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_5_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_600_Integration.java |  1 +
 .../samples/n2n/SynapseSample_60_Integration.java  |  1 +
 .../samples/n2n/SynapseSample_6_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_7_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_8_Integration.java   |  1 +
 .../samples/n2n/SynapseSample_9_Integration.java   |  1 +
 .../synapse/securevault/AsymmetricCipher.java      |  1 +
 .../org/apache/synapse/securevault/BaseCipher.java |  2 +
 .../synapse/securevault/SymmetricCipher.java       |  1 +
 .../securevault/keystore/CACertsLoader.java        |  1 +
 .../keystore/IdentityKeyStoreWrapper.java          |  1 +
 .../securevault/keystore/JKSKeyStoreLoader.java    |  1 +
 .../securevault/keystore/PKCS12KeyStoreLoader.java |  1 +
 .../securevault/keystore/PKCS8KeyStoreLoader.java  |  1 +
 .../secret/AbstractSecretCallbackHandler.java      |  1 +
 .../handler/HardCodedSecretCallbackHandler.java    |  1 +
 .../secret/handler/JMXSecretCallbackHandler.java   |  1 +
 .../secret/handler/JlineSecretCallbackHandler.java |  1 +
 .../SecretManagerSecretCallbackHandler.java        |  1 +
 .../handler/SharedSecretCallbackHandler.java       |  1 +
 .../secret/mbean/JMXSecretsProvider.java           |  3 ++
 .../repository/FileBaseSecretRepository.java       |  4 ++
 .../FileBaseSecretRepositoryProvider.java          |  1 +
 .../synapse/task/DefaultTaskJobDetailFactory.java  |  1 +
 .../synapse/task/DefaultTaskTriggerFactory.java    |  1 +
 .../org/apache/synapse/transport/nhttp/Access.java | 31 ++++++++++++
 .../synapse/transport/nhttp/ClientHandler.java     | 11 +++++
 .../synapse/transport/nhttp/ClientWorker.java      |  2 +
 .../transport/nhttp/DefaultHttpGetProcessor.java   |  2 +
 .../synapse/transport/nhttp/HostnameVerifier.java  | 17 +++++++
 .../transport/nhttp/HttpCoreNIOListener.java       | 42 ++++++++++++++++
 .../transport/nhttp/HttpCoreNIOSSLListener.java    |  6 +++
 .../transport/nhttp/HttpCoreNIOSSLSender.java      |  5 ++
 .../synapse/transport/nhttp/HttpCoreNIOSender.java | 34 +++++++++++++
 .../nhttp/HttpCoreRequestResponseTransport.java    |  9 +++-
 .../nhttp/NoValidateCertTrustManager.java          |  3 ++
 .../synapse/transport/nhttp/ServerHandler.java     |  9 ++++
 .../synapse/transport/nhttp/ServerWorker.java      |  2 +
 .../nhttp/debug/ClientConnectionDebug.java         |  1 +
 .../nhttp/debug/ServerConnectionDebug.java         |  1 +
 .../transport/nhttp/util/ConnectionsView.java      | 15 ++++++
 .../nhttp/util/GzipMessageFormatterDecorator.java  |  5 ++
 .../synapse/transport/nhttp/util/LatencyView.java  | 12 +++++
 .../synapse/transport/passthru/ClientWorker.java   |  2 +
 .../transport/passthru/ConnectCallback.java        |  4 ++
 .../transport/passthru/HostnameVerifier.java       | 17 +++++++
 .../passthru/PassThroughHttpListener.java          | 19 ++++++++
 .../passthru/PassThroughHttpSSLListener.java       |  4 ++
 .../passthru/PassThroughHttpSSLSender.java         |  8 ++++
 .../transport/passthru/PassThroughHttpSender.java  |  7 +++
 .../apache/synapse/transport/passthru/Pipe.java    |  2 +
 .../synapse/transport/passthru/ServerWorker.java   |  2 +
 .../synapse/transport/passthru/SourceHandler.java  |  9 ++++
 .../synapse/transport/passthru/SourceRequest.java  |  1 +
 .../transport/passthru/TargetErrorHandler.java     |  1 +
 .../synapse/transport/passthru/TargetHandler.java  |  9 ++++
 .../passthru/api/PassThroughNHttpGetProcessor.java |  6 ++-
 .../passthru/config/PassThroughConfiguration.java  |  1 +
 .../transport/passthru/jmx/ConnectionsView.java    | 13 +++++
 .../transport/passthru/jmx/LatencyView.java        | 11 +++++
 .../transport/passthru/jmx/TransportView.java      | 25 ++++++++++
 .../passthru/util/BinaryRelayBuilder.java          |  3 +-
 .../util/StreamingOnRequestDataSource.java         |  4 ++
 .../conn/SynapseNHttpClientConnectionFactory.java  |  5 ++
 .../conn/SynapseNHttpServerConnectionFactory.java  |  5 ++
 .../conn/logging/LoggingClientEventHandler.java    |  9 ++++
 .../utils/conn/logging/LoggingIOSession.java       | 23 +++++++++
 .../conn/logging/LoggingServerEventHandler.java    |  9 ++++
 .../sslcert/adaptor/ParentLastClassLoader.java     |  1 +
 .../utils/sslcert/cache/CacheController.java       |  6 +++
 .../utils/sslcert/cache/CacheManager.java          |  1 +
 .../transport/utils/sslcert/crl/CRLCache.java      |  7 +++
 .../transport/utils/sslcert/crl/CRLVerifier.java   |  1 +
 .../transport/utils/sslcert/ocsp/OCSPCache.java    |  7 +++
 .../transport/utils/sslcert/ocsp/OCSPVerifier.java |  1 +
 .../nhttp/HttpAxisTestClientConfigurator.java      |  1 +
 .../nhttp/HttpTransportDescriptionFactory.java     |  2 +
 .../transport/pipe/EndDelimitedProtocol.java       |  5 ++
 .../synapse/transport/pipe/PipeDispatcher.java     |  9 ++--
 .../transport/pipe/PipeEndpointListener.java       |  1 +
 .../transport/vfs/FileObjectDataSource.java        |  5 ++
 .../synapse/transport/vfs/VFSOutTransportInfo.java |  1 +
 .../transport/vfs/VFSTransportListener.java        |  1 +
 .../synapse/transport/vfs/VFSTransportSender.java  |  2 +
 .../synapse/transport/vfs/VFSAsyncClient.java      |  1 +
 .../apache/synapse/transport/vfs/VFSClient.java    |  1 +
 .../synapse/transport/vfs/VFSFileChannel.java      |  1 +
 .../transport/vfs/VFSMockAsyncEndpoint.java        |  2 +
 .../transport/vfs/VFSRequestResponseClient.java    |  1 +
 .../vfs/VFSTransportDescriptionFactory.java        |  2 +
 .../transport/fix/FIXIncomingMessageHandler.java   |  8 ++++
 .../synapse/transport/fix/FIXOutTransportInfo.java |  1 +
 .../transport/fix/FIXTransportListener.java        |  4 ++
 .../synapse/transport/fix/FIXTransportSender.java  |  3 ++
 .../transport/fix/message/FIXMessageBuilder.java   |  3 +-
 .../transport/fix/message/FIXMessageFormatter.java | 15 ++++--
 .../apache/synapse/maven/xar/AbstractXarMojo.java  |  4 ++
 .../org/apache/synapse/maven/xar/ClassScanner.java |  1 +
 .../apache/synapse/maven/xar/ServiceLocator.java   |  2 +
 .../apache/synapse/maven/xar/XarExplodedMojo.java  |  1 +
 .../java/org/apache/synapse/maven/xar/XarMojo.java |  1 +
 pom.xml                                            |  2 +-
 555 files changed, 1977 insertions(+), 21 deletions(-)

diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalk.java b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalk.java
index 7bf7856cd..8e51a71fd 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalk.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalk.java
@@ -161,6 +161,7 @@ public class EnterpriseBeanstalk {
         int minDelay = Math.min(statelessBeanTimeoutMinutes, statefulBeanTimeoutMinutes);
         scheduledFuture = scheduler.scheduleWithFixedDelay(
                             new Runnable() {
+                                @Override
                                 public void run() {
                                     removeExpiredBeans();
                                 }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkManager.java b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkManager.java
index 3cd2aef66..7af1403db 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkManager.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkManager.java
@@ -84,6 +84,7 @@ public class EnterpriseBeanstalkManager {
 
         scheduler = Executors.newSingleThreadScheduledExecutor(
                 new ThreadFactory() {
+                    @Override
                     public Thread newThread(Runnable r) {
                         return new Thread(r, "enterprise-beanstalk-cache-cleaner");
                     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkView.java b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkView.java
index 727ed8aa3..ea7445768 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkView.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/beanstalk/enterprise/EnterpriseBeanstalkView.java
@@ -34,22 +34,27 @@ public class EnterpriseBeanstalkView implements EnterpriseBeanstalkViewMBean {
         this.beanstalk = beanstalk;
     }
 
+    @Override
     public String getBeanstalkName() {
         return beanstalk.getName();
     }
 
+    @Override
     public int getCachedStatelessStubCount() {
         return beanstalk.getStatelessBeans().size();
     }
 
+    @Override
     public int getCachedStatefulStubCount() {
         return beanstalk.getStatefulBeans().size();
     }
 
+    @Override
     public Map getStatelessStubCacheLastAccessTimes() {
         return getLastAccessTimesMap(beanstalk.getStatelessBeans());
     }
 
+    @Override
     public Map getStatefulStubCacheLastAccessTimes() {
         return getLastAccessTimesMap(beanstalk.getStatefulBeans());
     }
@@ -62,14 +67,17 @@ public class EnterpriseBeanstalkView implements EnterpriseBeanstalkViewMBean {
         return results;
     }
 
+    @Override
     public void cleanExpiredStubsNow() throws Exception {
         beanstalk.removeExpiredBeans();
     }
 
+    @Override
     public void removeStatelessStub(String className) {
         beanstalk.removeEnterpriseBean(className, null);
     }
 
+    @Override
     public void removeStatefulStub(String className, String sessionId) {
         beanstalk.removeEnterpriseBean(className, sessionId);
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/builders/XFormURLEncodedBuilder.java b/modules/commons/src/main/java/org/apache/synapse/commons/builders/XFormURLEncodedBuilder.java
index 49f6ab15a..4f5161f86 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/builders/XFormURLEncodedBuilder.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/builders/XFormURLEncodedBuilder.java
@@ -48,6 +48,7 @@ public class XFormURLEncodedBuilder implements Builder {
 
     private static final QName XFORM_FIRST_ELEMENT = new QName("xformValues");
 
+    @Override
     public OMElement processDocument(InputStream inputStream, String s,
                                      MessageContext messageContext) throws AxisFault {
         // first process the input stream using the Axis2 builder
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
index 715e8a3cd..1fddd5b15 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
@@ -37,6 +37,7 @@ public class DBPoolView implements DBPoolViewMBean {
         this.name = name;
     }
 
+    @Override
     public int getNumActive() {
         return numActive;
     }
@@ -45,6 +46,7 @@ public class DBPoolView implements DBPoolViewMBean {
         this.numActive = numActive;
     }
 
+    @Override
     public int getNumIdle() {
         return numIdle;
     }
@@ -53,6 +55,7 @@ public class DBPoolView implements DBPoolViewMBean {
         this.numIdle = numIdle;
     }
 
+    @Override
     public String getName() {
         return name;
     }
@@ -73,10 +76,12 @@ public class DBPoolView implements DBPoolViewMBean {
         }
     }
 
+    @Override
     public Map getConnectionUsage() {
         return connectionsUsage;
     }
 
+    @Override
     public void reset() {
         numActive = 0;
         numIdle = 0;
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
index d404d071b..2b448aa0c 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
@@ -82,6 +82,7 @@ public class DataSourceRepositoryManager implements DataSourceInformationReposit
         return result;
     }
 
+    @Override
     public void addDataSourceInformation(DataSourceInformation dataSourceInformation) {
 
         assertDataSourceInformationNull(dataSourceInformation);
@@ -100,6 +101,7 @@ public class DataSourceRepositoryManager implements DataSourceInformationReposit
         }
     }
 
+    @Override
     public void removeDataSourceInformation(DataSourceInformation dataSourceInformation) {
 
         assertDataSourceInformationNull(dataSourceInformation);
@@ -118,6 +120,7 @@ public class DataSourceRepositoryManager implements DataSourceInformationReposit
         }
     }
 
+    @Override
     public void reConfigure(Properties confProperties) {
 
         if (log.isDebugEnabled()) {
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
index fe3b143ca..caf08c3af 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
@@ -48,6 +48,7 @@ public class DatasourceMBeanRepository implements MBeanRepository {
         return DATASOURCE_MBEAN_REPOSITORY;
     }
 
+    @Override
     public void addMBean(String name, Object mBean) {
 
         if (name == null || "".equals(name)) {
@@ -67,6 +68,7 @@ public class DatasourceMBeanRepository implements MBeanRepository {
                 MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
     }
 
+    @Override
     public Object getMBean(String name) {
         if (name == null || "".equals(name)) {
             throw new SynapseCommonsException("DataSource MBean name cannot be found.", log);
@@ -74,6 +76,7 @@ public class DatasourceMBeanRepository implements MBeanRepository {
         return dataSourcesMBeans.get(name);
     }
 
+    @Override
     public void removeMBean(String name) {
 
         dataSourcesMBeans.remove(name);
@@ -81,6 +84,7 @@ public class DatasourceMBeanRepository implements MBeanRepository {
                 MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
     }
 
+    @Override
     public void clear() {
 
         if (!dataSourcesMBeans.isEmpty()) {
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
index 0fe03523c..0c93a5d91 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
@@ -51,6 +51,7 @@ public class InMemoryDataSourceRepository implements DataSourceRepository {
      * @param dataSourceInformation the information describing a data source
      * @see DataSourceRepository#register(DataSourceInformation)
      */
+    @Override
     public void register(DataSourceInformation dataSourceInformation) {
 
         if (dataSourceInformation == null) {
@@ -78,6 +79,7 @@ public class InMemoryDataSourceRepository implements DataSourceRepository {
         dataSources.put(name, dataSource);
     }
 
+    @Override
     public void unRegister(String name) {
 
         if (name == null || "".equals(name)) {
@@ -94,6 +96,7 @@ public class InMemoryDataSourceRepository implements DataSourceRepository {
      *
      * @see DataSourceRepository#lookUp(String)
      */
+    @Override
     public DataSource lookUp(String name) {
 
         if (name == null || "".equals(name)) {
@@ -104,14 +107,17 @@ public class InMemoryDataSourceRepository implements DataSourceRepository {
         return dataSources.get(name);
     }
 
+    @Override
     public void init(Properties properties) {
         // nothing
     }
 
+    @Override
     public boolean isInitialized() {
         return true;
     }
 
+    @Override
     public void clear() {
         if (!dataSources.isEmpty()) {
             log.info("Clearing all in-memory datasources ");
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
index 7189f8550..c7108a055 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
@@ -50,6 +50,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
 
     private boolean initialized = false;
 
+    @Override
     public void init(Properties jndiEnv) {
 
         initialized = true;
@@ -71,6 +72,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
      *
      * @see DataSourceRepository#register(DataSourceInformation)
      */
+    @Override
     public void register(DataSourceInformation information) {
 
         validateInitialized();
@@ -236,6 +238,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
         cachedNameList.add(dataSourceName);
     }
 
+    @Override
     public void unRegister(String name) {
 
         InitialContext context = getCachedInitialContext(name);
@@ -253,6 +256,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
      *
      * @see DataSourceRepository#lookUp(String)
      */
+    @Override
     public DataSource lookUp(String dsName) {
 
         validateInitialized();
@@ -272,6 +276,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
         return DataSourceFinder.find(dsName, context);
     }
 
+    @Override
     public void clear() {
         initialized = false;
         initialContext = null;
@@ -500,6 +505,7 @@ public class JNDIBasedDataSourceRepository implements DataSourceRepository {
         return jndiEvn;
     }
 
+    @Override
     public boolean isInitialized() {
         return initialized;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
index 56cb2851c..b19869dc1 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
@@ -34,6 +34,7 @@ public class AndEvaluator implements Evaluator {
 
     private Evaluator[] evaluators;
 
+    @Override
     public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
         for (Evaluator e : evaluators) {
             if (!e.evaluate(context)) {
@@ -43,6 +44,7 @@ public class AndEvaluator implements Evaluator {
         return true;
     }
 
+    @Override
     public String getName() {
         return EvaluatorConstants.AND;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
index eadfe5fbe..ed73d72da 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
@@ -38,11 +38,13 @@ public class EqualEvaluator implements Evaluator {
 
     private SourceTextRetriever textRetriever;
 
+    @Override
     public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
         String sourceText = textRetriever.getSourceText(context);
         return sourceText != null && sourceText.equalsIgnoreCase(value);
     }
 
+    @Override
     public String getName() {
         return EvaluatorConstants.EQUAL;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
index fe480ff0b..9fa497e57 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
@@ -44,6 +44,7 @@ public class MatchEvaluator implements Evaluator {
 
     private Pattern regex = null;
 
+    @Override
     public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
         String sourceText = textRetriever.getSourceText(context);
 
@@ -55,6 +56,7 @@ public class MatchEvaluator implements Evaluator {
         return matcher.matches();
     }
 
+    @Override
     public String getName() {
         return EvaluatorConstants.MATCH;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java
index 4289ffb53..0fe401303 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java
@@ -32,10 +32,12 @@ package org.apache.synapse.commons.evaluators;
 public class NotEvaluator implements Evaluator {
     private Evaluator evaluator;
 
+    @Override
     public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
         return !evaluator.evaluate(context);
     }
 
+    @Override
     public String getName() {
         return EvaluatorConstants.NOT;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
index cf58bc487..d6d5a98e1 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
@@ -34,6 +34,7 @@ public class OrEvaluator implements Evaluator {
 
     private Evaluator[] evaluators;
 
+    @Override
     public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
         for (Evaluator e : evaluators) {
             if (e.evaluate(context)) {
@@ -43,6 +44,7 @@ public class OrEvaluator implements Evaluator {
         return false;
     }
 
+    @Override
     public String getName() {
         return EvaluatorConstants.OR;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java
index c38c0623a..802c2f6fd 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 public class AndFactory implements EvaluatorFactory {
     private Log log = LogFactory.getLog(AndFactory.class);
 
+    @Override
     public Evaluator create(OMElement e) throws EvaluatorException {
         AndEvaluator o = new AndEvaluator();
 
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
index b19627e16..f7ff1c022 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
  * the {@link AndFactory}. 
  */
 public class AndSerializer extends AbstractEvaluatorSerializer {    
+    @Override
     public OMElement serialize(OMElement parent, Evaluator evaluator) throws EvaluatorException {        
         if (!(evaluator instanceof AndEvaluator)) {           
             throw new IllegalArgumentException("Evaluator should be an AndEvaluator");
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
index af76c9f78..b14a7b543 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
@@ -38,6 +38,7 @@ import javax.xml.namespace.QName;
  */
 public class EqualFactory extends TextProcessingEvaluatorFactory {
 
+    @Override
     public Evaluator create(OMElement e) throws EvaluatorException {
         EqualEvaluator equal = new EqualEvaluator();
         SourceTextRetriever textRetriever = getSourceTextRetriever(e);
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
index 6c1cc8089..6d4a0f58d 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
@@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
  */
 public class EqualSerializer extends TextProcessingEvaluatorSerializer {
 
+    @Override
     public OMElement serialize(OMElement parent, Evaluator evaluator) throws EvaluatorException {
 
         if (!(evaluator instanceof EqualEvaluator)) {
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
index 69fd30081..fbdbe4f37 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
@@ -40,6 +40,7 @@ import java.util.regex.Pattern;
  */
 public class MatchFactory extends TextProcessingEvaluatorFactory {
 
+    @Override
     public Evaluator create(OMElement e) throws EvaluatorException {
         MatchEvaluator equal = new MatchEvaluator();
         SourceTextRetriever textRetriever = getSourceTextRetriever(e);
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
index 359dd5cf1..216d96488 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
  */
 public class MatchSerializer extends TextProcessingEvaluatorSerializer {
 
+    @Override
     public OMElement serialize(OMElement parent, Evaluator evaluator) throws EvaluatorException {
         if (!(evaluator instanceof MatchEvaluator)) {
             throw new IllegalArgumentException("Evaluator must be a NotEvaluator");
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java
index caf92f975..12279e7b5 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java
@@ -39,6 +39,7 @@ import org.apache.commons.logging.LogFactory;
 public class NotFactory implements EvaluatorFactory {
     private Log log = LogFactory.getLog(NotFactory.class);
 
+    @Override
     public Evaluator create(OMElement e) throws EvaluatorException {
         NotEvaluator not = new NotEvaluator();
 
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
index 629d4df4d..45603f796 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
  */
 public class NotSerializer extends AbstractEvaluatorSerializer {
 
+    @Override
     public OMElement serialize(OMElement parent, Evaluator evaluator) throws EvaluatorException {
         if (!(evaluator instanceof NotEvaluator)) {
             throw new IllegalArgumentException("Evaluator should be a NotEvaluator");
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java
index be4a16709..a81732d2a 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 public class OrFactory implements EvaluatorFactory {
     private Log log = LogFactory.getLog(OrFactory.class);
 
+    @Override
     public Evaluator create(OMElement e) throws EvaluatorException {
         OrEvaluator o = new OrEvaluator();
 
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
index f09a86af0..6f8d464ec 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
  * the {@link OrFactory}. 
  */
 public class OrSerializer extends AbstractEvaluatorSerializer {
+    @Override
     public OMElement serialize(OMElement parent, Evaluator evaluator) throws EvaluatorException {
         if (!(evaluator instanceof OrEvaluator)) {
             throw new IllegalArgumentException("Evaluator should be an OrEvaluator");
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/HeaderTextRetriever.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/HeaderTextRetriever.java
index 5ac959139..cc8f62edb 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/HeaderTextRetriever.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/HeaderTextRetriever.java
@@ -30,10 +30,12 @@ public class HeaderTextRetriever implements SourceTextRetriever {
         this.source = source;
     }
 
+    @Override
     public String getSourceText(EvaluatorContext context) throws EvaluatorException {
         return context.getHeader(source);
     }
 
+    @Override
     public String getSource() {
         return source;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/ParameterTextRetriever.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/ParameterTextRetriever.java
index 7778a4bbe..2f4ac31f0 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/ParameterTextRetriever.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/ParameterTextRetriever.java
@@ -36,6 +36,7 @@ public class ParameterTextRetriever implements SourceTextRetriever {
         this.source = source;
     }
 
+    @Override
     public String getSourceText(EvaluatorContext context) throws EvaluatorException {
         try {
             return context.getParam(source);
@@ -46,6 +47,7 @@ public class ParameterTextRetriever implements SourceTextRetriever {
         }
     }
 
+    @Override
     public String getSource() {
         return source;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/PropertyTextRetriever.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/PropertyTextRetriever.java
index 40578205e..b854ed23b 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/PropertyTextRetriever.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/PropertyTextRetriever.java
@@ -30,6 +30,7 @@ public class PropertyTextRetriever implements SourceTextRetriever {
         this.source = source;
     }
 
+    @Override
     public String getSourceText(EvaluatorContext context) throws EvaluatorException {
         Object value = context.getProperty(source);
         if (value != null) {
@@ -38,6 +39,7 @@ public class PropertyTextRetriever implements SourceTextRetriever {
         return null;
     }
 
+    @Override
     public String getSource() {
         return source;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/SOAPEnvelopeTextRetriever.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/SOAPEnvelopeTextRetriever.java
index 24d73ea65..c8694c9ed 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/SOAPEnvelopeTextRetriever.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/SOAPEnvelopeTextRetriever.java
@@ -40,6 +40,7 @@ public class SOAPEnvelopeTextRetriever implements SourceTextRetriever {
         this.source = source;
     }
 
+    @Override
     public String getSourceText(EvaluatorContext context) throws EvaluatorException {
         SOAPEnvelope envelope = context.getMessageContext().getEnvelope();
         Object result;
@@ -85,6 +86,7 @@ public class SOAPEnvelopeTextRetriever implements SourceTextRetriever {
         }
     }
 
+    @Override
     public String getSource() {
         return source;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/URLTextRetriever.java b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/URLTextRetriever.java
index 3355586f2..941bbace4 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/URLTextRetriever.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/source/URLTextRetriever.java
@@ -34,6 +34,7 @@ public class URLTextRetriever implements SourceTextRetriever {
 
     private EvaluatorConstants.URI_FRAGMENTS fragment = null;
 
+    @Override
     public String getSourceText(EvaluatorContext context) throws EvaluatorException {
         if (fragment == null) {
             return context.getUrl();
@@ -58,6 +59,7 @@ public class URLTextRetriever implements SourceTextRetriever {
         }
     }
 
+    @Override
     public String getSource() {
         if (fragment != null) {
             return fragment.name();
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueue.java b/modules/commons/src/main/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueue.java
index 06d7be49e..2dc2ca32d 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueue.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueue.java
@@ -85,6 +85,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
 
         Collections.sort(this.queues, new Comparator<InternalQueue<E>>() {
+            @Override
             public int compare(InternalQueue<E> o1, InternalQueue<E> o2) {
                 return o2.getPriority() - o1.getPriority();
             }
@@ -110,6 +111,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @param e object that implements the Importance interface
      * @throws InterruptedException
      */
+    @Override
     public void put(E e) throws InterruptedException {
         Importance i = (Importance) e;
         InternalQueue<E> internalQueue = getQueueForPriority(i.getPriority());
@@ -141,6 +143,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @param e element to be added
      * @return true if element is added
      */
+    @Override
     public boolean offer(E e) {
         Importance i = (Importance) e;
         InternalQueue<E> internalQueue = getQueueForPriority(i.getPriority());
@@ -171,6 +174,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @return true if the element is added
      * @throws InterruptedException if the thread is interrupted
      */
+    @Override
     public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException {
         Importance i = (Importance) e;
         InternalQueue<E> internalQueue = getQueueForPriority(i.getPriority());
@@ -205,6 +209,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @return an element
      * @throws InterruptedException if the thread is interrupted
      */
+    @Override
     public E take() throws InterruptedException {
         final ReentrantLock lock = this.lock;
         lock.lockInterruptibly();
@@ -237,6 +242,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @return an object
      * @throws InterruptedException
      */
+    @Override
     public E poll(long timeout, TimeUnit unit) throws InterruptedException {
         long nanos = unit.toNanos(timeout);
         final ReentrantLock lock = this.lock;
@@ -271,6 +277,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @param c collection to drain the items     
      * @return number of elements copied
      */
+    @Override
     public int drainTo(Collection<? super E> c) {
         int count = 0;
         final ReentrantLock lock = this.lock;
@@ -295,6 +302,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      * @param maxElements maximum elements to copy
      * @return number of elements copied
      */
+    @Override
     public int drainTo(Collection<? super E> c, int maxElements) {
         int elementsCopied = 0;
         final ReentrantLock lock = this.lock;
@@ -317,6 +325,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
      *
      * @return an object
      */
+    @Override
     public E poll() {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -335,10 +344,12 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public int remainingCapacity() {
         return capacity - count;
     }
 
+    @Override
     public E peek() {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -354,18 +365,22 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public Iterator<E> iterator() {
         return new QueueIterator(toArray());
     }
 
+    @Override
     public int size() {
         return count;
     }
 
+    @Override
     public boolean isEmpty() {
         return count == 0;
     }
 
+    @Override
     public boolean remove(Object o) {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -382,6 +397,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public boolean contains(Object o) {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -395,6 +411,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public String toString() {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -409,6 +426,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public void clear() {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -422,6 +440,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }                
     }
 
+    @Override
     @SuppressWarnings({"SuspiciousToArrayCall"})
     public <T> T[] toArray(T[] a) {
         final ReentrantLock lock = this.lock;
@@ -437,6 +456,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    @Override
     public Object[] toArray() {
         final ReentrantLock lock = this.lock;
         lock.lock();
@@ -470,10 +490,12 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
             this.array = array;
         }
 
+        @Override
         public boolean hasNext() {
             return cursor < array.length;
         }
 
+        @Override
         public E next() {
             if (cursor >= array.length)
                 throw new NoSuchElementException();
@@ -481,6 +503,7 @@ public class MultiPriorityBlockingQueue<E> extends AbstractQueue<E>
             return (E) array[cursor++];
         }
 
+        @Override
         public void remove() {
             if (lastRet < 0)
                 throw new IllegalStateException();
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/executors/PRRNextQueueAlgorithm.java b/modules/commons/src/main/java/org/apache/synapse/commons/executors/PRRNextQueueAlgorithm.java
index b14bf4290..6043dac0b 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/executors/PRRNextQueueAlgorithm.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/executors/PRRNextQueueAlgorithm.java
@@ -49,6 +49,7 @@ public class PRRNextQueueAlgorithm<E> implements NextQueueAlgorithm<E> {
     /** Number of messages sent from the current queue */
     private int currentCount = 0;
 
+    @Override
     public InternalQueue<E> getNextQueue() {
         InternalQueue<E> internalQueue = queues.get(currentQueue);
 
@@ -83,6 +84,7 @@ public class PRRNextQueueAlgorithm<E> implements NextQueueAlgorithm<E> {
         return internalQueue;
     }
 
+    @Override
     public void init(List<InternalQueue<E>> queues) {
         this.queues = queues;
         size = queues.size();
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/executors/PriorityExecutor.java b/modules/commons/src/main/java/org/apache/synapse/commons/executors/PriorityExecutor.java
index dfcea33b0..3c3ecb70b 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/executors/PriorityExecutor.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/executors/PriorityExecutor.java
@@ -266,6 +266,7 @@ public class PriorityExecutor {
             this.runnable = runnable;
         }
 
+        @Override
         public void run() {
             try {
                 runnable.run();
@@ -274,18 +275,22 @@ public class PriorityExecutor {
             }
         }
 
+        @Override
         public int getPriority() {
             return priority;
         }
 
+        @Override
         public void setPriority(int p) {
             this.priority = p;
         }
 
+        @Override
         public void setProperty(String name, Object value) {
             properties.put(name, value);
         }
 
+        @Override
         public Object getProperty(String name) {
             return properties.get(name);
         }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/FixedSizeQueue.java b/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/FixedSizeQueue.java
index 3c4303bdc..523f09653 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/FixedSizeQueue.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/FixedSizeQueue.java
@@ -79,34 +79,42 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
         array = (E[]) new Object[capacity];
     }
 
+    @Override
     public int getPriority() {
         return priority;
     }
 
+    @Override
     public void setPriority(int p) {
         this.priority = p;
     }    
 
+    @Override
     public Condition getNotFullCond() {
         return notFullCond;
     }
 
+    @Override
     public void setNotFullCond(Condition notFullCond) {
         this.notFullCond = notFullCond;
     }
 
+    @Override
     public Iterator<E> iterator() {
         return new Itr<E>();
     }
 
+    @Override
     public int size() {
         return count;
     }
 
+    @Override
     public String toString() {
         return super.toString() + this.priority;
     }
 
+    @Override
     public boolean offer(E e) {
         if (count == array.length) {
             return false;
@@ -116,20 +124,24 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
         }
     }
 
+    @Override
     public E poll() {
         if (count == 0)
             return null;
         return get();
     }
 
+    @Override
     public E peek() {
         return (count == 0) ? null : array[head];
     }
 
+    @Override
     public int remainingCapacity() {
         return capacity - count;        
     }
 
+    @Override
     public int drainTo(Collection<? super E> c) {
         final E[] items = this.array;
         int i = head;
@@ -150,6 +162,7 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
         return n;
     }
 
+    @Override
     public int drainTo(Collection<? super E> c, int maxElements) {
         final E[] items = this.array;
         int i = head;
@@ -168,6 +181,7 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
         return n;
     }
 
+    @Override
     public int getCapacity() {
         return capacity;
     }
@@ -209,10 +223,12 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
     private class Itr<E> implements Iterator<E> {
 	    int index = head;
 
+        @Override
         public boolean hasNext() {
             return index != tail;
         }
 
+        @Override
         public E next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
@@ -222,6 +238,7 @@ public class FixedSizeQueue<E> extends AbstractQueue<E> implements InternalQueue
 
         }
 
+        @Override
         public void remove() {            
             while (index != tail) {
                 int j = increment(index);
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/UnboundedQueue.java b/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/UnboundedQueue.java
index 9a78a4929..472e33082 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/UnboundedQueue.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/executors/queues/UnboundedQueue.java
@@ -46,18 +46,22 @@ public class UnboundedQueue<E> extends AbstractQueue<E> implements InternalQueue
         this.priority = priority;        
     }
 
+    @Override
     public Iterator<E> iterator() {
         return elements.iterator();
     }
 
+    @Override
     public int size() {
         return elements.size();
     }
 
+    @Override
     public boolean offer(E e) {
         return elements.add(e);
     }
 
+    @Override
     public E poll() {
         if (elements.size() > 0) {
             return elements.remove(elements.size() - 1);
@@ -65,6 +69,7 @@ public class UnboundedQueue<E> extends AbstractQueue<E> implements InternalQueue
         return null;
     }
 
+    @Override
     public E peek() {
         if (elements.size() > 0) {
             return elements.get(elements.size() - 1);
@@ -72,22 +77,27 @@ public class UnboundedQueue<E> extends AbstractQueue<E> implements InternalQueue
         return null;
     }
 
+    @Override
     public int getPriority() {
         return priority;
     }
 
+    @Override
     public void setPriority(int p) {
         this.priority = p;
     }    
 
+    @Override
     public Condition getNotFullCond() {
         return notFullCond;
     }
 
+    @Override
     public void setNotFullCond(Condition condition) {
         this.notFullCond = condition;
     }
 
+    @Override
     public int drainTo(Collection<? super E> c) {
         int count = elements.size();
         c.addAll(elements);
@@ -95,6 +105,7 @@ public class UnboundedQueue<E> extends AbstractQueue<E> implements InternalQueue
         return count;
     }
 
+    @Override
     public int drainTo(Collection<? super E> c, int maxElements) {
         if (maxElements >= elements.size()) {
             return drainTo(c);
@@ -104,10 +115,12 @@ public class UnboundedQueue<E> extends AbstractQueue<E> implements InternalQueue
         }
     }
 
+    @Override
     public int remainingCapacity() {
         return Integer.MAX_VALUE;
     }
 
+    @Override
     public int getCapacity() {
         return Integer.MAX_VALUE;
     }
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java
index bf3097e76..98a8201fa 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java
@@ -38,6 +38,7 @@ public class JmxSecretAuthenticator implements JMXAuthenticator {
         this.secretInformation = secretInformation;
     }
 
+    @Override
     public Subject authenticate(Object credentials) {
 
         if (credentials == null) {
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/ThreadingView.java b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/ThreadingView.java
index 15f12c63d..ff0220a53 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/ThreadingView.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/ThreadingView.java
@@ -84,6 +84,7 @@ public class ThreadingView implements ThreadingViewMBean {
     public ThreadingView(final String threadNamePrefix) {
         this.threadNamePrefix = threadNamePrefix;
         this.scheduler = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+            @Override
             public Thread newThread(Runnable r) {
                 return new Thread(r, threadNamePrefix + "-thread-view");
             }
@@ -134,6 +135,7 @@ public class ThreadingView implements ThreadingViewMBean {
         }
     }
 
+    @Override
     public int getTotalWorkerCount() {
         int count = 0;
         ThreadInfo[] threadInfo = dumpAllThreads();
@@ -164,6 +166,7 @@ public class ThreadingView implements ThreadingViewMBean {
         return ((double) blockedCount/(double) totalCount) * 100;
     }
 
+    @Override
     public String[] getDeadLockedWorkers() {
         String[] workers = null;
         // JDK 1.6 has a better implementation of this method but since we are on JDK 1.5
@@ -183,42 +186,52 @@ public class ThreadingView implements ThreadingViewMBean {
         return workers;
     }
 
+    @Override
     public double getAvgBlockedWorkerPercentage() {
         return avgBlockedWorkerPercentage;
     }
 
+    @Override
     public double getAvgUnblockedWorkerPercentage() {
         return avgUnblockedWorkerPercentage;
     }
 
+    @Override
     public double getLastMinuteBlockedWorkerPercentage() {
         return getAverageBlockedThreads(1);
     }
 
+    @Override
     public double getLast5MinuteBlockedWorkerPercentage() {
         return getAverageBlockedThreads(5);
     }
 
+    @Override
     public double getLast15MinuteBlockedWorkerPercentage() {
         return getAverageBlockedThreads(15);
     }
 
+    @Override
     public double getLastHourBlockedWorkerPercentage() {
         return getAverageBlockedThreadsByHour(1);
     }
 
+    @Override
     public double getLast8HourBlockedWorkerPercentage() {
         return getAverageBlockedThreadsByHour(8);
     }
 
+    @Override
     public double getLast24HourBlockedWorkerPercentage() {
         return getAverageBlockedThreadsByHour(24);
     }
 
+    @Override
     public Date getLastResetTime() {
         return resetTime;
     }
 
+    @Override
     public void reset() {
        avgBlockedWorkerPercentage = 0.0;
        avgUnblockedWorkerPercentage = 0.0;
@@ -322,6 +335,7 @@ public class ThreadingView implements ThreadingViewMBean {
 
     private class ThreadingDataCollectorTask implements Runnable {
 
+        @Override
         public void run() {
             samplesCount++;
 
@@ -367,6 +381,7 @@ public class ThreadingView implements ThreadingViewMBean {
     }
 
     private class LongTermDataCollectorTask implements Runnable {
+        @Override
         public void run() {
             double blocked = getBlockedWorkerPercentage();
 
diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/util/TemporaryData.java b/modules/commons/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
index 920769ccf..f2e2600b3 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/util/TemporaryData.java
@@ -50,6 +50,7 @@ public class TemporaryData {
         
         private FileOutputStream fileOutputStream;
         
+        @Override
         public void write(byte[] b, int off, int len) throws IOException {
 
             if (fileOutputStream != null) {
@@ -86,20 +87,24 @@ public class TemporaryData {
             }
         }
 
+        @Override
         public void write(byte[] b) throws IOException {
             write(b, 0, b.length);
         }
 
+        @Override
         public void write(int b) throws IOException {
             write(new byte[] { (byte)b }, 0, 1);
         }
 
+        @Override
         public void flush() throws IOException {
             if (fileOutputStream != null) {
                 fileOutputStream.flush();
             }
         }
 
+        @Override
         public void close() throws IOException {
             if (fileOutputStream != null) {
                 fileOutputStream.close();
@@ -114,10 +119,12 @@ public class TemporaryData {
         private int markChunkIndex;
         private int markChunkOffset;
         
+        @Override
         public int available() throws IOException {
             return (chunkIndex-currentChunkIndex)*chunkSize + chunkOffset - currentChunkOffset;
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
 
             if (len == 0) {
@@ -158,29 +165,35 @@ public class TemporaryData {
             }
         }
 
+        @Override
         public int read(byte[] b) throws IOException {
             return read(b, 0, b.length);
         }
 
+        @Override
         public int read() throws IOException {
             byte[] b = new byte[1];
             return read(b) == -1 ? -1 : (int)b[0] & 0xFF;
         }
 
+        @Override
         public boolean markSupported() {
             return true;
         }
 
+        @Override
         public void mark(int readlimit) {
             markChunkIndex = currentChunkIndex;
             markChunkOffset = currentChunkOffset;
         }
 
+        @Override
         public void reset() throws IOException {
             currentChunkIndex = markChunkIndex;
             currentChunkOffset = markChunkOffset;
         }
 
+        @Override
         public long skip(long n) throws IOException {
 
             int available = available();
@@ -192,6 +205,7 @@ public class TemporaryData {
             return c;
         }
         
+        @Override
         public void close() throws IOException {
         }
     }
diff --git a/modules/commons/src/test/java/org/apache/synapse/commons/executors/DummyTask.java b/modules/commons/src/test/java/org/apache/synapse/commons/executors/DummyTask.java
index c90beaa7a..747fe1504 100644
--- a/modules/commons/src/test/java/org/apache/synapse/commons/executors/DummyTask.java
+++ b/modules/commons/src/test/java/org/apache/synapse/commons/executors/DummyTask.java
@@ -28,16 +28,20 @@ public class DummyTask implements Importance, Runnable {
         this.priority = priority;
     }
 
+    @Override
     public int getPriority() {
         return priority;
     }
 
+    @Override
     public void setPriority(int p) {
         this.priority = p;
     }
 
+    @Override
     public void setProperty(String name, Object value) {}
 
+    @Override
     public Object getProperty(String name) {
         return null;
     }
@@ -50,6 +54,7 @@ public class DummyTask implements Importance, Runnable {
         this.mark = mark;
     }
 
+    @Override
     public void run() {
     
     }
diff --git a/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueStressTest.java b/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueStressTest.java
index 5f2c6fb69..9c3f638ae 100644
--- a/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueStressTest.java
+++ b/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueStressTest.java
@@ -168,6 +168,7 @@ public class MultiPriorityBlockingQueueStressTest extends MultiPriorityBlockingQ
 
             }
 
+            @Override
             public void run() {
                 for (int i = 0; i < max; i++) {
                     boolean offer = queue.offer(new DummyTask(priority));
@@ -193,6 +194,7 @@ public class MultiPriorityBlockingQueueStressTest extends MultiPriorityBlockingQ
             this.max = max;
         }
 
+        @Override
         public void run() {
             for (int i = 0; i < max; i++) {
                 try {
diff --git a/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueTest.java b/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueTest.java
index 1cdcd180d..5555041b5 100644
--- a/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueTest.java
+++ b/modules/commons/src/test/java/org/apache/synapse/commons/executors/MultiPriorityBlockingQueueTest.java
@@ -120,6 +120,7 @@ public class MultiPriorityBlockingQueueTest extends MultiPriorityBlockingQueueAb
         assertEquals(ITEMS * 2, fixedQueue.size());
 
         Thread t = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     fixedQueue.put(new DummyTask(10));
@@ -138,6 +139,7 @@ public class MultiPriorityBlockingQueueTest extends MultiPriorityBlockingQueueAb
         t.interrupt();
 
         t = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     fixedQueue.put(new DummyTask(10));
diff --git a/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java b/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
index 46888e085..f4af7fb6a 100644
--- a/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
+++ b/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
@@ -115,6 +115,7 @@ public class Axis2SynapseController implements SynapseController {
      * @param serverContextInformation       Server Context if the Axis2 Based Server
      *                                       Environment has been already set up.
      */
+    @Override
     public void init(ServerConfigurationInformation serverConfigurationInformation,
                      ServerContextInformation serverContextInformation) {
 
@@ -262,6 +263,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void destroy() {
 
         try {
@@ -293,6 +295,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isInitialized() {
         return initialized;
     }
@@ -301,6 +304,7 @@ public class Axis2SynapseController implements SynapseController {
      * Adds the synapse handlers to the inflow Dispatch phase and starts the listener manager
      * if the axis2 instance is created by the Synapse
      */
+    @Override
     public void start() {
 
         // add the Synapse handlers
@@ -356,6 +360,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void startMaintenance() {
         log.info("Putting transport listeners, senders and tasks into maintenance mode..");
 
@@ -376,6 +381,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void endMaintenance() {
         log.info("Resuming transport listeners, senders and tasks from maintenance mode...");
 
@@ -396,6 +402,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * Cleanup the axis2 environment and stop the synapse environment.
      */
+    @Override
     public void stop() {
         try {
             // stop tasks
@@ -474,6 +481,7 @@ public class Axis2SynapseController implements SynapseController {
      *
      * @return SynapseEnvironment instance
      */
+    @Override
     public SynapseEnvironment createSynapseEnvironment() {
         synapseEnvironment = new Axis2SynapseEnvironment(
             configurationContext, synapseConfiguration, serverContextInformation);
@@ -513,6 +521,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * Destroys the Synapse Environment by undeploying all Axis2 services.
      */
+    @Override
     public void destroySynapseEnvironment() {
         if (synapseEnvironment != null) {
             try {
@@ -529,6 +538,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public SynapseConfiguration createSynapseConfiguration() {
 
         String synapseXMLLocation = serverConfigurationInformation.getSynapseXMLLocation();
@@ -581,6 +591,7 @@ public class Axis2SynapseController implements SynapseController {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void destroySynapseConfiguration() {
         if (synapseConfiguration != null) {
             synapseConfiguration.destroy();
@@ -601,6 +612,7 @@ public class Axis2SynapseController implements SynapseController {
      * @return true, if a safe state is reached before the specified <code>endTime</code>,
      *         otherwise false (forceful stop required)
      */
+    @Override
     public boolean waitUntilSafeToStop(long waitIntervalMillis, long endTime) {
 
         boolean safeToStop = false;
@@ -668,6 +680,7 @@ public class Axis2SynapseController implements SynapseController {
         return !forcefulStop;
     }
 
+    @Override
     public Object getContext() {
         return configurationContext;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java b/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java
index f910b41b9..9a86d5072 100644
--- a/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/synapse/SecretManagerAdminMBeanImpl.java
@@ -41,10 +41,12 @@ public class SecretManagerAdminMBeanImpl extends StandardMBean implements Secret
     /**
      * @see SecretManagerAdminMBean
      */
+    @Override
     public void init() {
         this.secretManager.init(SynapsePropertiesLoader.loadSynapseProperties());
     }
 
+    @Override
     public void shutDown() {
         this.secretManager.shoutDown();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java b/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java
index d67032ede..323081990 100644
--- a/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java
+++ b/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java
@@ -241,6 +241,7 @@ public class ServerConfigurationInformation {
         this.synapseDebug = synapseDebug;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("[ Synapse Debug Mode: ").append(synapseDebug).append(" ]");
diff --git a/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java b/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
index bbaf381cc..1974a998f 100644
--- a/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
+++ b/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
@@ -37,6 +37,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getServerState() {
         return serverManager.getServerState().toString();
     }
@@ -44,6 +45,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void start()  throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
@@ -57,6 +59,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void stop() throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
@@ -70,6 +73,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void restart() throws Exception {
         try {
             log.info("Re-starting Synapse ..");
@@ -84,6 +88,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void shutdown() throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
@@ -100,6 +105,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
      * @param waitSeconds number of seconds to wait for a graceful stop before initiating
      *                    a hard stop
      */
+    @Override
     public void stopGracefully(long waitSeconds) throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
@@ -113,6 +119,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void startMaintenance() throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
@@ -126,6 +133,7 @@ public class ServerManagerView implements ServerManagerViewMBean {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void endMaintenance() throws Exception {
         try {
             Thread.currentThread().setContextClassLoader(serverManager.getClassLoader());
diff --git a/modules/core/src/main/java/org/apache/synapse/ServerState.java b/modules/core/src/main/java/org/apache/synapse/ServerState.java
index fc60fcb9a..b027d87ac 100644
--- a/modules/core/src/main/java/org/apache/synapse/ServerState.java
+++ b/modules/core/src/main/java/org/apache/synapse/ServerState.java
@@ -25,36 +25,42 @@ package org.apache.synapse;
 public enum ServerState {
 
     UNDETERMINED {
+        @Override
         public String toString() {
             return "UNDETERMINED";
         }
     },
 
     INITIALIZABLE {
+        @Override
         public String toString() {
             return "INITIALIZABLE";
         }
     },
     
     INITIALIZED {
+        @Override
         public String toString() {
             return "INITIALIZED";
         }
     },
     
     MAINTENANCE {
+        @Override
         public String toString() {
             return "MAINTENANCE";
         }
     },
 
     STARTED {
+        @Override
         public String toString() {
             return "STARTED";
         }
     },
 
     STOPPED {
+        @Override
         public String toString() {
             return "STOPPED";
         }
diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseServer.java b/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
index 2c7de11b3..6fe3c71eb 100644
--- a/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
+++ b/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
@@ -82,6 +82,7 @@ public class SynapseServer {
 
     private static void addShutdownHook() {
         Thread shutdownHook = new Thread() {
+            @Override
             public void run() {
                 log.info("Shutting down Apache Synapse...");
                 try {
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java b/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java
index 9d0b0550e..976ea4c27 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfiguration.java
@@ -36,22 +36,26 @@ public class AspectConfiguration implements StatisticsConfigurable, Identifiable
         this.id = id;
     }
 
+    @Override
     public boolean isStatisticsEnable() {
         return statisticsEnable;
     }
 
+    @Override
     public void disableStatistics() {
         if (statisticsEnable) {
             this.statisticsEnable = false;
         }
     }
 
+    @Override
     public void enableStatistics() {
         if (!statisticsEnable) {
             statisticsEnable = true;
         }
     }
 
+    @Override
     public String getId() {
         return id;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java
index da970d32f..8add4878f 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsRecord.java
@@ -119,6 +119,7 @@ public class StatisticsRecord {
         isEndReported = endReported;
     }
 
+    @Override
     public String toString() {
         return new StringBuilder()
                 .append("[Message id : ").append(id).append(" ]")
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
index cdaac6a69..c40ac094e 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
@@ -40,6 +40,7 @@ public class StatisticsView implements StatisticsViewMBean {
         this.collector = collector;
     }
 
+    @Override
     public List<String> getSystemEndpointStats(String id) {
         return getAsList(
                 this.systemViewStrategy.determineView(id,
@@ -47,12 +48,14 @@ public class StatisticsView implements StatisticsViewMBean {
                         ComponentType.ENDPOINT));
     }
 
+    @Override
     public List<String> getSystemSequenceStats(String id) {
         return getAsList(this.systemViewStrategy.determineView(id,
                 collector.getStatisticsRecords(),
                 ComponentType.SEQUENCE));
     }
 
+    @Override
     public List<String> getSystemProxyServiceStats(String id) {
         return getAsList(this.systemViewStrategy.determineView(id,
                 collector.getStatisticsRecords(),
@@ -60,18 +63,21 @@ public class StatisticsView implements StatisticsViewMBean {
 
     }
 
+    @Override
     public List<String> getSystemEndpointsStats() {
         return getAllStatsAsList(
                 this.systemViewStrategy.determineView(collector.getStatisticsRecords(),
                         ComponentType.ENDPOINT));
     }
 
+    @Override
     public List<String> getSystemSequencesStats() {
         return getAllStatsAsList(
                 this.systemViewStrategy.determineView(collector.getStatisticsRecords(),
                         ComponentType.SEQUENCE));
     }
 
+    @Override
     public List<String> getSystemProxyServicesStats() {
         return getAllStatsAsList(
                 this.systemViewStrategy.determineView(collector.getStatisticsRecords(),
@@ -79,6 +85,7 @@ public class StatisticsView implements StatisticsViewMBean {
 
     }
 
+    @Override
     public void clearAllStatistics() {
         this.collector.clearStatistics();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/InOutStatisticsView.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/InOutStatisticsView.java
index 33ec6f365..601a8cdfd 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/InOutStatisticsView.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/InOutStatisticsView.java
@@ -64,6 +64,7 @@ public class InOutStatisticsView {
         return componentType;
     }
 
+    @Override
     public String toString() {
 
         StringBuffer sb = new StringBuffer();
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserDomainViewStrategy.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserDomainViewStrategy.java
index 9c6f2ce3f..bc90b692e 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserDomainViewStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserDomainViewStrategy.java
@@ -29,12 +29,14 @@ import java.util.Map;
  */
 public class PerUserDomainViewStrategy extends PerUserViewStrategy {
 
+    @Override
     public Map<String, Map<String, InOutStatisticsView>> determineView(
             List<StatisticsRecord> statisticsRecords,
             ComponentType type) {
         return determineView(statisticsRecords, type, DOMAIN);
     }
 
+    @Override
     public Map<String, InOutStatisticsView> determineView(
             String id, List<StatisticsRecord> statisticsRecords,
             ComponentType type) {
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserIPViewStrategy.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserIPViewStrategy.java
index 1febc7164..bb2ed74d5 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserIPViewStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/PerUserIPViewStrategy.java
@@ -29,12 +29,14 @@ import java.util.Map;
  */
 public class PerUserIPViewStrategy extends PerUserViewStrategy {
 
+    @Override
     public Map<String, Map<String, InOutStatisticsView>> determineView(
             List<StatisticsRecord> statisticsRecords,
             ComponentType type) {
         return determineView(statisticsRecords, type, IP);
     }
 
+    @Override
     public Map<String, InOutStatisticsView> determineView(
             String id, List<StatisticsRecord> statisticsRecords, ComponentType type) {
         return determineView(id, statisticsRecords,
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/Statistics.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/Statistics.java
index 73409d0cd..7d923d2be 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/Statistics.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/Statistics.java
@@ -151,6 +151,7 @@ public class Statistics {
         }
     }
 
+    @Override
     public String toString() {
         return new StringBuffer()
                 .append("[Avg Processing Time : ").append(avgProcessingTime).append(" ]")
diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/SystemViewStrategy.java b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/SystemViewStrategy.java
index a278285af..f817d89e3 100644
--- a/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/SystemViewStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/aspects/statistics/view/SystemViewStrategy.java
@@ -37,6 +37,7 @@ public class SystemViewStrategy implements StatisticsViewStrategy {
 
     private static final Log log = LogFactory.getLog(SystemViewStrategy.class);
 
+    @Override
     public Map<String, Map<String, InOutStatisticsView>> determineView(
             List<StatisticsRecord> statisticsRecords,
             ComponentType type) {
@@ -78,6 +79,7 @@ public class SystemViewStrategy implements StatisticsViewStrategy {
     }
 
 
+    @Override
     public Map<String, InOutStatisticsView> determineView(String id,
                                                           List<StatisticsRecord> statisticsRecords,
                                                           ComponentType type) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/AbstractSynapseObserver.java b/modules/core/src/main/java/org/apache/synapse/config/AbstractSynapseObserver.java
index e581beb77..d1cc15596 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/AbstractSynapseObserver.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/AbstractSynapseObserver.java
@@ -38,81 +38,97 @@ public abstract class AbstractSynapseObserver implements SynapseObserver {
         log = LogFactory.getLog(this.getClass()); 
     }
 
+    @Override
     public void sequenceAdded(Mediator sequence) {
         log.info("Sequence : " + ((SequenceMediator) sequence).getName() + " was added " +
                 "to the Synapse configuration successfully" );
     }
 
+    @Override
     public void sequenceRemoved(Mediator sequence) {
         log.info("Sequence : " + ((SequenceMediator) sequence).getName() + " was  removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void sequenceTemplateAdded(Mediator template) {
         log.info("Template : " + ((TemplateMediator) template).getName() + " was added " +
                 "to the Synapse configuration successfully" );
     }
 
+    @Override
     public void sequenceTemplateRemoved(Mediator template) {
         log.info("Template : " + ((TemplateMediator) template).getName() + " was removed " +
                 "to the Synapse configuration successfully" );
     }
 
+    @Override
     public void entryAdded(Entry entry) {
         log.info("Local entry : " + entry.getKey() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void entryRemoved(Entry entry) {
         log.info("Local entry : " + entry.getKey() + " was removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void endpointAdded(Endpoint endpoint) {
         log.info("Endpoint : " + endpoint.getName() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void endpointRemoved(Endpoint endpoint) {
         log.info("Endpoint : " + endpoint.getName() + " was removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void proxyServiceAdded(ProxyService proxy) {
         log.info("Proxy service : " + proxy.getName() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void proxyServiceRemoved(ProxyService proxy) {
         log.info("Proxy service : " + proxy.getName() + " was removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void startupAdded(Startup startup) {
         log.info("Startup : " + startup.getName() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void startupRemoved(Startup startup) {
         log.info("Startup : " + startup.getName() + " was removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void eventSourceAdded(SynapseEventSource eventSource) {
         log.info("Event source : " + eventSource.getName() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void eventSourceRemoved(SynapseEventSource eventSource) {
         log.info("Event source : " + eventSource.getName() + " was removed " +
                 "from the Synapse configuration successfully");
     }
 
+    @Override
     public void priorityExecutorAdded(PriorityExecutor exec) {
         log.info("Priority executor : " + exec.getName() + " was added " +
                 "to the Synapse configuration successfully");
     }
 
+    @Override
     public void priorityExecutorRemoved(PriorityExecutor exec) {
         log.info("Priority executor : " + exec.getName() + " was removed " +
                 "from the Synapse configuration successfully");
diff --git a/modules/core/src/main/java/org/apache/synapse/config/Entry.java b/modules/core/src/main/java/org/apache/synapse/config/Entry.java
index a46bd0dce..63fe13946 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/Entry.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/Entry.java
@@ -166,10 +166,12 @@ public class Entry implements SynapseArtifact {
         this.fileName = fileName;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
index 3d3b5c6f3..f645bb833 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
@@ -439,6 +439,7 @@ public class SynapseConfigUtils {
                     }
 
                     connection.setHostnameVerifier(new javax.net.ssl.HostnameVerifier() {
+                        @Override
                         public boolean verify(String hostname, javax.net.ssl.SSLSession session) {
                             if (log.isTraceEnabled()) {
                                 log.trace("HostName verification disabled");
diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
index 0c7dee6ae..70839237c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
@@ -1298,6 +1298,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact {
      * @param se
      *          SynapseEnvironment specifying the env to be initialized
      */
+    @Override
     public synchronized void init(SynapseEnvironment se) {
         if (initialized) {
             log.warn("Attempted to re-initialize SynapseConfiguration");
@@ -1318,6 +1319,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact {
      * This method will be called on the soft shutdown or destroying the configuration
      * and will destroy all the stateful managed parts of the configuration.
      */
+    @Override
     public synchronized void destroy() {
         if (!initialized) {
             log.warn("Attempted to destroy uninitialized SynapseConfiguration");
@@ -1739,6 +1741,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact {
      *
      * @param description tobe set to the artifact
      */
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
@@ -1748,6 +1751,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact {
      *
      * @return description of the configuration
      */
+    @Override
     public String getDescription() {
         return description;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
index 2515481e2..e1a97ea35 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
@@ -85,6 +85,7 @@ public abstract class AbstractMediatorFactory implements MediatorFactory {
      * @param elem configuration element of the mediator to be built
      * @return built mediator using the above element
      */
+    @Override
     public final Mediator createMediator(OMElement elem, Properties properties) {
         Mediator mediator = createSpecificMediator(elem, properties);
         OMElement descElem = elem.getFirstChildWithName(DESCRIPTION_Q);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
index 6d9256017..bfdb401ae 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
@@ -79,6 +79,7 @@ public abstract class AbstractMediatorSerializer implements MediatorSerializer {
      * @param m mediator to be serialized
      * @return the serialized Element
      */
+    @Override
     public final OMElement serializeMediator(OMElement parent, Mediator m) {
 
         if (m instanceof AnonymousListMediator) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
index e0fd822d5..3f8234101 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
@@ -74,6 +74,7 @@ public class AggregateMediatorFactory extends AbstractMediatorFactory {
             = new QName(XMLConfigConstants.NULL_NAMESPACE, "id");
 
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         AggregateMediator mediator = new AggregateMediator();
@@ -147,6 +148,7 @@ public class AggregateMediatorFactory extends AbstractMediatorFactory {
         return mediator;
     }
 
+    @Override
     public QName getTagQName() {
         return AGGREGATE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
index ee7ddcd27..5142d17fa 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.eip.aggregator.AggregateMediator;
  */
 public class AggregateMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         AggregateMediator mediator = null;
@@ -87,6 +88,7 @@ public class AggregateMediatorSerializer extends AbstractMediatorSerializer {
         return aggregator;
     }
 
+    @Override
     public String getMediatorClassName() {
         return AggregateMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
index 7a31a5bda..d663b9109 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
@@ -48,6 +48,7 @@ public class AnnotatedCommandMediatorFactory extends AbstractMediatorFactory {
     private static final QName ANNOTATED_COMMAND_Q =
         new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "annotatedCommand");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         AnnotatedCommandMediator pojoMediator = new AnnotatedCommandMediator();
@@ -106,6 +107,7 @@ public class AnnotatedCommandMediatorFactory extends AbstractMediatorFactory {
         return pojoMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return ANNOTATED_COMMAND_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java
index bddec6f5a..8cc860789 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java
@@ -26,7 +26,8 @@ import org.apache.synapse.MessageContext;
  */
 public class AnonymousListMediator extends AbstractListMediator {
 
-     public boolean mediate(MessageContext synCtx) {
+     @Override
+    public boolean mediate(MessageContext synCtx) {
          return super.mediate(synCtx);
      }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java
index cb18e1c2d..88895ea7d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java
@@ -33,10 +33,12 @@ public class AnonymousListMediatorSerializer extends AbstractListMediatorSeriali
      * @param m
      * @return OMElement
      */
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
         throw new UnsupportedOperationException("Anonymous list mediator has nothing specific");
     }
 
+    @Override
     public String getMediatorClassName() {
         return AnonymousListMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorFactory.java
index 317072577..8f97cd7cc 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorFactory.java
@@ -43,6 +43,7 @@ public class BeanMediatorFactory extends AbstractMediatorFactory {
     private static final QName BEAN_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "bean");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         BeanMediator mediator = new BeanMediator();
@@ -152,6 +153,7 @@ public class BeanMediatorFactory extends AbstractMediatorFactory {
         }
     }
 
+    @Override
     public QName getTagQName() {
         return BEAN_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorSerializer.java
index 5af58c82b..916dac5e3 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/BeanMediatorSerializer.java
@@ -33,6 +33,7 @@ public class BeanMediatorSerializer extends AbstractMediatorSerializer {
 
     private static final String BEAN = "bean";
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof BeanMediator)) {
@@ -126,6 +127,7 @@ public class BeanMediatorSerializer extends AbstractMediatorSerializer {
         }
     }
 
+    @Override
     public String getMediatorClassName() {
         return BeanMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorFactory.java
index abb64ef16..7fcc3685e 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorFactory.java
@@ -62,6 +62,7 @@ public class CacheMediatorFactory extends AbstractMediatorFactory {
     private static final long DEFAULT_TIMEOUT = 5000L;
     private static final int DEFAULT_DISK_CACHE_SIZE = 200;
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         if (!CACHE_Q.equals(elem.getQName())) {
@@ -182,6 +183,7 @@ public class CacheMediatorFactory extends AbstractMediatorFactory {
         }
     }
 
+    @Override
     public QName getTagQName() {
         return CACHE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java
index aa359213b..47ee420ba 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java
@@ -38,6 +38,7 @@ import org.apache.synapse.mediators.builtin.CacheMediator;
  */
 public class CacheMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof CacheMediator)) {
@@ -109,6 +110,7 @@ public class CacheMediatorSerializer extends AbstractMediatorSerializer {
         return cache;
     }
 
+    @Override
     public String getMediatorClassName() {
         return CacheMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorFactory.java
index 6a0a80648..5a70c32e5 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorFactory.java
@@ -72,6 +72,7 @@ public class CalloutMediatorFactory extends AbstractMediatorFactory {
                 = new QName(XMLConfigConstants.NULL_NAMESPACE, "inboundPolicy");
     private static final QName Q_ENDPOINT = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         CalloutMediator callout = new CalloutMediator();
@@ -197,6 +198,7 @@ public class CalloutMediatorFactory extends AbstractMediatorFactory {
         return callout;
     }
 
+    @Override
     public QName getTagQName() {
         return TAG_NAME;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
index a4f6af27d..46fd03483 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
@@ -38,6 +38,7 @@ import org.apache.synapse.mediators.builtin.CalloutMediator;
  */
 public class CalloutMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof CalloutMediator)) {
@@ -125,6 +126,7 @@ public class CalloutMediatorSerializer extends AbstractMediatorSerializer {
         return callout;
     }
 
+    @Override
     public String getMediatorClassName() {
         return CalloutMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
index 55c974440..4c67075f6 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
@@ -47,6 +47,7 @@ public class ClassMediatorFactory extends AbstractMediatorFactory {
 
     private static final QName CLASS_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "class");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         ClassMediator classMediator = new ClassMediator();
@@ -108,6 +109,7 @@ public class ClassMediatorFactory extends AbstractMediatorFactory {
         return classMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return CLASS_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
index 37cf3c390..731e13175 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
@@ -35,6 +35,7 @@ import java.util.Iterator;
  */
 public class ClassMediatorSerializer extends AbstractMediatorSerializer  {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof ClassMediator)) {
@@ -69,6 +70,7 @@ public class ClassMediatorSerializer extends AbstractMediatorSerializer  {
         return clazz;
     }
 
+    @Override
     public String getMediatorClassName() {
         return ClassMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorFactory.java
index 1798f3460..195d636ad 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorFactory.java
@@ -71,6 +71,7 @@ public class CloneMediatorFactory extends AbstractMediatorFactory {
      * @param properties
      * @return Mediator of the type CloneMediator built from the config element
      */
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
     	
     	boolean asynchronousExe = true;
@@ -111,6 +112,7 @@ public class CloneMediatorFactory extends AbstractMediatorFactory {
      *
      * @return QName of the clone element in xml configuration
      */
+    @Override
     public QName getTagQName() {
         return CLONE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java
index b0d892264..7db7d9d1a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java
@@ -52,6 +52,7 @@ public class CloneMediatorSerializer extends AbstractMediatorSerializer {
      * @param m Mediator of the type CloneMediator which is subjected to the serialization
      * @return OMElement serialized in to xml from the given parameters
      */
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         OMElement cloneElem = fac.createOMElement("clone", synNS);
@@ -82,6 +83,7 @@ public class CloneMediatorSerializer extends AbstractMediatorSerializer {
      * 
      * @return full class name of the Mediator which is serialized by this Serializer
      */
+    @Override
     public String getMediatorClassName() {
         return CloneMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
index 583a9687e..05e35472b 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
@@ -61,6 +61,7 @@ public class ConditionalRouterMediatorFactory extends AbstractMediatorFactory {
     private static final QName ASYNCHRONOUS_ATTR
             = new QName(XMLConfigConstants.NULL_NAMESPACE, "asynchronous");
     
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         ConditionalRouterMediator conditionalRouterMediator = new ConditionalRouterMediator();
@@ -127,6 +128,7 @@ public class ConditionalRouterMediatorFactory extends AbstractMediatorFactory {
         return conditionalRouterMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return CONDITIONAL_ROUTER_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
index 23e1ce8f3..79cf35219 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
@@ -39,6 +39,7 @@ import org.apache.synapse.mediators.filters.router.ConditionalRouterMediator;
  */
 public class ConditionalRouterMediatorSerializer extends AbstractMediatorSerializer {
     
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
         OMElement conditionalRouterElem = fac.createOMElement("conditionalRouter", synNS);
         saveTracingState(conditionalRouterElem, m);
@@ -88,6 +89,7 @@ public class ConditionalRouterMediatorSerializer extends AbstractMediatorSeriali
         return conditionalRouterElem;
     }
 
+    @Override
     public String getMediatorClassName() {
         return ConditionalRouterMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
index 960ad6577..f9a1522ed 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
@@ -243,6 +243,7 @@ public class ConfigurationFactoryAndSerializerFinder implements XMLToObjectMappe
      * @param properties bag of properties to pass in any information to the factory
      * @return built object
      */
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             return getConfiguration((OMElement) om, properties);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorFactory.java
index a3821ffff..651d17ec5 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorFactory.java
@@ -63,6 +63,7 @@ public class DBLookupMediatorFactory extends AbstractDBMediatorFactory {
     private static final QName DBLOOKUP_Q =
         new QName(SynapseConstants.SYNAPSE_NAMESPACE, "dblookup");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         DBLookupMediator mediator = new DBLookupMediator();
@@ -71,6 +72,7 @@ public class DBLookupMediatorFactory extends AbstractDBMediatorFactory {
         return mediator;
     }
 
+    @Override
     public QName getTagQName() {
         return DBLOOKUP_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java
index 0c80d00dd..2ded8e141 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.db.DBLookupMediator;
  */
 public class DBLookupMediatorSerializer extends AbstractDBMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof DBLookupMediator)) {
@@ -44,6 +45,7 @@ public class DBLookupMediatorSerializer extends AbstractDBMediatorSerializer {
         return dbLookup;
     }
 
+    @Override
     public String getMediatorClassName() {
         return DBLookupMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorFactory.java
index e5051edd1..3d42729c1 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorFactory.java
@@ -62,6 +62,7 @@ public class DBReportMediatorFactory extends AbstractDBMediatorFactory {
             new QName(SynapseConstants.SYNAPSE_NAMESPACE, "dbreport");
     private static final QName DBREPORT_USE_TX = new QName("useTransaction");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         DBReportMediator mediator = new DBReportMediator();
 
@@ -79,6 +80,7 @@ public class DBReportMediatorFactory extends AbstractDBMediatorFactory {
         return mediator;
     }
 
+    @Override
     public QName getTagQName() {
         return DBREPORT_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
index 07e9b6e56..276a03d27 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.db.DBReportMediator;
  */
 public class DBReportMediatorSerializer extends AbstractDBMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof DBReportMediator)) {
@@ -47,6 +48,7 @@ public class DBReportMediatorSerializer extends AbstractDBMediatorSerializer {
         return dbReport;
     }
 
+    @Override
     public String getMediatorClassName() {
         return DBReportMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
index eb86efc04..15e70d88a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
@@ -38,6 +38,7 @@ public class DropMediatorFactory extends AbstractMediatorFactory  {
 
     private static final QName DROP_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "drop");
 
+    @Override
     public Mediator createSpecificMediator(OMElement el, Properties properties) {
 
         Mediator dropMediator = new DropMediator();
@@ -48,6 +49,7 @@ public class DropMediatorFactory extends AbstractMediatorFactory  {
         return dropMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return DROP_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
index f8765cb41..a57100883 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.builtin.DropMediator;
  */
 public class DropMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof DropMediator)) {
@@ -43,6 +44,7 @@ public class DropMediatorSerializer extends AbstractMediatorSerializer {
         return drop;
     }
 
+    @Override
     public String getMediatorClassName() {
         return DropMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorFactory.java
index 1debf4f53..e5cc63ec1 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorFactory.java
@@ -50,6 +50,7 @@ public class EJBMediatorFactory extends AbstractMediatorFactory {
     private static final QName EJB_Q =
             new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "ejb");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         EJBMediator mediator = new EJBMediator();
@@ -131,6 +132,7 @@ public class EJBMediatorFactory extends AbstractMediatorFactory {
         return mediator;
     }
 
+    @Override
     public QName getTagQName() {
         return EJB_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorSerializer.java
index 69d9cd8ee..2fb2becce 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EJBMediatorSerializer.java
@@ -37,6 +37,7 @@ public class EJBMediatorSerializer extends AbstractMediatorSerializer {
 
     private static final String EJB = "ejb";
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof EJBMediator)) {
@@ -108,6 +109,7 @@ public class EJBMediatorSerializer extends AbstractMediatorSerializer {
         return mediatorElem;
     }
 
+    @Override
     public String getMediatorClassName() {
         return EJBMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorFactory.java
index 8eeee1bc7..d99bb6dda 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorFactory.java
@@ -36,6 +36,7 @@ public class EnqueueMediatorFactory extends AbstractMediatorFactory{
     public static final QName PRIORITY_ATT = new QName("priority");
     public static final QName QUEUE_ATT = new QName("executor");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         EnqueueMediator mediator = new EnqueueMediator();
 
@@ -61,6 +62,7 @@ public class EnqueueMediatorFactory extends AbstractMediatorFactory{
         return mediator;
     }
 
+    @Override
     public QName getTagQName() {
         return ENQUEUE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java
index d3058af36..a45bc2ff2 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java
@@ -25,6 +25,7 @@ import org.apache.synapse.mediators.builtin.EnqueueMediator;
 
 public class EnqueueMediatorSerializer extends AbstractMediatorSerializer{
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
         assert m instanceof EnqueueMediator :
                 "Unsupported mediator passed in for serialization : " + m.getType();
@@ -55,6 +56,7 @@ public class EnqueueMediatorSerializer extends AbstractMediatorSerializer{
         return enqueue;
     }
 
+    @Override
     public String getMediatorClassName() {
         return EnqueueMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
index 7ec88454c..303d3884b 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
@@ -183,6 +183,7 @@ public class EnrichMediatorFactory extends AbstractMediatorFactory {
         return -1;
     }
 
+    @Override
     public QName getTagQName() {
         return XML_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
index 56fc6c3f5..de4281ebb 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
@@ -116,6 +116,7 @@ public class EnrichMediatorSerializer extends AbstractMediatorSerializer {
         return null;
     }
 
+    @Override
     public String getMediatorClassName() {
         return EnrichMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
index 4dab3f00c..5e2d1312d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
@@ -125,6 +125,7 @@ public class EntryFactory implements XMLToObjectMapper {
         throw new SynapseException(msg);
     }
 
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             return createEntry((OMElement) om, properties);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
index e9d5ae0a9..1070dd2c0 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
@@ -69,6 +69,7 @@ public class FaultMediatorFactory extends AbstractMediatorFactory  {
     private static final String SOAP12 = "soap12";
     private static final String POX = "pox";
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         FaultMediator faultMediator = new FaultMediator();
@@ -205,6 +206,7 @@ public class FaultMediatorFactory extends AbstractMediatorFactory  {
         return faultMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return FAULT_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
index 6b4d89c26..c0381f0bd 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
@@ -37,6 +37,7 @@ public class FaultMediatorSerializer extends AbstractMediatorSerializer {
 
     private static final String POX = "pox";
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof FaultMediator)) {
@@ -127,6 +128,7 @@ public class FaultMediatorSerializer extends AbstractMediatorSerializer {
         return fault;
     }
 
+    @Override
     public String getMediatorClassName() {
         return FaultMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
index 330fb87c3..9157fac80 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
@@ -60,6 +60,7 @@ public class FilterMediatorFactory extends AbstractListMediatorFactory {
     private static final QName THEN_Q = new QName(SynapseConstants.SYNAPSE_NAMESPACE, "then");
     private static final QName ELSE_Q = new QName(SynapseConstants.SYNAPSE_NAMESPACE, "else");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         
         FilterMediator filter = new FilterMediator();
@@ -163,6 +164,7 @@ public class FilterMediatorFactory extends AbstractListMediatorFactory {
         return filter;
     }
 
+    @Override
     public QName getTagQName() {
         return FILTER_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
index 73ca02b73..77f722f2e 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
@@ -46,6 +46,7 @@ import org.apache.synapse.mediators.filters.FilterMediator;
  */
 public class FilterMediatorSerializer extends AbstractListMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof FilterMediator)) {
@@ -105,6 +106,7 @@ public class FilterMediatorSerializer extends AbstractListMediatorSerializer {
         return filter;
     }
 
+    @Override
     public String getMediatorClassName() {
         return FilterMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
index 2d70eab75..290b9684f 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
@@ -50,6 +50,7 @@ public class HeaderMediatorFactory extends AbstractMediatorFactory  {
     private static final QName ATT_ACTION = new QName("action");
     private static final QName ATT_SCOPE = new QName("scope");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         HeaderMediator headerMediator = new HeaderMediator();
@@ -154,6 +155,7 @@ public class HeaderMediatorFactory extends AbstractMediatorFactory  {
         return (elem.getChildElements() != null && elem.getChildElements().hasNext());
     }
 
+    @Override
     public QName getTagQName() {
         return HEADER_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
index 3d6054834..72a14c0d1 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
  */
 public class HeaderMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof HeaderMediator)) {
@@ -88,6 +89,7 @@ public class HeaderMediatorSerializer extends AbstractMediatorSerializer {
         return header;
     }
 
+    @Override
     public String getMediatorClassName() {
         return HeaderMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
index 9dc985154..140d5304f 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
@@ -40,6 +40,7 @@ public class InMediatorFactory extends AbstractListMediatorFactory {
 
     private static final QName IN_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "in");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         InMediator filter = new InMediator();
         // after successfully creating the mediator
@@ -49,6 +50,7 @@ public class InMediatorFactory extends AbstractListMediatorFactory {
         return filter;
     }
 
+    @Override
     public QName getTagQName() {
         return IN_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
index 1810eb7c3..3df8ba06d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.filters.InMediator;
  */
 public class InMediatorSerializer extends AbstractListMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof InMediator)) {
@@ -45,6 +46,7 @@ public class InMediatorSerializer extends AbstractListMediatorSerializer {
         return in;
     }
 
+    @Override
     public String getMediatorClassName() {
         return InMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
index b287539e9..0a175da1a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
@@ -82,6 +82,7 @@ public class InvokeMediatorFactory extends AbstractMediatorFactory {
     }
 
 
+    @Override
     public QName getTagQName() {
         return INVOKE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
index a10206ea4..47763febc 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
@@ -73,6 +73,7 @@ public class InvokeMediatorSerializer extends AbstractMediatorSerializer {
 
     }
 
+    @Override
     public String getMediatorClassName() {
         return InvokeMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java
index d8dd401c2..318f8afec 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorFactory.java
@@ -75,6 +75,7 @@ public class IterateMediatorFactory extends AbstractMediatorFactory {
      * @param properties properties passed
      * @return IterateMediator created from the given configuration
      */
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         IterateMediator mediator = new IterateMediator();
@@ -153,6 +154,7 @@ public class IterateMediatorFactory extends AbstractMediatorFactory {
      *
      * @return QName specifying the IterateMediator tag name of the xml configuration
      */
+    @Override
     public QName getTagQName() {
         return ITERATE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java
index f609346c7..b54de6bb8 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java
@@ -53,6 +53,7 @@ public class IterateMediatorSerializer extends AbstractMediatorSerializer {
      *
      * @return OMElement describing the serialized configuration of the IterateMediator
      */
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof IterateMediator)) {
@@ -100,6 +101,7 @@ public class IterateMediatorSerializer extends AbstractMediatorSerializer {
      *
      * @return String representing the full class name of the mediator
      */
+    @Override
     public String getMediatorClassName() {
         return IterateMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
index 9b6d9cff8..1108a0c7a 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
@@ -53,10 +53,12 @@ public class LogMediatorFactory extends AbstractMediatorFactory  {
     private static final QName ATT_SEPERATOR = new QName("separator");
     private static final QName ATT_CATEGORY = new QName("category");
 
+    @Override
     public QName getTagQName() {
         return LOG_Q;
     }
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         LogMediator logMediator = new LogMediator();
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
index 2a8ef7eb0..f20662e2d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
@@ -32,6 +32,7 @@ import org.apache.synapse.mediators.builtin.LogMediator;
  */
 public class LogMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof LogMediator)) {
@@ -78,6 +79,7 @@ public class LogMediatorSerializer extends AbstractMediatorSerializer {
         return log;
     }
 
+    @Override
     public String getMediatorClassName() {
         return LogMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorFactory.java
index d112b4cbf..758b5e2b5 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorFactory.java
@@ -36,6 +36,7 @@ public class LoopbackMediatorFactory extends AbstractMediatorFactory {
         return loopBackMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return LoopBack_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorSerializer.java
index 81dae16c8..3de61d597 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/LoopbackMediatorSerializer.java
@@ -37,6 +37,7 @@ public class LoopbackMediatorSerializer extends AbstractMediatorSerializer {
         return loopBack;
     }
 
+    @Override
     public String getMediatorClassName() {
         return LoopbackMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
index 5b629dfdc..9bdfd7533 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
@@ -218,6 +218,7 @@ public class MediatorFactoryFinder implements XMLToObjectMapper {
      * @param om node from which the object is expected
      * @return Object buit from the om node
      */
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             return getMediator((OMElement) om, properties);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorFactory.java
index b1b4e7d2d..3125a8470 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorFactory.java
@@ -68,6 +68,7 @@ public class MessageStoreMediatorFactory extends AbstractMediatorFactory{
         return messageStoreMediator;
     }
 
+    @Override
     public QName getTagQName() {
        return STORE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorSerializer.java
index 014ef5601..923ae276f 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/MessageStoreMediatorSerializer.java
@@ -78,6 +78,7 @@ public class MessageStoreMediatorSerializer extends AbstractMediatorSerializer {
 
     }
 
+    @Override
     public String getMediatorClassName() {
         return MessageStoreMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
index a37d6530b..eba3327d9 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
@@ -39,6 +39,7 @@ public class OutMediatorFactory extends AbstractListMediatorFactory {
 
     private static final QName OUT_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "out");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         OutMediator filter = new OutMediator();
 
@@ -50,6 +51,7 @@ public class OutMediatorFactory extends AbstractListMediatorFactory {
         return filter;
     }
 
+    @Override
     public QName getTagQName() {
         return OUT_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
index 766818937..69c6f1cf3 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
@@ -25,6 +25,7 @@ import org.apache.synapse.mediators.filters.OutMediator;
 
 public class OutMediatorSerializer extends AbstractListMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof OutMediator)) {
@@ -39,6 +40,7 @@ public class OutMediatorSerializer extends AbstractListMediatorSerializer {
         return out;
     }
 
+    @Override
     public String getMediatorClassName() {
         return OutMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
index 087682187..065d995fa 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
@@ -64,6 +64,7 @@ public class POJOCommandMediatorFactory extends AbstractMediatorFactory {
     protected static final String RAUM_ACTION = "ReadAndUpdateMessage";
     protected static final String RAUC_ACTION = "ReadAndUpdateContext";
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         POJOCommandMediator pojoMediator = new POJOCommandMediator();
@@ -233,6 +234,7 @@ public class POJOCommandMediatorFactory extends AbstractMediatorFactory {
         }
     }
 
+    @Override
     public QName getTagQName() {
         return POJO_COMMAND_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
index 0a464c737..43aedf8bb 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.ext.POJOCommandMediator;
  */
 public class POJOCommandMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
         
         if (!(m instanceof POJOCommandMediator)) {
@@ -139,6 +140,7 @@ public class POJOCommandMediatorSerializer extends AbstractMediatorSerializer {
             m.getMessageSetterProperties().containsKey(propName);
     }
 
+    @Override
     public String getMediatorClassName() {
         return POJOCommandMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorFactory.java
index 4bc31a2c0..a9df9e949 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorFactory.java
@@ -50,6 +50,7 @@ public class PayloadFactoryMediatorFactory extends AbstractMediatorFactory {
     private static final QName FORMAT_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "format");
     private static final QName ARGS_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "args");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         PayloadFactoryMediator payloadFactoryMediator = new PayloadFactoryMediator();
@@ -102,6 +103,7 @@ public class PayloadFactoryMediatorFactory extends AbstractMediatorFactory {
         return payloadFactoryMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return PAYLOAD_FACTORY_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorSerializer.java
index 99ff91edd..4ee996ec0 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/PayloadFactoryMediatorSerializer.java
@@ -42,6 +42,7 @@ public class PayloadFactoryMediatorSerializer extends AbstractMediatorSerializer
     private static final String EXPRESSION = "expression";
 
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof PayloadFactoryMediator)) {
@@ -90,6 +91,7 @@ public class PayloadFactoryMediatorSerializer extends AbstractMediatorSerializer
         return payloadFactoryElem;
     }
 
+    @Override
     public String getMediatorClassName() {
         return PayloadFactoryMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
index e5df84aab..c586dc51c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
@@ -46,6 +46,7 @@ public class PropertyMediatorFactory extends AbstractMediatorFactory {
     private static final QName ATT_PATTERN = new QName("pattern");
     private static final QName ATT_GROUP = new QName("group");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         PropertyMediator propMediator = new PropertyMediator();
@@ -139,6 +140,7 @@ public class PropertyMediatorFactory extends AbstractMediatorFactory {
         return propMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return PROP_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
index c589afee6..29992d9c4 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
@@ -32,6 +32,7 @@ import org.apache.synapse.mediators.builtin.PropertyMediator;
  */
 public class PropertyMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof PropertyMediator)) {
@@ -87,6 +88,7 @@ public class PropertyMediatorSerializer extends AbstractMediatorSerializer {
         return property;
     }
 
+    @Override
     public String getMediatorClassName() {
         return PropertyMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorFactory.java
index 9cd156dd8..4244a56bd 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorFactory.java
@@ -44,6 +44,7 @@ public class RespondMediatorFactory extends AbstractMediatorFactory {
         return responseMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return Respond_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorSerializer.java
index 4f5033079..199516c82 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/RespondMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.builtin.RespondMediator;
  */
 public class RespondMediatorSerializer extends AbstractMediatorSerializer{
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
         if (!(m instanceof RespondMediator)) {
             handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -40,6 +41,7 @@ public class RespondMediatorSerializer extends AbstractMediatorSerializer{
         return respond;
     }
 
+    @Override
     public String getMediatorClassName() {
         return RespondMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java
index 96efe2a14..03dc62037 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java
@@ -56,6 +56,7 @@ public class SamplingThrottleMediatorFactory extends AbstractMediatorFactory {
     private static final QName CLASS_ATTR
             = new QName(XMLConfigConstants.NULL_NAMESPACE, "class");
 
+    @Override
     public Mediator createSpecificMediator(OMElement omElement, Properties properties) {
 
         SamplingThrottleMediator samplingThrottleMediator = new SamplingThrottleMediator();
@@ -122,6 +123,7 @@ public class SamplingThrottleMediatorFactory extends AbstractMediatorFactory {
         return samplingThrottleMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return SAMPLER_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java
index a528cde87..c70f836a7 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java
@@ -33,6 +33,7 @@ import org.apache.synapse.mediators.eip.sample.SamplingThrottleMediator;
  */
 public class SamplingThrottleMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator mediator) {
         OMElement samplerElem = fac.createOMElement("sampler", synNS);
         saveTracingState(samplerElem, mediator);
@@ -69,6 +70,7 @@ public class SamplingThrottleMediatorSerializer extends AbstractMediatorSerializ
         return samplerElem;
     }
 
+    @Override
     public String getMediatorClassName() {
         return SamplingThrottleMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
index 6a4633c24..c78a48036 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
@@ -80,6 +80,7 @@ public class SendMediatorFactory extends AbstractMediatorFactory  {
     private static final QName ENDPOINT_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint");
     private static final QName RECEIVING_SEQUENCE = new QName(XMLConfigConstants.RECEIVE);
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         SendMediator sm =  new SendMediator();
@@ -108,6 +109,7 @@ public class SendMediatorFactory extends AbstractMediatorFactory  {
         return sm;
     }
 
+    @Override
     public QName getTagQName() {
         return SEND_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
index be8a57de4..7b56557bb 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
@@ -33,6 +33,7 @@ import org.apache.synapse.endpoints.Endpoint;
  */
 public class SendMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof SendMediator)) {
@@ -57,6 +58,7 @@ public class SendMediatorSerializer extends AbstractMediatorSerializer {
         return send;
     }
 
+    @Override
     public String getMediatorClassName() {
         return SendMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
index 14f217984..46dc18b31 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
@@ -51,6 +51,7 @@ public class SequenceMediatorFactory extends AbstractListMediatorFactory {
     private static final QName SEQUENCE_Q
         = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "sequence");
 
+    @Override
     public QName getTagQName() {
         return SEQUENCE_Q;
     }
@@ -70,6 +71,7 @@ public class SequenceMediatorFactory extends AbstractListMediatorFactory {
         return seqMediator;
     }
     
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         SequenceMediator seqMediator = new SequenceMediator();
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
index 044354b5c..e9ecb6bab 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
@@ -50,6 +50,7 @@ public class SequenceMediatorSerializer extends AbstractListMediatorSerializer {
         return sequence;
     }
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof SequenceMediator)) {
@@ -90,6 +91,7 @@ public class SequenceMediatorSerializer extends AbstractListMediatorSerializer {
         return sequence;
     }
 
+    @Override
     public String getMediatorClassName() {
         return SequenceMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java b/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
index 1359f4659..bb5c552e2 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
@@ -228,6 +228,7 @@ public class StartupFinder implements XMLToObjectMapper {
      * @param properties bag of properties with additional information
      * @return startup created
      */
+    @Override
     public Startup getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             return getStartup((OMElement) om, properties);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
index 59ccde587..3ef56aef9 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCase.java
@@ -48,10 +48,12 @@ public class SwitchCase implements ManagedLifecycle {
      */
     private AnonymousListMediator caseMediator;
 
+    @Override
     public void init(SynapseEnvironment se) {
         caseMediator.init(se);
     }
 
+    @Override
     public void destroy() {
         caseMediator.destroy();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
index 6da9748fa..dcc24aab1 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
@@ -56,6 +56,7 @@ public class SwitchMediatorFactory extends AbstractMediatorFactory {
     private static final QName DEFAULT_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "default");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         SwitchMediator switchMediator = new SwitchMediator();
@@ -111,6 +112,7 @@ public class SwitchMediatorFactory extends AbstractMediatorFactory {
         return switchMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return SWITCH_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
index e27b7d346..9e2a8e675 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.filters.SwitchMediator;
  */
 public class SwitchMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof SwitchMediator)) {
@@ -76,6 +77,7 @@ public class SwitchMediatorSerializer extends AbstractMediatorSerializer {
         return switchMed;
     }
 
+    @Override
     public String getMediatorClassName() {
         return SwitchMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
index 43b592355..4e8159d32 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
@@ -40,10 +40,12 @@ public class SynapseMediatorFactory extends AbstractListMediatorFactory {
 
     private final static QName RULES_Q = new QName(SynapseConstants.SYNAPSE_NAMESPACE, "rules");
 
+    @Override
     public QName getTagQName() {
         return RULES_Q;
     }
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         SynapseMediator sm = new SynapseMediator();
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
index 356f4e95a..0616b75a9 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
@@ -32,6 +32,7 @@ import org.apache.synapse.mediators.base.SynapseMediator;
  */
 public class SynapseMediatorSerializer extends AbstractListMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof SynapseMediator)) {
@@ -47,6 +48,7 @@ public class SynapseMediatorSerializer extends AbstractListMediatorSerializer {
         return rules;
     }
 
+    @Override
     public String getMediatorClassName() {
         return SynapseMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
index a748741d7..2768f60e7 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
@@ -57,6 +57,7 @@ public class SynapseXMLConfigurationFactory implements ConfigurationFactory {
 
     private static Log log = LogFactory.getLog(SynapseXMLConfigurationFactory.class);
 
+    @Override
     public SynapseConfiguration getConfiguration(OMElement definitions, Properties properties) {
 
         if (!definitions.getQName().equals(XMLConfigConstants.DEFINITIONS_ELT)) {
@@ -366,11 +367,13 @@ public class SynapseXMLConfigurationFactory implements ConfigurationFactory {
         throw new SynapseException(msg);
     }
 
+    @Override
     public QName getTagQName() {
 
         return XMLConfigConstants.DEFINITIONS_ELT;
     }
 
+    @Override
     public Class getSerializerClass() {
         return SynapseXMLConfigurationSerializer.class;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
index be25d6eb4..7ec69da5b 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
@@ -68,6 +68,7 @@ public class SynapseXMLConfigurationSerializer implements ConfigurationSerialize
      * @return serialized element of the configuration
      */
 
+    @Override
     public OMElement serializeConfiguration(SynapseConfiguration synCfg) {
 
         OMElement definitions = fac.createOMElement("definitions", synNS);
@@ -240,6 +241,7 @@ public class SynapseXMLConfigurationSerializer implements ConfigurationSerialize
         throw new SynapseException(msg);
     }
 
+    @Override
     public QName getTagQName() {
         return XMLConfigConstants.DEFINITIONS_ELT;
 	}
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorFactory.java
index af2aad3c0..e37d794e0 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorFactory.java
@@ -43,6 +43,7 @@ public class TemplateMediatorFactory extends AbstractListMediatorFactory {
     private static final QName TEMPLATE_BODY_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "sequence");
 
+    @Override
     protected Mediator createSpecificMediator(OMElement elem, Properties properties) {
         TemplateMediator templateTemplateMediator = new TemplateMediator();
         OMAttribute nameAttr = elem.getAttribute(ATT_NAME);
@@ -61,6 +62,7 @@ public class TemplateMediatorFactory extends AbstractListMediatorFactory {
         return templateTemplateMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return TEMPLATE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorSerializer.java
index 8f1e3b85b..02a8684c8 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/TemplateMediatorSerializer.java
@@ -75,6 +75,7 @@ public class TemplateMediatorSerializer extends AbstractListMediatorSerializer {
         serializeChildren(seqEl, childMediatorList);
     }
 
+    @Override
     public String getMediatorClassName() {
         return TemplateMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java
index 944f610a1..2861adca5 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorFactory.java
@@ -48,6 +48,7 @@ public class TransactionMediatorFactory extends AbstractMediatorFactory {
      * @param properties
      * @return the Transaction mediator instance created
      */
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         TransactionMediator tm = new TransactionMediator();
@@ -70,6 +71,7 @@ public class TransactionMediatorFactory extends AbstractMediatorFactory {
         return null;
     }
 
+    @Override
     public QName getTagQName() {
         return TAG_NAME;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java
index 923f8abe6..b2a7934b3 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java
@@ -30,6 +30,7 @@ import org.apache.synapse.mediators.transaction.TransactionMediator;
  */
 public class TransactionMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof TransactionMediator)) {
@@ -45,6 +46,7 @@ public class TransactionMediatorSerializer extends AbstractMediatorSerializer {
         return transaction;
     }
 
+    @Override
     public String getMediatorClassName() {
         return TransactionMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java
index 6cf5a4590..b168cf66d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorFactory.java
@@ -82,6 +82,7 @@ public class URLRewriteMediatorFactory extends AbstractMediatorFactory {
     public static final String FRAGMENT_REF = "ref";
     public static final String FRAGMENT_FULL_URI = "full";
 
+    @Override
     protected Mediator createSpecificMediator(OMElement element, Properties properties) {
         Iterator rules = element.getChildrenWithName(RULE_Q);
         String inputProperty = element.getAttributeValue(ATT_IN_PROPERTY);
@@ -200,6 +201,7 @@ public class URLRewriteMediatorFactory extends AbstractMediatorFactory {
         return action;
     }
 
+    @Override
     public QName getTagQName() {
         return REWRITE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
index 858dabe89..f6d0dfd22 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
@@ -34,6 +34,7 @@ import java.util.List;
 
 public class URLRewriteMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     protected OMElement serializeSpecificMediator(Mediator m) {
         if (!(m instanceof URLRewriteMediator)) {
             handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -165,6 +166,7 @@ public class URLRewriteMediatorSerializer extends AbstractMediatorSerializer {
         return action;
     }
 
+    @Override
     public String getMediatorClassName() {
         return URLRewriteMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
index f0b1bf514..2dfabb34b 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
@@ -51,6 +51,7 @@ public class ValidateMediatorFactory extends AbstractListMediatorFactory {
     private static final QName ON_FAIL_Q  = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "on-fail");
     private static final QName SCHEMA_Q   = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "schema");
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         ValidateMediator validateMediator = new ValidateMediator();
@@ -137,6 +138,7 @@ public class ValidateMediatorFactory extends AbstractListMediatorFactory {
         return validateMediator;
     }
 
+    @Override
     public QName getTagQName() {
         return VALIDATE_Q;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
index 50ab3d26a..d8b2d8082 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
@@ -34,6 +34,7 @@ import java.util.List;
  */
 public class ValidateMediatorSerializer extends AbstractListMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof ValidateMediator)) {
@@ -79,6 +80,7 @@ public class ValidateMediatorSerializer extends AbstractListMediatorSerializer {
         return validate;
     }
 
+    @Override
     public String getMediatorClassName() {
         return ValidateMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/XMLToTemplateMapper.java b/modules/core/src/main/java/org/apache/synapse/config/xml/XMLToTemplateMapper.java
index 52a6672ae..b6764883d 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/XMLToTemplateMapper.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/XMLToTemplateMapper.java
@@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
 import java.util.Properties;
 
 public class XMLToTemplateMapper implements XMLToObjectMapper {
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (!(om instanceof OMElement)) {
             throw new SynapseException("Configuration is not in proper format.");
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
index 654223af3..88633379c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
@@ -50,10 +50,12 @@ public class XSLTMediatorFactory extends AbstractMediatorFactory {
     private static final QName ATTRIBUTE_Q
                 = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "attribute");
 
+    @Override
     public QName getTagQName() {
         return TAG_NAME;
     }
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         XSLTMediator transformMediator = new XSLTMediator();
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
index 5779afca6..a706470ba 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
@@ -37,6 +37,7 @@ public class XSLTMediatorSerializer extends AbstractMediatorSerializer {
     private static final QName ATTRIBUTE_Q
                 = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "attribute");
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof XSLTMediator)) {
@@ -87,6 +88,7 @@ public class XSLTMediatorSerializer extends AbstractMediatorSerializer {
         return xslt;
     }
 
+    @Override
     public String getMediatorClassName() {
         return XSLTMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
index c46486b63..b765d3c16 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
@@ -53,6 +53,7 @@ public class ClassEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig,
                                       boolean anonymousEndpoint,
                                       Properties properties) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
index 8b4610680..3eaa2104d 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
@@ -68,6 +68,7 @@ public class DefaultEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
index 3fc0c6f3b..665092b5b 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
@@ -33,6 +33,7 @@ import org.apache.synapse.endpoints.EndpointDefinition;
  */
 public class DefaultEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof DefaultEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java
index 52354700e..a6f6ebf1c 100755
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java
@@ -65,6 +65,7 @@ public class DynamicLoadbalanceEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
index 5660324ff..4d49c6975 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
@@ -47,6 +47,7 @@ import java.util.Properties;
 
 public class DynamicLoadbalanceEndpointSerializer extends EndpointSerializer {
     
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof DynamicLoadbalanceEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java
index 884554491..658738cb7 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java
@@ -41,6 +41,7 @@ public class EndpointDefinitionFactory implements DefinitionFactory {
      * @param elem XML which represents the endpoint with QoS information
      * @return the created endpoint definition
      */
+    @Override
     public EndpointDefinition createDefinition(OMElement elem) {
         EndpointDefinition definition = new EndpointDefinition();
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
index 4b5e1c197..c120292e8 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
@@ -106,6 +106,7 @@ public abstract class EndpointFactory implements XMLToObjectMapper {
      * @param properties bag of properties to pass in any information to the factory
      * @return created endpoint as an {@link Object}
      */
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             return createEndpointWithName((OMElement) om, false, properties);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
index 6f7377121..eaf673ef6 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
@@ -49,6 +49,7 @@ public class FailoverEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
index daa93286e..0cab99c86 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
@@ -32,6 +32,7 @@ import org.apache.synapse.endpoints.FailoverEndpoint;
  */
 public class FailoverEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof FailoverEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
index d90a088ca..fecf851a8 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
@@ -43,6 +43,7 @@ public class IndirectEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
index aacc731ea..78f5b06d2 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
@@ -32,6 +32,7 @@ import org.apache.synapse.endpoints.IndirectEndpoint;
  */
 public class IndirectEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof IndirectEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
index f65441362..040042114 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
@@ -58,6 +58,7 @@ public final class LoadbalanceEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
index a3a894ddb..7739a94ab 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
@@ -34,6 +34,7 @@ import org.apache.synapse.endpoints.LoadbalanceEndpoint;
  */
 public class LoadbalanceEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof LoadbalanceEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java
index cea033138..25abd916e 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java
@@ -43,6 +43,7 @@ public class ResolvingEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
index 3e61fa143..f956a7e8c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
@@ -31,6 +31,7 @@ import org.apache.synapse.config.xml.SynapseXPathSerializer;
  */
 public class ResolvingEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof ResolvingEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
index 259f30480..132a83e87 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
@@ -55,6 +55,7 @@ public class SALoadbalanceEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
index fec9556c7..044f134ef 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
@@ -37,6 +37,7 @@ import org.apache.synapse.endpoints.dispatch.SoapSessionDispatcher;
  */
 public class SALoadbalanceEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof SALoadbalanceEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ServiceDynamicLoadbalanceEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ServiceDynamicLoadbalanceEndpointFactory.java
index 86fbe1b49..ddb77cd45 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ServiceDynamicLoadbalanceEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ServiceDynamicLoadbalanceEndpointFactory.java
@@ -82,6 +82,7 @@ public class ServiceDynamicLoadbalanceEndpointFactory extends EndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java
index 57aa749be..f540c151c 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java
@@ -31,6 +31,7 @@ import java.util.Iterator;
 import java.util.Properties;
 
 public class TemplateEndpointFactory extends EndpointFactory {
+    @Override
     public Endpoint createEndpoint(OMElement endpointElement, boolean a, Properties properties) {
         TemplateEndpoint templateEndpoint = new TemplateEndpoint();
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointSerializer.java
index d27c1f9df..31388441e 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointSerializer.java
@@ -41,6 +41,7 @@ public class TemplateEndpointSerializer extends EndpointSerializer {
 
     }
 
+    @Override
     public OMElement serializeEndpoint(Endpoint epr) {
         TemplateEndpoint endpoints = (TemplateEndpoint) epr;
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
index 61a0249e8..60fc74e27 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
@@ -80,6 +80,7 @@ public class WSDLEndpointFactory extends DefaultEndpointFactory {
         return instance;
     }
 
+    @Override
     protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
                                       Properties properties) {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
index 618fc917d..3249997d1 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
@@ -33,6 +33,7 @@ import org.apache.synapse.endpoints.EndpointDefinition;
  */
 public class WSDLEndpointSerializer extends EndpointSerializer {
 
+    @Override
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof WSDLEndpoint)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java
index e160f0242..f0c13c0f7 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java
@@ -49,6 +49,7 @@ public class XMLToEndpointMapper implements XMLToObjectMapper {
      * @param om OMNode containing endpoint configuration. This should be an OMElement.
      * @return Endpoint implementation for the given OMNode.
      */
+    @Override
     public Object getObjectFromOMNode(OMNode om, Properties properties) {
         if (om instanceof OMElement) {
             OMElement epElement = (OMElement) om;
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorFactory.java
index e5dad82af..282310668 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorFactory.java
@@ -41,10 +41,12 @@ public class EventPublisherMediatorFactory extends AbstractMediatorFactory {
             new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "eventPublisher");
     private static final QName PROP_NAME = new QName("eventSourceName");
 
+    @Override
     public QName getTagQName() {
         return TAG_NAME;
     }
 
+    @Override
     public Mediator createSpecificMediator(OMElement elem, Properties properties) {
         EventPublisherMediator eventPublisherMediator = new EventPublisherMediator();
         OMAttribute attEventSource = elem.getAttribute(PROP_NAME);
diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java
index 9fce381b2..1ffc089ce 100644
--- a/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java
@@ -29,6 +29,7 @@ import org.apache.synapse.mediators.eventing.EventPublisherMediator;
  */
 public class EventPublisherMediatorSerializer extends AbstractMediatorSerializer {
 
+    @Override
     public OMElement serializeSpecificMediator(Mediator m) {
 
         if (!(m instanceof EventPublisherMediator)) {
@@ -49,6 +50,7 @@ public class EventPublisherMediatorSerializer extends AbstractMediatorSerializer
         return elmEventPublisher;
     }
 
+    @Override
     public String getMediatorClassName() {
         return EventPublisherMediator.class.getName();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
index 7a91840af..abcadb10c 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
@@ -42,12 +42,16 @@ public class AsyncCallback implements AxisCallback {
         this.synapseOutMsgCtx = synapseOutMsgCtx;
     }
 
+    @Override
     public void onMessage(org.apache.axis2.context.MessageContext messageContext) {}
 
+    @Override
     public void onFault(org.apache.axis2.context.MessageContext messageContext) {}
 
+    @Override
     public void onError(Exception e) {}
 
+    @Override
     public void onComplete() {}
 
     public org.apache.synapse.MessageContext getSynapseOutMsgCtx() {
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
index 24fc35556..b7036e381 100755
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
@@ -44,6 +44,7 @@ public class Axis2LoadBalanceMembershipHandler implements LoadBalanceMembershipH
     private LoadbalanceAlgorithm algorithm;
     private Properties properties;
 
+    @Override
     public void init(Properties props, LoadbalanceAlgorithm algorithm) {
         this.properties = props;
         this.lbDomain = props.getProperty("applicationDomain");
@@ -58,6 +59,7 @@ public class Axis2LoadBalanceMembershipHandler implements LoadBalanceMembershipH
         this.algorithm = algorithm;
     }
 
+    @Override
     public void setConfigurationContext(ConfigurationContext configCtx) {
         this.configCtx = configCtx;
 
@@ -79,6 +81,7 @@ public class Axis2LoadBalanceMembershipHandler implements LoadBalanceMembershipH
         }
     }
 
+    @Override
     public ConfigurationContext getConfigurationContext(){
         return configCtx;
     }
@@ -89,15 +92,18 @@ public class Axis2LoadBalanceMembershipHandler implements LoadBalanceMembershipH
      * @param context The AlgorithmContext
      * @return The current member
      */
+    @Override
     public Member getNextApplicationMember(AlgorithmContext context) {
         algorithm.setApplicationMembers(groupMgtAgent.getMembers());
         return algorithm.getNextApplicationMember(context);
     }
 
+    @Override
     public LoadbalanceAlgorithm getLoadbalanceAlgorithm() {
         return this.algorithm;
     }
 
+    @Override
     public Properties getProperties() {
         return this.properties;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
index d69b248fb..214710288 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
@@ -82,30 +82,37 @@ public class Axis2MessageContext implements MessageContext {
     /** The service log for this message */
     private Log serviceLog = null;
 
+    @Override
     public SynapseConfiguration getConfiguration() {
         return synCfg;
     }
 
+    @Override
     public void setConfiguration(SynapseConfiguration synCfg) {
         this.synCfg = synCfg;
     }
 
+    @Override
     public SynapseEnvironment getEnvironment() {
         return synEnv;
     }
 
+    @Override
     public void setEnvironment(SynapseEnvironment synEnv) {
         this.synEnv = synEnv;
     }
 
+    @Override
     public Map<String, Object> getContextEntries() {
         return localEntries;
     }
 
+    @Override
     public void setContextEntries(Map<String, Object> entries) {
         this.localEntries.putAll(entries);
     }
 
+    @Override
     public Mediator getMainSequence() {
         Object o = localEntries.get(SynapseConstants.MAIN_SEQUENCE_KEY);
         if (o != null && o instanceof Mediator) {
@@ -117,6 +124,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Mediator getFaultSequence() {
         Object o = localEntries.get(SynapseConstants.FAULT_SEQUENCE_KEY);
         if (o != null && o instanceof Mediator) {
@@ -128,6 +136,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Mediator getSequence(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Mediator) {
@@ -147,6 +156,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Mediator getSequenceTemplate(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Mediator) {
@@ -163,6 +173,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Endpoint getEndpoint(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Endpoint) {
@@ -183,6 +194,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Object getEntry(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Entry) {
@@ -199,6 +211,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Object getLocalEntry(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Entry) {
@@ -223,10 +236,12 @@ public class Axis2MessageContext implements MessageContext {
         return Collections.unmodifiableMap(properties);
     }
 
+    @Override
     public Object getProperty(String key) {
         return properties.get(key);
     }
 
+    @Override
     public void setProperty(String key, Object value) {
         if (value == null) {
             return;
@@ -242,6 +257,7 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Set getPropertyKeySet() {
         return properties.keySet();
     }
@@ -260,116 +276,144 @@ public class Axis2MessageContext implements MessageContext {
         this.synEnv = synEnv;
     }
 
+    @Override
     public EndpointReference getFaultTo() {
         return axis2MessageContext.getFaultTo();
     }
 
+    @Override
     public void setFaultTo(EndpointReference reference) {
         axis2MessageContext.setFaultTo(reference);
     }
 
+    @Override
     public EndpointReference getFrom() {
         return axis2MessageContext.getFrom();
     }
 
+    @Override
     public void setFrom(EndpointReference reference) {
         axis2MessageContext.setFrom(reference);
     }
 
+    @Override
     public SOAPEnvelope getEnvelope() {
         return axis2MessageContext.getEnvelope();
     }
 
+    @Override
     public void setEnvelope(SOAPEnvelope envelope) throws AxisFault {
         axis2MessageContext.setEnvelope(envelope);
     }
 
+    @Override
     public String getMessageID() {
         return axis2MessageContext.getMessageID();
     }
 
+    @Override
     public void setMessageID(String string) {
         axis2MessageContext.setMessageID(string);
     }
 
+    @Override
     public RelatesTo getRelatesTo() {
         return axis2MessageContext.getRelatesTo();
     }
 
+    @Override
     public void setRelatesTo(RelatesTo[] reference) {
         axis2MessageContext.setRelationships(reference);
     }
 
+    @Override
     public EndpointReference getReplyTo() {
         return axis2MessageContext.getReplyTo();
     }
 
+    @Override
     public void setReplyTo(EndpointReference reference) {
         axis2MessageContext.setReplyTo(reference);
     }
 
+    @Override
     public EndpointReference getTo() {
         return axis2MessageContext.getTo();
     }
 
+    @Override
     public void setTo(EndpointReference reference) {
         axis2MessageContext.setTo(reference);
     }
 
+    @Override
     public void setWSAAction(String actionURI) {
         axis2MessageContext.setWSAAction(actionURI);
     }
 
+    @Override
     public String getWSAAction() {
         return axis2MessageContext.getWSAAction();
     }
 
+    @Override
     public void setWSAMessageID(String messageID) {
         axis2MessageContext.setWSAMessageId(messageID);
     }
 
+    @Override
     public String getWSAMessageID() {
         return axis2MessageContext.getMessageID();
     }
 
+    @Override
     public String getSoapAction() {
         return axis2MessageContext.getSoapAction();
     }
 
+    @Override
     public void setSoapAction(String string) {
         axis2MessageContext.setSoapAction(string);
     }
 
+    @Override
     public boolean isDoingMTOM() {
         return axis2MessageContext.isDoingMTOM();
     }
 
+    @Override
     public boolean isDoingSWA() {
         return axis2MessageContext.isDoingSwA();
     }
 
+    @Override
     public void setDoingMTOM(boolean b) {
         axis2MessageContext.setDoingMTOM(b);
     }
 
+    @Override
     public void setDoingSWA(boolean b) {
         axis2MessageContext.setDoingSwA(b);
     }
 
+    @Override
     public boolean isDoingPOX() {
         return axis2MessageContext.isDoingREST();
     }
 
+    @Override
     public void setDoingPOX(boolean b) {
         axis2MessageContext.setDoingREST(b);
     }
 
+    @Override
     public boolean isDoingGET() {
         return Constants.Configuration.HTTP_METHOD_GET.equals(
             axis2MessageContext.getProperty(Constants.Configuration.HTTP_METHOD))
             && axis2MessageContext.isDoingREST();
     }
 
+    @Override
     public void setDoingGET(boolean b) {
         if(b) {
             axis2MessageContext.setDoingREST(b);
@@ -380,41 +424,50 @@ public class Axis2MessageContext implements MessageContext {
         }
     }
 
+    @Override
     public boolean isSOAP11() {
         return axis2MessageContext.isSOAP11();
     }
 
+    @Override
     public void setResponse(boolean b) {
         response = b;
         axis2MessageContext.setProperty(SynapseConstants.ISRESPONSE_PROPERTY, b);
     }
 
+    @Override
     public boolean isResponse() {
         Object o = properties.get(SynapseConstants.RESPONSE);
         return o != null && o instanceof String &&
                 ((String) o).equalsIgnoreCase("true") || response;
     }
 
+    @Override
     public void setFaultResponse(boolean b) {
         this.faultResponse = b;
     }
 
+    @Override
     public boolean isFaultResponse() {
         return this.faultResponse;
     }
 
+    @Override
     public int getTracingState() {
         return tracingState;
     }
 
+    @Override
     public void setTracingState(int tracingState) {
         this.tracingState= tracingState;
     }
 
+    @Override
     public Stack<FaultHandler> getFaultStack() {
         return this.faultStack;
     }
 
+    @Override
     public void pushFaultHandler(FaultHandler fault) {
         this.faultStack.push(fault);
     }
@@ -423,6 +476,7 @@ public class Axis2MessageContext implements MessageContext {
      * Return the service level Log for this message context or null
      * @return the service level Log for the message
      */
+    @Override
     public Log getServiceLog() {
 
         if (serviceLog != null) {
@@ -478,6 +532,7 @@ public class Axis2MessageContext implements MessageContext {
         axis2MessageContext.setServerSide(value);
     }
 
+    @Override
     public String toString() {
         
         StringBuffer sb = new StringBuffer();
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
index a63a8bccd..3977e3972 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
@@ -129,6 +129,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
         this.contextInformation = contextInformation;        
     }
 
+    @Override
     public boolean injectMessage(final MessageContext synCtx) {
         if (log.isDebugEnabled()) {
             log.debug("Injecting MessageContext");
@@ -241,6 +242,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
         return true;
     }
 
+    @Override
     public void injectAsync(final MessageContext synCtx, SequenceMediator seq) {
 
         if (log.isDebugEnabled()) {
@@ -259,6 +261,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *                      and the properties of the sending process
      * @param synCtx   - Synapse MessageContext to be sent
      */
+    @Override
     public void send(EndpointDefinition endpoint, MessageContext synCtx) {
         if (synCtx.isResponse()) {
             if (endpoint != null) {
@@ -329,6 +332,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return Synapse MessageContext with the underlying axis2 message context set
      */
+    @Override
     public MessageContext createMessageContext() {
 
         if (log.isDebugEnabled()) {
@@ -364,6 +368,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return created TemporaryData object as per in the synapse.properties file
      */
+    @Override
     public OverflowBlob createOverflowBlob() {
 
         String chkSize = synapseConfig.getProperty(SynapseConstants.CHUNK_SIZE);
@@ -393,6 +398,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return Returns the <code>StatisticsCollector</code>
      */
+    @Override
     public StatisticsCollector getStatisticsCollector() {
         return statisticsCollector;
     }
@@ -402,6 +408,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @param collector - Statistics collector to be set
      */
+    @Override
     @Deprecated
     public void setStatisticsCollector(StatisticsCollector collector) {
         this.statisticsCollector = collector;
@@ -413,6 +420,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return an ExecutorService to execute the tasks in a new thread from the pool
      */
+    @Override
     public ExecutorService getExecutorService() {
         return executorService;
     }
@@ -422,6 +430,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return true if ready for processing
      */
+    @Override
     public boolean isInitialized() {
         return initialized;
     }
@@ -431,6 +440,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @param state true means ready for processing
      */
+    @Override
     public void setInitialized(boolean state) {
         this.initialized = state;
     }
@@ -440,6 +450,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return synapseConfig associated with the environment
      */
+    @Override
     public SynapseConfiguration getSynapseConfiguration() {
         return this.synapseConfig;
     }
@@ -450,6 +461,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      *
      * @return SynapseTaskManager of this synapse environment
      */
+    @Override
     public SynapseTaskManager getTaskManager() {
         return this.taskManager;
     }
@@ -459,6 +471,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      * 
      * @return ServerContextInformation of the environment
      */
+    @Override
     public ServerContextInformation getServerContextInformation() {
         return contextInformation;
     }
@@ -476,6 +489,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      * Returns all declared xpath Function Extensions
      * @return Hash Map Containing Function Extensions with supported QName keys
      */
+    @Override
     public Map<QName, SynapseXpathFunctionContextProvider> getXpathFunctionExtensions() {
         return xpathFunctionExtensions;
     }
@@ -484,6 +498,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment {
      * Returns all declared xpath Variable Extensions
      * @return Hash Map Containing Variable Extensions with supported QName keys
      */
+    @Override
     public Map<QName, SynapseXpathVariableResolver> getXpathVariableExtensions() {
         return xpathVariableExtensions;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIBasedDispatcher.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIBasedDispatcher.java
index d42a0ce79..e526c4eda 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIBasedDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIBasedDispatcher.java
@@ -41,12 +41,14 @@ public class CustomURIBasedDispatcher extends AbstractDispatcher {
     private static final Log log = LogFactory.getLog(CustomURIBasedDispatcher.class);
     public static final String NAME = "CustomURIBasedDispatcher";
     
+    @Override
     public AxisOperation findOperation(AxisService axisService, MessageContext messageContext)
             throws AxisFault {
         // no need to do any processing, since this is not for operation dispatching
         return null;
     }
 
+    @Override
     public AxisService findService(MessageContext messageContext) throws AxisFault {
 
         EndpointReference toEPR = messageContext.getTo();
@@ -77,6 +79,7 @@ public class CustomURIBasedDispatcher extends AbstractDispatcher {
         return null;
     }
 
+    @Override
     public void initDispatcher() {
         init(new HandlerDescription(NAME));
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
index 7c37bb64c..718c9ca35 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
@@ -55,7 +55,8 @@ public class DynamicAxisOperation extends OutInAxisOperation {
 		super(name);
 	}
 
-	public OperationClient createClient(ServiceContext sc, Options options) {
+	@Override
+    public OperationClient createClient(ServiceContext sc, Options options) {
 		return new DynamicOperationClient(this, sc, options);
 	}
 
@@ -68,7 +69,8 @@ public class DynamicAxisOperation extends OutInAxisOperation {
 		/**
          * same as OutInAxisOperationClient
 		 */
-		public void addMessageContext(MessageContext mc) throws AxisFault {
+		@Override
+        public void addMessageContext(MessageContext mc) throws AxisFault {
 			mc.setServiceContext(sc);
 			if (mc.getMessageID() == null) {
 				setMessageID(mc);
@@ -79,11 +81,13 @@ public class DynamicAxisOperation extends OutInAxisOperation {
 		/**
 		 * same as OutInAxisOperationClient
 		 */
-		public MessageContext getMessageContext(String messageLabel) throws AxisFault {
+		@Override
+        public MessageContext getMessageContext(String messageLabel) throws AxisFault {
 			return oc.getMessageContext(messageLabel);
 		}
 
-		public void executeImpl(boolean block) throws AxisFault {
+		@Override
+        public void executeImpl(boolean block) throws AxisFault {
 
             // if the MEP is completed, throw a fault
             if (completed) {
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
index 25bac3d2d..a0169b56c 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
@@ -783,10 +783,12 @@ public class ProxyService implements AspectConfigurable, SynapseArtifact {
         return name;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
@@ -1005,10 +1007,12 @@ public class ProxyService implements AspectConfigurable, SynapseArtifact {
         this.policies.add(pi);
     }
 
+    @Override
     public void configure(AspectConfiguration aspectConfiguration) {
         this.aspectConfiguration = aspectConfiguration;
     }
 
+    @Override
     public AspectConfiguration getAspectConfiguration() {
         return aspectConfiguration;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
index b93687596..3980e85c3 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
@@ -47,6 +47,7 @@ public class ProxyServiceMessageReceiver extends SynapseMessageReceiver {
     /** The proxy service */
     private ProxyService proxy = null;
 
+    @Override
     public void receive(org.apache.axis2.context.MessageContext mc) throws AxisFault {
 
         boolean traceOn = proxy.getTraceState() == SynapseConstants.TRACING_ON;
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/ServiceLoadBalanceMembershipHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/ServiceLoadBalanceMembershipHandler.java
index 10314a048..d985d13d4 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/ServiceLoadBalanceMembershipHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/ServiceLoadBalanceMembershipHandler.java
@@ -62,10 +62,12 @@ public class ServiceLoadBalanceMembershipHandler implements LoadBalanceMembershi
         }
     }
 
+    @Override
     public void init(Properties props, LoadbalanceAlgorithm algorithm) {
         // Nothing to do
     }
 
+    @Override
     public void setConfigurationContext(ConfigurationContext configCtx) {
         this.configCtx = configCtx;
 
@@ -79,6 +81,7 @@ public class ServiceLoadBalanceMembershipHandler implements LoadBalanceMembershi
         }
     }
 
+    @Override
     public ConfigurationContext getConfigurationContext(){
         return configCtx;
     }
@@ -90,6 +93,7 @@ public class ServiceLoadBalanceMembershipHandler implements LoadBalanceMembershi
      * @return The current member
      * @deprecated Use {@link #getNextApplicationMember(String)}
      */
+    @Override
     public Member getNextApplicationMember(AlgorithmContext context) {
         throw new UnsupportedOperationException("This operation is invalid. " +
                                                 "Call getNextApplicationMember(String host)");
@@ -125,10 +129,12 @@ public class ServiceLoadBalanceMembershipHandler implements LoadBalanceMembershi
         return domainAlgorithmContext;
     }
 
+    @Override
     public LoadbalanceAlgorithm getLoadbalanceAlgorithm() {
         return null;
     }
 
+    @Override
     public Properties getProperties() {
         return null;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
index 2dbb6e932..54fa54ee2 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
@@ -44,6 +44,7 @@ public class SynapseAxisServlet extends AxisServlet {
      * @param config the servlet configuration on which synapse initializes.
      * @throws ServletException
      */
+    @Override
     public void init(ServletConfig config) throws ServletException {
         ServletContext servletContext = config.getServletContext();
 
@@ -60,6 +61,7 @@ public class SynapseAxisServlet extends AxisServlet {
         }
     }
 
+    @Override
     public void initContextRoot(HttpServletRequest req) {
         this.configContext.setContextRoot("/");
     }
@@ -71,6 +73,7 @@ public class SynapseAxisServlet extends AxisServlet {
      *
      * @see org.apache.axis2.transport.http.AxisServlet#createMessageContext(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, boolean)
      */
+    @Override
     protected MessageContext createMessageContext(HttpServletRequest request,
                                                   HttpServletResponse response,
                                                   boolean invocationType) throws IOException {
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
index dae8fa64f..a194ff56b 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
@@ -169,6 +169,7 @@ public class SynapseCallbackReceiver implements MessageReceiver {
      * @param messageCtx the Axis2 message context of the reply received
      * @throws AxisFault
      */
+    @Override
     public void receive(MessageContext messageCtx) throws AxisFault {
 
         String messageID = null;
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackStoreView.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackStoreView.java
index f24cc65bb..a9cc0252b 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackStoreView.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackStoreView.java
@@ -27,10 +27,12 @@ public class SynapseCallbackStoreView implements SynapseCallbackStoreViewMBean {
         this.receiver = receiver;
     }
 
+    @Override
     public int getCallbackCount() {
         return receiver.getCallbackCount();
     }
 
+    @Override
     public String[] getPendingCallbacks() {
         return receiver.getPendingCallbacks();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseDispatcher.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseDispatcher.java
index 5aba52bf0..d09ee74d2 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseDispatcher.java
@@ -38,17 +38,20 @@ public class SynapseDispatcher extends AbstractDispatcher {
 
     public static final String NAME = "SynapseDispatcher";
 
+    @Override
     public void initDispatcher() {
         QName qn = new QName("http://synapse.apache.org", NAME);
         HandlerDescription hd = new HandlerDescription(qn.getLocalPart());
         super.init(hd);
     }
 
+    @Override
     public AxisService findService(MessageContext mc) throws AxisFault {
         AxisConfiguration ac = mc.getConfigurationContext().getAxisConfiguration();
         return ac.getService(SynapseConstants.SYNAPSE_SERVICE_NAME);
     }
 
+    @Override
     public AxisOperation findOperation(AxisService svc, MessageContext mc) throws AxisFault {
         return svc.getOperation(SynapseConstants.SYNAPSE_OPERATION_NAME);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
index 755ce4775..46fcae893 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
@@ -42,6 +42,7 @@ public class SynapseMessageReceiver implements MessageReceiver {
     private static final Log log = LogFactory.getLog(SynapseMessageReceiver.class);
     private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
 
+    @Override
     public void receive(org.apache.axis2.context.MessageContext mc) throws AxisFault {
 
         MessageContext synCtx = MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
index 41c6ff5cf..56698faac 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
@@ -37,6 +37,7 @@ public class SynapseMustUnderstandHandler extends AbstractHandler {
 
     public static final String NAME = "SynapseMustUnderstandHandler";
     
+    @Override
     public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
 
         SOAPEnvelope envelope = messageContext.getEnvelope();
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
index 5d848fd62..b3d00584c 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
@@ -44,6 +44,7 @@ public class SynapseStartUpServlet extends HttpServlet {
 
     public static final String SYNAPSE_SERVER_MANAGER = "synapse.server.manager";
 
+    @Override
     public void init() throws ServletException {
         ServletConfig servletConfig = getServletConfig();
         ServletContext servletContext = servletConfig.getServletContext();
@@ -62,14 +63,17 @@ public class SynapseStartUpServlet extends HttpServlet {
     }
 
 
+    @Override
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
     }
 
+    @Override
     protected void doPost(HttpServletRequest request,
                           HttpServletResponse response) throws ServletException, IOException {
     }
 
+    @Override
     public void destroy() {
         try {
             Object o = getServletConfig().getServletContext().getAttribute(SYNAPSE_SERVER_MANAGER);
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
index 922bb687d..39623ff1b 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
@@ -74,6 +74,7 @@ public class TimeoutHandler extends TimerTask {
      * Checks if the timeout has expired for each callback in the callback store. If expired, removes
      * the callback. If specified sends a fault message to the client about the timeout.
      */
+    @Override
     public void run() {
         if (alreadyExecuting) return;
 
diff --git a/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java b/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java
index 9c795b58f..1f62f703f 100644
--- a/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java
@@ -37,6 +37,7 @@ import java.io.IOException;
 
 public class ServiceRequestEarlyBuilder extends AbstractHandler {
 
+    @Override
     public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
         OperationContext operationContext = messageContext.getOperationContext();
         if (operationContext == null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java b/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
index d58182540..28b744808 100644
--- a/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
+++ b/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
@@ -66,6 +66,7 @@ public abstract class AbstractSynapseArtifactDeployer extends AbstractDeployer {
      * 
      * @param configCtx Axis2 ConfigurationContext
      */
+    @Override
     public void init(ConfigurationContext configCtx) {
         this.cfgCtx = configCtx;
     }
@@ -90,6 +91,7 @@ public abstract class AbstractSynapseArtifactDeployer extends AbstractDeployer {
      * @see AbstractSynapseArtifactDeployer#deploySynapseArtifact(org.apache.axiom.om.OMElement,
      * String,java.util.Properties)
      */
+    @Override
     public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
 
         String filename = SynapseArtifactDeploymentStore.getNormalizedAbsolutePath(
@@ -205,6 +207,7 @@ public abstract class AbstractSynapseArtifactDeployer extends AbstractDeployer {
      * @see org.apache.synapse.deployers.AbstractSynapseArtifactDeployer#undeploySynapseArtifact(
      * String)
      */
+    @Override
     public void undeploy(String fileName) throws DeploymentException {
 
         if (!isHotDeploymentEnabled()) {
@@ -278,7 +281,9 @@ public abstract class AbstractSynapseArtifactDeployer extends AbstractDeployer {
     }
 
     // We do not support dynamically setting the directory nor the extension
+    @Override
     public void setDirectory(String directory) {}
+    @Override
     public void setExtension(String extension) {}
 
     /**
diff --git a/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java b/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
index 9ba8943d6..8c16d4d9b 100644
--- a/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
+++ b/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
@@ -67,6 +67,7 @@ public class ExtensionDeployer extends AbstractDeployer {
      * @param configurationContext - ConfigurationContext of Axis2 from which
      *  the deployer is initialized
      */
+    @Override
     public void init(ConfigurationContext configurationContext) {
         this.cfgCtx = configurationContext;
     }
@@ -79,6 +80,7 @@ public class ExtensionDeployer extends AbstractDeployer {
      * @param deploymentFileData - describes the updated file
      * @throws DeploymentException - in case an error on the deployment
      */
+    @Override
     public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
 
         log.info("Loading extensions from: " + deploymentFileData.getAbsolutePath());
@@ -178,6 +180,7 @@ public class ExtensionDeployer extends AbstractDeployer {
      *
      * @param string -
      */
+    @Override
     public void setDirectory(String string) {
         // we do not support changing the directory
     }
@@ -187,6 +190,7 @@ public class ExtensionDeployer extends AbstractDeployer {
      *
      * @param string -
      */
+    @Override
     public void setExtension(String string) {
         // we do not support changing the extension
     }
@@ -197,6 +201,7 @@ public class ExtensionDeployer extends AbstractDeployer {
      * @param string - filename of the deleted file
      * @throws DeploymentException - incase of an error in undeployment
      */
+    @Override
     public void undeploy(String string) throws DeploymentException {
         // todo: implement the undeployement
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java b/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
index aaa7c0c2b..06a1fe753 100644
--- a/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
+++ b/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
@@ -35,6 +35,7 @@ import java.util.Properties;
 public class LibraryArtifactDeployer extends AbstractSynapseArtifactDeployer {
     private static final Log log = LogFactory.getLog(LibraryArtifactDeployer.class);
 
+    @Override
     public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
         String libFilePath = FilenameUtils.normalize(deploymentFileData.getAbsolutePath());
         if (log.isDebugEnabled()) {
@@ -126,6 +127,7 @@ public class LibraryArtifactDeployer extends AbstractSynapseArtifactDeployer {
         }
     }
 
+    @Override
     public void undeploy(String fileName) throws DeploymentException {
         fileName = FilenameUtils.normalize(fileName);
         if (log.isDebugEnabled()) {
@@ -178,6 +180,7 @@ public class LibraryArtifactDeployer extends AbstractSynapseArtifactDeployer {
         }
     }
 
+    @Override
     public void undeploySynapseArtifact(String artifactName) {
         //get Old Lib config
         Library existingLib = null;
@@ -196,20 +199,25 @@ public class LibraryArtifactDeployer extends AbstractSynapseArtifactDeployer {
 
     //avoid implementing any of the below methods since these are unusable in this library deployment
     // scenario . we just want to inherit some of the methods from  AbstractSynapseArtifactDeployer
+    @Override
     public void setDirectory(String directory) {
     }
 
+    @Override
     public void setExtension(String extension) {
     }
 
+    @Override
     public String deploySynapseArtifact(OMElement artifactConfig, String fileName, Properties properties) {
         return null;
     }
 
+    @Override
     public String updateSynapseArtifact(OMElement artifactConfig, String fileName, String existingArtifactName, Properties properties) {
         return null;
     }
 
+    @Override
     public void restoreSynapseArtifact(String artifactName) {
     }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
index be4a32538..050d6839c 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
@@ -98,18 +98,22 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
 
     //------------------------------- getters and setters ------------------------------------------
 
+    @Override
     public EndpointView getMetricsMBean() {
         return metricsMBean;
     }
 
+    @Override
     public EndpointContext getContext() {
         return context;
     }
 
+    @Override
     public String getName() {
         return endpointName;
     }
 
+    @Override
     public boolean isInitialized() {
         return initialized;
     }
@@ -127,10 +131,12 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         return parentEndpoint;
     }
 
+    @Override
     public void setParentEndpoint(Endpoint parentEndpoint) {
         this.parentEndpoint = parentEndpoint;
     }
 
+    @Override
     public List<Endpoint> getChildren() {
         return children;
     }
@@ -139,10 +145,12 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         this.children = children;
     }
 
+    @Override
     public String getFileName() {
         return fileName;
     }
 
+    @Override
     public void setFileName(String fileName) {
         this.fileName = fileName;
     }
@@ -155,14 +163,17 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         this.anonymous = anonymous;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
 
+    @Override
     public String getDescription() {
         return this.description;
     }
 
+    @Override
     public String toString() {
         if (endpointName != null) {
             return "Endpoint [" + endpointName + "]";
@@ -170,6 +181,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         return SynapseConstants.ANONYMOUS_ENDPOINT;
     }
 
+    @Override
     public void setName(String endpointName) {
         this.endpointName = endpointName;
         if (enableMBeanStats) {
@@ -194,6 +206,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
 
     //----------------------- default method implementations and common code -----------------------
 
+    @Override
     public void init(SynapseEnvironment synapseEnvironment) {
         ConfigurationContext cc =
                 ((Axis2SynapseEnvironment) synapseEnvironment).getAxis2ConfigurationContext();
@@ -222,6 +235,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
                 definition.isSecurityOn() || definition.isAddressingOn());
     }
 
+    @Override
     public boolean readyToSend() {
         if (!initialized) {
             //can't send to a non-initialized endpoint. This is a program fault
@@ -232,6 +246,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         return context != null && context.readyToSend();
     }
 
+    @Override
     public void send(MessageContext synCtx) {
 
         boolean traceOn = isTraceOn(synCtx);
@@ -322,6 +337,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         return children == null || children.size() == 0;
     }
 
+    @Override
     public void onChildEndpointFail(Endpoint endpoint, MessageContext synMessageContext) {
         // do nothing, the LB/FO endpoints will override this
     }
@@ -426,6 +442,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      *
      * @param synCtx the message at hand
      */
+    @Override
     public void onFault(MessageContext synCtx) {
         invokeNextFaultHandler(synCtx);
     }
@@ -434,6 +451,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      * The SynapseCallback Receiver notifies an endpoint, if a message was successfully processed
      * to give it a chance to clear up or reset its state to active
      */
+    @Override
     public void onSuccess() {
         // do nothing
     }
@@ -584,6 +602,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
         }
     }
 
+    @Override
     public void destroy() {
         if (metricsMBean != null) {
             metricsMBean.destroy();
@@ -600,6 +619,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      * Add a property to the endpoint.
       * @param property property to be added
      */
+    @Override
     public void addProperty(MediatorProperty property) {        
         properties.put(property.getName(), property);
     }
@@ -610,6 +630,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      *
      * @return a property with the given name
      */
+    @Override
     public MediatorProperty getProperty(String name) {
         MediatorProperty value = properties.get(name);
         if (value == null) {
@@ -625,6 +646,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      * 
      * @return <code>Collection</code> of properties
      */
+    @Override
     public Collection<MediatorProperty> getProperties() {
         return properties.values();
     }
@@ -635,6 +657,7 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      *
      * @return the remove property or <code>null</code> if a property doesn't exists
      */
+    @Override
     public MediatorProperty removeProperty(String name) {
         return properties.remove(name);
     }
@@ -643,16 +666,19 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint,
      * Add all the properties to the endpoint
      * @param mediatorProperties <code>Collection</code> of properties to be added 
      */
+    @Override
     public void addProperties(Collection<MediatorProperty> mediatorProperties) {
         for (MediatorProperty property : mediatorProperties) {
             properties.put(property.getName(), property);
         }
     }
 
+    @Override
     public String getErrorHandler() {
         return errorHandler;
     }
 
+    @Override
     public void setErrorHandler(String errorHandler) {
         this.errorHandler = errorHandler;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
index b52051d09..f3ea9456c 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
@@ -29,6 +29,7 @@ import org.apache.synapse.SynapseConstants;
  */
 public class AddressEndpoint extends AbstractEndpoint {
 
+    @Override
     public void onFault(MessageContext synCtx) {
 
         // is this really a fault or a timeout/connection close etc?
@@ -43,12 +44,14 @@ public class AddressEndpoint extends AbstractEndpoint {
         super.onFault(synCtx);
     }
 
+    @Override
     public void onSuccess() {
         if (getContext() != null) {
             getContext().onSuccess();
         }
     }
 
+    @Override
     public void send(MessageContext synCtx) {
 
         if (getParentEndpoint() == null && !readyToSend()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java
index 022e1dc5a..18035c3a9 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/DefaultEndpoint.java
@@ -28,6 +28,7 @@ import org.apache.synapse.SynapseConstants;
  * using any QOS etc as specified
  */
 public class DefaultEndpoint extends AbstractEndpoint {
+    @Override
     public void onFault(MessageContext synCtx) {
 
         // is this really a fault or a timeout/connection close etc?
@@ -42,12 +43,14 @@ public class DefaultEndpoint extends AbstractEndpoint {
         super.onFault(synCtx);
     }
 
+    @Override
     public void onSuccess() {
         if (getContext() != null) {
             getContext().onSuccess();
         }
     }
 
+    @Override
     public void send(MessageContext synCtx) {
         if (getParentEndpoint() == null && !readyToSend()) {
             // if the this leaf endpoint is too a root endpoint and is in inactive
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
index 5398a516f..f789adc66 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
@@ -103,6 +103,7 @@ public class DynamicLoadbalanceEndpoint extends LoadbalanceEndpoint {
         return lbMembershipHandler;
     }
 
+    @Override
     public void send(MessageContext synCtx) {
         SessionInformation sessionInformation = null;
         Member currentMember = null;
@@ -206,6 +207,7 @@ public class DynamicLoadbalanceEndpoint extends LoadbalanceEndpoint {
         return null;
     }
 
+    @Override
     public void setName(String name) {
         super.setName(name);
 //        algorithmContext.setContextID(name);
@@ -437,10 +439,12 @@ public class DynamicLoadbalanceEndpoint extends LoadbalanceEndpoint {
         private Member currentMember;
         private Endpoint currentEp;
 
+        @Override
         public void setCurrentMember(Member currentMember) {
             this.currentMember = currentMember;
         }
 
+        @Override
         public void setTo(EndpointReference to) {
             this.to = to;
         }
@@ -448,6 +452,7 @@ public class DynamicLoadbalanceEndpoint extends LoadbalanceEndpoint {
         private DynamicLoadbalanceFaultHandlerImpl() {
         }
 
+        @Override
         public void onFault(MessageContext synCtx) {
             //cleanup endpoint if exists
             if(currentEp != null){
@@ -478,6 +483,7 @@ public class DynamicLoadbalanceEndpoint extends LoadbalanceEndpoint {
             sendToApplicationMember(synCtx, currentMember, this, true);
         }
 
+        @Override
         public void setCurrentEp(Endpoint currentEp) {
             this.currentEp = currentEp;
         }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java
index 1ffb7206a..41f6f4267 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java
@@ -510,6 +510,7 @@ public class EndpointContext {
         throw new SynapseException(msg);
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("[ Name : ").append(endpointName).
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
index ca5e81e21..6dfd6ba83 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
@@ -523,6 +523,7 @@ public class EndpointDefinition implements AspectConfigurable {
         retryDisabledErrorCodes.add(code);
     }
 
+    @Override
     public String toString() {
         if (leafEndpoint != null) {
             return leafEndpoint.toString();
@@ -552,10 +553,12 @@ public class EndpointDefinition implements AspectConfigurable {
         }
     }
 
+    @Override
     public void configure(AspectConfiguration aspectConfiguration) {
         this.aspectConfiguration = aspectConfiguration;
     }
 
+    @Override
     public AspectConfiguration getAspectConfiguration() {
         return this.aspectConfiguration;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
index 4303699fa..6f2ac56ac 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
@@ -36,6 +36,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
     private static final Long ONE = 1L;
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(20,
         new ThreadFactory() {
+            @Override
             public Thread newThread(Runnable r) {
                 return new Thread(r, "endpoint-jmx-stat-collector");
             }
@@ -98,6 +99,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         this.endpoint = endpoint;
 
         this.future = scheduler.scheduleAtFixedRate(new Runnable() {
+            @Override
             public void run() {
                 if (suspensionCounts.size() == 15) {
                     suspensionCounts.remove();
@@ -123,6 +125,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Switch on a leaf endpoint, or all endpoints on a group - from maintenance
      * @throws Exception
      */
+    @Override
     public void switchOn() throws Exception {
         if (endpoint.getChildren() != null) {
             for (Endpoint e : endpoint.getChildren()) {
@@ -142,6 +145,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      *
      * @throws Exception
      */
+    @Override
     public void switchOff() throws Exception {
         if (endpoint.getChildren() != null) {
             for (Endpoint e : endpoint.getChildren()) {
@@ -162,6 +166,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return true if at least one is active in a group endpoint; for a leaf - if it is currently active
      * @throws Exception
      */
+    @Override
     public boolean isActive() throws Exception {
         if (endpoint.getChildren() != null) {
             return getActiveChildren() > 0;
@@ -176,6 +181,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return true if a leaf level endpoint has timed out, For a group, has all endpoints timed out?
      * @throws Exception
      */
+    @Override
     public boolean isTimedout() throws Exception {
         return isEndpointInState(EndpointContext.ST_TIMEOUT);
     }
@@ -185,6 +191,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return true if a leaf level endpoint is suspended, false for group endpoints and non-suspend
      * @throws Exception
      */
+    @Override
     public boolean isSuspended() throws Exception {
         return isEndpointInState(EndpointContext.ST_SUSPENDED);
     }
@@ -194,6 +201,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return true if a leaf level endpoint is off, false for group endpoints and non-off
      * @throws Exception
      */
+    @Override
     public boolean isSwitchedOff() throws Exception {
         return isEndpointInState(EndpointContext.ST_OFF);
     }
@@ -203,6 +211,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return the number of children for this endpoint
      * @throws Exception
      */
+    @Override
     public int getTotalChildren() throws Exception {
         return (endpoint.getChildren() == null ? 0 : endpoint.getChildren().size());
     }
@@ -212,6 +221,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return the number of active children for this endpoint
      * @throws Exception
      */
+    @Override
     public int getActiveChildren() throws Exception {
         if (endpoint.getChildren() == null) {
             return 0;
@@ -231,6 +241,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * @return the number of ready children for this endpoint
      * @throws Exception
      */
+    @Override
     public int getReadyChildren() throws Exception {
         if (endpoint.getChildren() == null) {
             return 0;
@@ -250,6 +261,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Time when statistics was last reset for this leaf endpoint
      * @return the time when statistics was last reset for this leaf endpoint, or -1 for group endpoints
      */
+    @Override
     public long getLastResetTime() {
         return (endpoint.getChildren() != null ? -1 : lastResetTime);
     }
@@ -258,6 +270,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Time since statistics was last reset for this leaf endpoint
      * @return the time since statistics was last reset for this leaf endpoint, or -1 for group endpoints
      */
+    @Override
     public long getMetricsWindow() {
         return (endpoint.getChildren() != null ? -1 : System.currentTimeMillis() - lastResetTime);
     }
@@ -266,6 +279,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * A Map of receive faults with the error code and count
      * @return a Map of receive faults
      */
+    @Override
     public Map<Integer, Long> getReceivingFaultTable() {
         if (endpoint.getChildren() != null) {
             Map<Integer, Long> receivingFaultTable = new HashMap<Integer, Long>();
@@ -285,6 +299,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * A Map of send faults with the error code and count
      * @return a Map of send faults
      */
+    @Override
     public Map<Integer, Long> getSendingFaultTable() {
         if (endpoint.getChildren() != null) {
             Map<Integer, Long> sendingFaultTable = new HashMap<Integer, Long>();
@@ -304,6 +319,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * A Map of response codes and counts
      * @return a Map of response codes and counts
      */
+    @Override
     public Map<Integer, Long> getResponseCodeTable() {
         if (endpoint.getChildren() != null) {
             Map<Integer, Long> responseCodeTable = new HashMap<Integer, Long>();
@@ -318,6 +334,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public Date getSuspendedAt() {
         return suspendedAt;
     }
@@ -326,6 +343,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         this.suspendedAt = suspendedAt;
     }
 
+    @Override
     public Date getTimedoutAt() {
         return timedoutAt;
     }
@@ -334,6 +352,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         this.timedoutAt = timedoutAt;
     }
 
+    @Override
     public int getConsecutiveEndpointSuspensions() {
         return consecutiveSuspensions;
     }
@@ -348,6 +367,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         consecutiveSuspensions = 0;
     }
 
+    @Override
     public int getConsecutiveEndpointTimeouts() {
         return consecutiveTimeouts;
     }
@@ -362,34 +382,42 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         consecutiveTimeouts = 0;
     }
 
+    @Override
     public int getTotalEndpointSuspensions() {
         return totalSuspensions;
     }
 
+    @Override
     public int getTotalEndpointTimeouts() {
         return totalTimeouts;
     }
 
+    @Override
     public int getLastMinuteEndpointSuspensions() {
         return getTotal(suspensionCounts, 1);
     }
 
+    @Override
     public int getLast5MinuteEndpointSuspensions() {
         return getTotal(suspensionCounts, 5);
     }
 
+    @Override
     public int getLast15MinuteEndpointSuspensions() {
         return getTotal(suspensionCounts, 15);
     }
 
+    @Override
     public int getLastMinuteEndpointTimeouts() {
         return getTotal(timeoutCounts, 1);
     }
 
+    @Override
     public int getLast5MinuteEndpointTimeouts() {
         return getTotal(timeoutCounts, 5);
     }
 
+    @Override
     public int getLast15MinuteEndpointTimeouts() {
         return getTotal(timeoutCounts, 15);
     }
@@ -414,6 +442,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of messages (ie replies) received
      * @return # of messages (replies) received
      */
+    @Override
     public long getMessagesReceived() {
         if (endpoint.getChildren() != null) {
             long messagesReceived = 0;
@@ -432,6 +461,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of faults, receiving replies
      * @return # of faults, receiving replies
      */
+    @Override
     public long getFaultsReceiving() {
         if (endpoint.getChildren() != null) {
             long faultsReceiving = 0;
@@ -450,6 +480,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of timeouts, receiving replies
      * @return # of timeouts, receiving replies
      */
+    @Override
     public long getTimeoutsReceiving() {
         if (endpoint.getChildren() != null) {
             long timeoutsReceiving = 0;
@@ -468,6 +499,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of bytes received, receiving replies
      * @return # of bytes received, receiving replies
      */
+    @Override
     public long getBytesReceived() {
         if (endpoint.getChildren() != null) {
             long bytesReceived = 0;
@@ -486,6 +518,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of messages sent
      * @return # of messages sent
      */
+    @Override
     public long getMessagesSent() {
         if (endpoint.getChildren() != null) {
             long messagesSent = 0;
@@ -504,6 +537,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of faults sending
      * @return # of faults sending
      */
+    @Override
     public long getFaultsSending() {
         if (endpoint.getChildren() != null) {
             long faultsSending = 0;
@@ -522,6 +556,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of timeouts, sending
      * @return # of timeouts, sending
      */
+    @Override
     public long getTimeoutsSending() {
         if (endpoint.getChildren() != null) {
             long timeoutsSending = 0;
@@ -540,6 +575,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Number of bytes sent
      * @return # of bytes sent
      */
+    @Override
     public long getBytesSent() {
         if (endpoint.getChildren() != null) {
             long bytesSent = 0;
@@ -554,6 +590,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public long getMinSizeReceived() {
         if (endpoint.getChildren() != null) {
             long minSizeReceived = 0;
@@ -572,6 +609,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public long getMaxSizeReceived() {
         if (endpoint.getChildren() != null) {
             long maxSizeReceived = 0;
@@ -590,6 +628,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public long getMinSizeSent() {
         if (endpoint.getChildren() != null) {
             long minSizeSent = 0;
@@ -608,6 +647,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public long getMaxSizeSent() {
         if (endpoint.getChildren() != null) {
             long maxSizeSent = 0;
@@ -626,6 +666,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public double getAvgSizeReceived() {
         if (endpoint.getChildren() != null) {
             double avgSizeReceived = 0;
@@ -643,6 +684,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public double getAvgSizeSent() {
         if (endpoint.getChildren() != null) {
             double avgSizeSent = 0;
@@ -660,6 +702,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
     }
 
     // --- MessageLevelMetricsCollector methods ---
+    @Override
     public void resetStatistics() {
 
         messagesReceived  = 0;
@@ -693,10 +736,12 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         log.info("Endpoint statistics reset for : " + endpointName + " (and/or its children)");
     }
 
+    @Override
     public synchronized void incrementMessagesReceived() {
         messagesReceived++;
     }
 
+    @Override
     public synchronized void incrementFaultsReceiving(int errorCode) {
         faultsReceiving++;
         Object o = receivingFaultTable.get(errorCode);
@@ -707,18 +752,22 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public synchronized void incrementTimeoutsReceiving() {
         timeoutsReceiving++;
     }
 
+    @Override
     public synchronized void incrementBytesReceived(long size) {
         bytesReceived += size;
     }
 
+    @Override
     public synchronized void incrementMessagesSent() {
         messagesSent++;
     }
 
+    @Override
     public synchronized void incrementFaultsSending(int errorCode) {
         faultsSending++;
         Object o = sendingFaultTable.get(errorCode);
@@ -729,14 +778,17 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         }
     }
 
+    @Override
     public synchronized void incrementTimeoutsSending() {
         timeoutsSending++;
     }
 
+    @Override
     public synchronized void incrementBytesSent(long size) {
         bytesSent += size;
     }
 
+    @Override
     public synchronized void notifyReceivedMessageSize(long size) {
         if (minSizeReceived == 0 || size < minSizeReceived) {
             minSizeReceived = size;
@@ -747,6 +799,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
         avgSizeReceived = (avgSizeReceived == 0 ? size : (avgSizeReceived + size) / 2);
     }
 
+    @Override
     public synchronized void notifySentMessageSize(long size) {
         if (minSizeSent == 0 || size < minSizeSent) {
             minSizeSent = size;
@@ -762,6 +815,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * the sendingFault count e.g. to report a successful fail-over etc
      * @param errorCode the code to report
      */
+    @Override
     public void reportSendingFault(int errorCode) {
         synchronized(sendingFaultTable) {
             Object o = sendingFaultTable.get(errorCode);
@@ -778,6 +832,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * the receivingFault count
      * @param errorCode the code to report
      */
+    @Override
     public void reportReceivingFault(int errorCode) {
         synchronized(receivingFaultTable) {
             Object o = receivingFaultTable.get(errorCode);
@@ -793,6 +848,7 @@ public class EndpointView implements EndpointViewMBean, MessageLevelMetricsColle
      * Collect response code statistics
      * @param respCode response code
      */
+    @Override
     public void reportResponseCode(int respCode) {
         synchronized(responseCodeTable) {
             Object o = responseCodeTable.get(respCode);
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java
index 4d68c2a5e..73befadcc 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java
@@ -43,6 +43,7 @@ public class FailoverEndpoint extends AbstractEndpoint {
     /** The fail-over mode supported by this endpoint. By default we do dynamic fail-over */
     private boolean dynamic = true;
 
+    @Override
     public void send(MessageContext synCtx) {
 
         if (log.isDebugEnabled()) {
@@ -137,6 +138,7 @@ public class FailoverEndpoint extends AbstractEndpoint {
         }
     }
 
+    @Override
     public void onChildEndpointFail(Endpoint endpoint, MessageContext synMessageContext) {
         logOnChildEndpointFail(endpoint, synMessageContext);
         if (!((AbstractEndpoint)endpoint).isRetryDisabled(synMessageContext)) {
@@ -156,6 +158,7 @@ public class FailoverEndpoint extends AbstractEndpoint {
         }
     }
 
+    @Override
     public boolean readyToSend() {
         for (Endpoint endpoint : getChildren()) {
             if (endpoint.readyToSend()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java
index 8b185f707..907317e76 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java
@@ -44,6 +44,7 @@ public class IndirectEndpoint extends AbstractEndpoint {
      * Send by calling to the real endpoint
      * @param synCtx the message to send
      */
+    @Override
     public void send(MessageContext synCtx) {
 
         reLoadAndInitEndpoint(((Axis2MessageContext) synCtx).
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
index 36795fd93..f8f032fc1 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
@@ -94,6 +94,7 @@ public class LoadbalanceEndpoint extends AbstractEndpoint {
         }
     }
 
+    @Override
     public void send(MessageContext synCtx) {
 
         if (log.isDebugEnabled()) {
@@ -200,6 +201,7 @@ public class LoadbalanceEndpoint extends AbstractEndpoint {
      *
      * @return true if active. false otherwise.
      */
+    @Override
     public boolean readyToSend() {
         for (Endpoint endpoint : getChildren()) {
             if (endpoint.readyToSend()) {
@@ -291,6 +293,7 @@ public class LoadbalanceEndpoint extends AbstractEndpoint {
             this.to = to;
         }
 
+        @Override
         public void onFault(MessageContext synCtx) {
             if (currentMember == null) {
                 return;
@@ -321,6 +324,7 @@ public class LoadbalanceEndpoint extends AbstractEndpoint {
      */
     private class MemberActivatorTask extends TimerTask {
 
+        @Override
         public void run() {
             try {
                 for(Member member: inactiveMembers){
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/RecipientListEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/RecipientListEndpoint.java
index 177493d95..d31b08010 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/RecipientListEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/RecipientListEndpoint.java
@@ -283,6 +283,7 @@ public class RecipientListEndpoint extends AbstractEndpoint {
 		return false;
 	}
 
+    @Override
     public void onChildEndpointFail(Endpoint endpoint, MessageContext synMessageContext) {
         //we just log the failed recipient here
         logOnChildEndpointFail(endpoint, synMessageContext);
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java
index 29b477e1e..936ae33a3 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java
@@ -39,6 +39,7 @@ public class ResolvingEndpoint extends AbstractEndpoint {
      * Send by calling to the real endpoint
      * @param synCtx the message to send
      */
+    @Override
     public void send(MessageContext synCtx) {
 
         String key = keyExpression.stringValueOf(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
index 277d08d3b..5975259cd 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
@@ -69,6 +69,7 @@ public class SALoadbalanceEndpoint extends LoadbalanceEndpoint {
     /* Sessions time out interval*/
     private long sessionTimeout = -1;
 
+    @Override
     public void init(SynapseEnvironment synapseEnvironment) {
         ConfigurationContext cc =
                 ((Axis2SynapseEnvironment) synapseEnvironment).getAxis2ConfigurationContext();
@@ -92,6 +93,7 @@ public class SALoadbalanceEndpoint extends LoadbalanceEndpoint {
         }
     }
 
+    @Override
     public void send(MessageContext synCtx) {
 
         if (log.isDebugEnabled()) {
@@ -171,6 +173,7 @@ public class SALoadbalanceEndpoint extends LoadbalanceEndpoint {
      * @param endpoint          Failed endpoint.
      * @param synCtx MessageContext of the failed message.
      */
+    @Override
     public void onChildEndpointFail(Endpoint endpoint, MessageContext synCtx) {
 
         logOnChildEndpointFail(endpoint, synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/ServiceDynamicLoadbalanceEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/ServiceDynamicLoadbalanceEndpoint.java
index a96463d42..60ba24028 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/ServiceDynamicLoadbalanceEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/ServiceDynamicLoadbalanceEndpoint.java
@@ -100,6 +100,7 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
         setAlgorithm(algorithm);
     }
 
+    @Override
     public LoadBalanceMembershipHandler getLbMembershipHandler() {
         return slbMembershipHandler;
     }
@@ -108,6 +109,7 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
         return Collections.unmodifiableMap(hostDomainMap);
     }
 
+    @Override
     public void send(MessageContext synCtx) {
         setCookieHeader(synCtx);
         //TODO: Refactor Session Aware LB dispatching code
@@ -201,6 +203,7 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
         // ThreadLocal variable to keep track of how many times this fault handler has been
         // called
         private ThreadLocal<Integer> callCount = new ThreadLocal<Integer>() {
+            @Override
             protected Integer initialValue() {
                 return 0;
             }
@@ -210,10 +213,12 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
             this.host = host;
         }
 
+        @Override
         public void setCurrentMember(Member currentMember) {
             this.currentMember = currentMember;
         }
 
+        @Override
         public void setTo(EndpointReference to) {
             this.to = to;
         }
@@ -221,6 +226,7 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
         private ServiceDynamicLoadbalanceFaultHandlerImpl() {
         }
 
+        @Override
         public void onFault(MessageContext synCtx) {
             if (currentMember == null) {
                 return;
@@ -273,6 +279,7 @@ public class ServiceDynamicLoadbalanceEndpoint extends DynamicLoadbalanceEndpoin
             // We cannot failover since we are using binary relay
         }
 
+        @Override
         public void setCurrentEp(Endpoint currentEp) {
             this.currentEp = currentEp;
         }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java b/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java
index 8e2c29b53..6c387ad0a 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/Template.java
@@ -113,10 +113,12 @@ public class Template implements SynapseArtifact {
         return null;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java
index 598487b5c..8b6053977 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java
@@ -143,6 +143,7 @@ public class TemplateEndpoint extends AbstractEndpoint {
         }
     }
 
+    @Override
     public boolean readyToSend() {
         if (realEndpoint != null && realEndpoint.readyToSend()) {
             if (log.isDebugEnabled()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
index 082909146..364474fb7 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
@@ -39,6 +39,7 @@ public class WSDLEndpoint extends AbstractEndpoint {
     private String serviceName;
     private String portName;
 
+    @Override
     public void onFault(MessageContext synCtx) {
         
         // is this an actual leaf endpoint
@@ -55,10 +56,12 @@ public class WSDLEndpoint extends AbstractEndpoint {
         super.onFault(synCtx);
     }
 
+    @Override
     public void onSuccess() {
         getContext().onSuccess();
     }
 
+    @Override
     public void send(MessageContext synCtx) {
 
         if (getParentEndpoint() == null && !readyToSend()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
index 693643ab9..a73a8fd5c 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
@@ -54,14 +54,17 @@ public class RoundRobin implements LoadbalanceAlgorithm {
         this.endpoints = endpoints;
     }
 
+    @Override
     public void setApplicationMembers(List<Member> members) {
         this.members = members;
     }
 
+    @Override
     public void setEndpoints(List<Endpoint> endpoints) {
         this.endpoints = endpoints;
     }
 
+    @Override
     public void setLoadBalanceEndpoint(Endpoint endpoint) {}
 
     /**
@@ -72,6 +75,7 @@ public class RoundRobin implements LoadbalanceAlgorithm {
      * @param algorithmContext The context in which holds run time states related to the algorithm
      * @return endpoint to send the next message
      */
+    @Override
     public Endpoint getNextEndpoint(MessageContext synCtx, AlgorithmContext algorithmContext) {
 
         Endpoint nextEndpoint;
@@ -100,6 +104,7 @@ public class RoundRobin implements LoadbalanceAlgorithm {
         return nextEndpoint;
     }
 
+    @Override
     public Member getNextApplicationMember(AlgorithmContext algorithmContext) {
         if (members.size() == 0) {
             return null;
@@ -138,6 +143,7 @@ public class RoundRobin implements LoadbalanceAlgorithm {
         return new RoundRobin();
     }
 
+    @Override
     public void reset(AlgorithmContext algorithmContext) {
         if (log.isDebugEnabled()) {
             log.debug("Resetting the Round Robin loadbalancing algorithm ...");
@@ -147,6 +153,7 @@ public class RoundRobin implements LoadbalanceAlgorithm {
         }
     }
 
+    @Override
     public String getName() {
         return "RoundRobin";
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRRLCAlgorithm.java b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRRLCAlgorithm.java
index 1d7327bda..439739e89 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRRLCAlgorithm.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRRLCAlgorithm.java
@@ -82,16 +82,20 @@ public class WeightedRRLCAlgorithm implements LoadbalanceAlgorithm, ManagedLifec
     public static final String LB_WEIGHTED_RRLC_WEIGHT_MAX = LB_WEIGHTED_RRLC_WEIGHT + ".max";
     public static final int LB_WEIGHTED_RRLC_WEIGHT_SKEW = 2;    
 
+    @Override
     public void setApplicationMembers(List<Member> members) {}
 
+    @Override
     public void setEndpoints(List<Endpoint> endpoints) {
         this.endpoints = endpoints;
     }
 
+    @Override
     public void setLoadBalanceEndpoint(Endpoint endpoint) {
         this.loadBalanceEndpoint = endpoint;        
     }
 
+    @Override
     public synchronized Endpoint getNextEndpoint(MessageContext messageContext,
                                                  AlgorithmContext algorithmContext) {                
         WeightedState s = list[endpointCursor];
@@ -216,23 +220,27 @@ public class WeightedRRLCAlgorithm implements LoadbalanceAlgorithm, ManagedLifec
 
         // sort the states according to the initial fixed weights
         Arrays.sort(list, new Comparator<WeightedState>() {
+            @Override
             public int compare(WeightedState o1, WeightedState o2) {
                 return o2.getFixedWeight() - o1.getFixedWeight();
             }
         });
     }
 
+    @Override
     public Member getNextApplicationMember(AlgorithmContext algorithmContext) {
         // this doesn't make sense for weighted load balance algorithm
         return null;
     }
 
+    @Override
     public void reset(AlgorithmContext algorithmContext) {
         for (WeightedState state : list) {
             state.reset();
         }
     }
 
+    @Override
     public String getName() {
         return WeightedRRLCAlgorithm.class.getName();
     }
@@ -305,10 +313,12 @@ public class WeightedRRLCAlgorithm implements LoadbalanceAlgorithm, ManagedLifec
         }
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         intialize();
     }
 
+    @Override
     public void destroy() {}
 
     /**
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java
index f29509d92..68ebea6f8 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java
@@ -84,18 +84,22 @@ public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycl
     private WeightedRoundRobinViewMBean view;
 
     /** we are not supporting members */
+    @Override
     public void setApplicationMembers(List<Member> members) {
         throw new UnsupportedOperationException("This algorithm doesn't operate on Members");
     }
 
+    @Override
     public void setEndpoints(List<Endpoint> endpoints) {
         this.endpoints = endpoints;
     }
 
+    @Override
     public void setLoadBalanceEndpoint(Endpoint endpoint) {
         this.loadBalanceEndpoint = endpoint;   
     }
 
+    @Override
     public Endpoint getNextEndpoint(MessageContext synapseMessageContext,
                                     AlgorithmContext algorithmContext) {
 
@@ -143,10 +147,12 @@ public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycl
         }
     }        
 
+    @Override
     public Member getNextApplicationMember(AlgorithmContext algorithmContext) {
         throw new UnsupportedOperationException("This algorithm doesn't operate on Members");
     }
 
+    @Override
     public void reset(AlgorithmContext algorithmContext) {
         for (EndpointState state : endpointStates) {
             state.reset();
@@ -155,14 +161,17 @@ public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycl
         endpointCursor = 0;
     }
 
+    @Override
     public String getName() {
         return WeightedRoundRobin.class.getName();
     }
 
+    @Override
     public LoadbalanceAlgorithm clone() {
         return null;
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (endpoints == null) {
             String msg = "Endpoints are not set, cannot initialize the algorithm";
@@ -214,6 +223,7 @@ public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycl
                 loadBalanceEndpoint.getName() != null ? loadBalanceEndpoint.getName() : "LBEpr");
     }
 
+    @Override
     public void destroy() {}
 
     /**
@@ -319,6 +329,7 @@ public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycl
     private void calculate() {
         // now we are going to sort
         Arrays.sort(endpointStates, new Comparator<EndpointState>() {
+            @Override
             public int compare(EndpointState o1, EndpointState o2) {
                 return o2.getWeight() - o1.getWeight();
             }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobinView.java b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobinView.java
index 0981a4431..3054b1479 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobinView.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobinView.java
@@ -26,10 +26,12 @@ public class WeightedRoundRobinView implements WeightedRoundRobinViewMBean {
         this.algorithm = algorithm;
     }
 
+    @Override
     public void changeWeight(int pos, int weight) {
         algorithm.changeWeight(pos, weight);
     }
 
+    @Override
     public int[] getCurrentWeights() {
         return algorithm.getCurrentWeights();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/AbstractDispatcher.java b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/AbstractDispatcher.java
index 687e864a6..0c01a4f78 100755
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/AbstractDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/AbstractDispatcher.java
@@ -41,6 +41,7 @@ public abstract class AbstractDispatcher implements Dispatcher {
         log = LogFactory.getLog(this.getClass());
     }
 
+    @Override
     public List<Endpoint> getEndpoints(SessionInformation sessionInformation) {
         return SALSessions.getInstance().getChildEndpoints(sessionInformation);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java
index 404c747bd..df93813b1 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/HttpSessionDispatcher.java
@@ -49,6 +49,7 @@ public class HttpSessionDispatcher extends AbstractDispatcher {
      * @param synCtx MessageContext possibly containing a "Cookie" HTTP header.
      * @return Endpoint Server endpoint for the given HTTP session.
      */
+    @Override
     public SessionInformation getSession(MessageContext synCtx) {
         String hostName = extractHost(synCtx);
         if (log.isDebugEnabled()) {
@@ -105,6 +106,7 @@ public class HttpSessionDispatcher extends AbstractDispatcher {
      *
      * @param synCtx MessageContext possibly containing the "Set-Cookie" HTTP header.
      */
+    @Override
     public void updateSession(MessageContext synCtx) {
 
         String sessionId = extractSessionID(synCtx, SET_COOKIE);
@@ -122,6 +124,7 @@ public class HttpSessionDispatcher extends AbstractDispatcher {
 
     }
 
+    @Override
     public void unbind(MessageContext synCtx) {
         SALSessions.getInstance().removeSession(extractSessionID(synCtx, COOKIE));
     }
@@ -131,10 +134,12 @@ public class HttpSessionDispatcher extends AbstractDispatcher {
      *
      * @return true
      */
+    @Override
     public boolean isServerInitiatedSession() {
         return true;
     }
 
+    @Override
     public void removeSessionID(MessageContext syCtx) {
         removeSessionID(syCtx, COOKIE);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
index 3376440ac..a8d9eb9aa 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SimpleClientSessionDispatcher.java
@@ -35,26 +35,31 @@ public class SimpleClientSessionDispatcher extends AbstractDispatcher {
     private static final QName CSID_QNAME = new QName("http://ws.apache.org/ns/synapse",
             "ClientID", "syn");
 
+    @Override
     public SessionInformation getSession(MessageContext synCtx) {
 
         return SALSessions.getInstance().getSession(
                 extractSessionID(synCtx.getEnvelope().getHeader(), CSID_QNAME));
     }
 
+    @Override
     public void updateSession(MessageContext synCtx) {
         SALSessions.getInstance().updateSession(synCtx,
                 extractSessionID(synCtx.getEnvelope().getHeader(), CSID_QNAME));
     }
 
+    @Override
     public void unbind(MessageContext synCtx) {
         SALSessions.getInstance().removeSession(
                 extractSessionID(synCtx.getEnvelope().getHeader(), CSID_QNAME));
     }
 
+    @Override
     public boolean isServerInitiatedSession() {
         return false;
     }
 
+    @Override
     public void removeSessionID(MessageContext syCtx) {
         // no need to remove
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
index 846900fcc..b7011be8a 100644
--- a/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
@@ -40,6 +40,7 @@ public class SoapSessionDispatcher extends AbstractDispatcher {
      *         message and if current message is not the first message of the session. Returns null,
      *         if an Endpoint could not be found for the session.
      */
+    @Override
     public SessionInformation getSession(MessageContext synCtx) {
         return SALSessions.getInstance().getSession(
                 extractSessionID(synCtx.getEnvelope().getHeader(), QNAME_SERVICE_GROUP_ID));
@@ -52,6 +53,7 @@ public class SoapSessionDispatcher extends AbstractDispatcher {
      *
      * @param synCtx MessageContext of the response message.
      */
+    @Override
     public void updateSession(MessageContext synCtx) {
 
         // get the service group context id
@@ -82,6 +84,7 @@ public class SoapSessionDispatcher extends AbstractDispatcher {
         }
     }
 
+    @Override
     public void unbind(MessageContext synCtx) {
         SALSessions.getInstance().removeSession(extractSessionID(synCtx.getEnvelope().getHeader(),
                 QNAME_SERVICE_GROUP_ID));
@@ -92,10 +95,12 @@ public class SoapSessionDispatcher extends AbstractDispatcher {
      *
      * @return true
      */
+    @Override
     public boolean isServerInitiatedSession() {
         return true;
     }
 
+    @Override
     public void removeSessionID(MessageContext syCtx) {
         removeSessionID(syCtx.getEnvelope().getHeader(), QNAME_SERVICE_GROUP_ID);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/eventing/SynapseEventSource.java b/modules/core/src/main/java/org/apache/synapse/eventing/SynapseEventSource.java
index 8f94bca89..22a12ad9e 100755
--- a/modules/core/src/main/java/org/apache/synapse/eventing/SynapseEventSource.java
+++ b/modules/core/src/main/java/org/apache/synapse/eventing/SynapseEventSource.java
@@ -119,6 +119,7 @@ public class SynapseEventSource extends SynapseMessageReceiver {
      * @param mc message context
      * @throws AxisFault
      */
+    @Override
     public void receive(MessageContext mc) throws AxisFault {
         // Create synapse message context from the axis2 message context
         SynapseConfiguration synCfg = (SynapseConfiguration) mc.getConfigurationContext()
@@ -204,6 +205,7 @@ public class SynapseEventSource extends SynapseMessageReceiver {
             this.synCtx = synCtx;
         }
 
+        @Override
         public void run() {
             try {
                 MessageContext msgCtx = ((Axis2MessageContext) synCtx).getAxis2MessageContext();
diff --git a/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java b/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java
index c43d7f1c1..0b50960e1 100755
--- a/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java
+++ b/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java
@@ -49,6 +49,7 @@ public class TopicBasedEventFilter implements EventFilter<MessageContext> {
         this.resultValue = resultValue;
     }
 
+    @Override
     public String toString() {
         return resultValue;
     }
@@ -61,6 +62,7 @@ public class TopicBasedEventFilter implements EventFilter<MessageContext> {
         this.sourceXpath = sourceXpath;
     }
 
+    @Override
     public boolean match(Event<MessageContext> event) {
         MessageContext messageContext = event.getMessage();
         String evaluatedValue = null;
diff --git a/modules/core/src/main/java/org/apache/synapse/eventing/filters/XPathBasedEventFilter.java b/modules/core/src/main/java/org/apache/synapse/eventing/filters/XPathBasedEventFilter.java
index 578c699bb..bbc66e35d 100755
--- a/modules/core/src/main/java/org/apache/synapse/eventing/filters/XPathBasedEventFilter.java
+++ b/modules/core/src/main/java/org/apache/synapse/eventing/filters/XPathBasedEventFilter.java
@@ -32,6 +32,7 @@ public class XPathBasedEventFilter implements SynapseEventFilter {
     private String resultValue;
     private static final String FILTER_SEP = "/";
 
+    @Override
     public boolean isSatisfied(MessageContext mc) {
         String evaluatedValue = sourceXpath.stringValueOf(mc);
         if (evaluatedValue.equals(resultValue)) {
@@ -58,6 +59,7 @@ public class XPathBasedEventFilter implements SynapseEventFilter {
         this.resultValue = resultValue;
     }
 
+    @Override
     public String toString() {
         return resultValue;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java b/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
index cb78da90c..e3fb16f9d 100755
--- a/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
+++ b/modules/core/src/main/java/org/apache/synapse/eventing/managers/DefaultInMemorySubscriptionManager.java
@@ -47,6 +47,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
     private final Map<String, String> properties = new HashMap<String, String>();
     private static final Log log = LogFactory.getLog(DefaultInMemorySubscriptionManager.class);
 
+    @Override
     public List<Subscription> getStaticSubscriptions() {
         LinkedList<Subscription> list = new LinkedList<Subscription>();
         for (Subscription storeSubscription : store.values()) {
@@ -57,6 +58,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         return list;
     }
 
+    @Override
     public String subscribe(Subscription subscription) throws EventException {
         if (subscription.getId() == null) {
             subscription.setId(UIDGenerator.generateURNString());
@@ -66,7 +68,8 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
 
     }
 
-  public boolean unsubscribe(String id) throws EventException {
+  @Override
+public boolean unsubscribe(String id) throws EventException {
         if (store.containsKey(id)) {
             store.remove(id);
             return true;
@@ -76,6 +79,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
     }
 
 
+    @Override
     public boolean renew(Subscription subscription) throws EventException {
         Subscription subscriptionOld = getSubscription(subscription.getId());
         if (subscriptionOld != null) {
@@ -86,6 +90,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         }
     }
 
+    @Override
     public List<Subscription> getSubscriptions() throws EventException {
         LinkedList<Subscription> list = new LinkedList<Subscription>();
         for (Map.Entry<String, Subscription> stringSubscriptionEntry : store.entrySet()) {
@@ -94,6 +99,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         return list;
     }
 
+    @Override
     public List<Subscription> getAllSubscriptions() throws EventException {
         LinkedList<Subscription> list = new LinkedList<Subscription>();
         for (Map.Entry<String, Subscription> stringSubscriptionEntry : store.entrySet()) {
@@ -102,6 +108,7 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         return list;
     }
 
+    @Override
     public List<Subscription> getMatchingSubscriptions(Event<MessageContext> event)
             throws EventException {
         final LinkedList<Subscription> list = new LinkedList<Subscription>();
@@ -132,15 +139,18 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         return list;
     }
 
+    @Override
     public Subscription getSubscription(String id) {
         return store.get(id);
     }
 
+    @Override
     public Subscription getStatus(String s) throws EventException {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
 
+    @Override
     public void init() {
         try {
             //TODO: pick values from the constants
@@ -162,14 +172,17 @@ public class DefaultInMemorySubscriptionManager implements SubscriptionManager<M
         }
     }
 
+    @Override
     public void addProperty(String name, String value) {
         properties.put(name, value);
     }
 
+    @Override
     public Collection<String> getPropertyNames() {
         return properties.keySet();
     }
 
+    @Override
     public String getPropertyValue(String name) {
         return properties.get(name);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/eip/CalloutBlockMediator.java b/modules/core/src/main/java/org/apache/synapse/libraries/eip/CalloutBlockMediator.java
index 06271054a..96edd144d 100644
--- a/modules/core/src/main/java/org/apache/synapse/libraries/eip/CalloutBlockMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/libraries/eip/CalloutBlockMediator.java
@@ -71,6 +71,7 @@ public class CalloutBlockMediator extends AbstractMediator implements ManagedLif
      * @param synCtx the current message for mediation
      * @return true
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -310,6 +311,7 @@ public class CalloutBlockMediator extends AbstractMediator implements ManagedLif
      * Initialize synapse environment
      * @param synEnv SynapseEnvironment
      */
+    @Override
     public void init(SynapseEnvironment synEnv) {
         try {
             configCtx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(
@@ -322,6 +324,7 @@ public class CalloutBlockMediator extends AbstractMediator implements ManagedLif
         }
     }
 
+    @Override
     public void destroy() {
         try {
             configCtx.terminate();
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/eip/ContentBasedRouterMediator.java b/modules/core/src/main/java/org/apache/synapse/libraries/eip/ContentBasedRouterMediator.java
index 72d6e0fe1..b2a2f7fed 100644
--- a/modules/core/src/main/java/org/apache/synapse/libraries/eip/ContentBasedRouterMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/libraries/eip/ContentBasedRouterMediator.java
@@ -50,6 +50,7 @@ public class ContentBasedRouterMediator extends AbstractMediator {
      * @param messageContext the current message for mediation
      * @return  true
      */
+    @Override
     public boolean mediate(MessageContext messageContext) {
         SwitchMediator switchMediator = new SwitchMediator();
         initParams(messageContext, switchMediator);
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/eip/DynamicRouterMediator.java b/modules/core/src/main/java/org/apache/synapse/libraries/eip/DynamicRouterMediator.java
index 8ff62bfc3..2d60da990 100644
--- a/modules/core/src/main/java/org/apache/synapse/libraries/eip/DynamicRouterMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/libraries/eip/DynamicRouterMediator.java
@@ -58,6 +58,7 @@ public class DynamicRouterMediator extends AbstractMediator {
      * @param msgCtx the current message for mediation
      * @return
      */
+    @Override
     public boolean mediate(MessageContext msgCtx) {
         synCtx = msgCtx;
         ConditionalRouterMediator conditionalRouterMediator = new ConditionalRouterMediator();
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java b/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
index 069d5f607..700b64b3c 100644
--- a/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
+++ b/modules/core/src/main/java/org/apache/synapse/libraries/model/LibraryArtifact.java
@@ -138,6 +138,7 @@ public class LibraryArtifact implements SynapseArtifact{
         this.extractedPath = path;
     }
 
+    @Override
     public String toString() {
         return name;
     }
@@ -154,10 +155,12 @@ public class LibraryArtifact implements SynapseArtifact{
         this.parent = parent;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
 
+    @Override
     public String getDescription() {
         return description;  //To change body of implemented methods use File | Settings | File Templates.
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/libraries/model/SynapseLibrary.java b/modules/core/src/main/java/org/apache/synapse/libraries/model/SynapseLibrary.java
index 705388c2a..fbda682bc 100644
--- a/modules/core/src/main/java/org/apache/synapse/libraries/model/SynapseLibrary.java
+++ b/modules/core/src/main/java/org/apache/synapse/libraries/model/SynapseLibrary.java
@@ -56,6 +56,7 @@ public class SynapseLibrary implements Library {
         dependencies = new ArrayList<LibraryArtifact.Dependency>();
     }
 
+    @Override
     public QName getQName() {
         return qualifiedName;
     }
@@ -76,6 +77,7 @@ public class SynapseLibrary implements Library {
         libArtifactDetails.put(artifact.getName(),artifact.getDescription());
     }
 
+    @Override
     public String  getArtifactDescription(String  artifactName){
         return libArtifactDetails.get(artifactName);
     }
@@ -110,6 +112,7 @@ public class SynapseLibrary implements Library {
      *
      * @return success
      */
+    @Override
     public synchronized boolean loadLibrary() {
         if (!isLoaded) {
             for (String  artifactName : depNameToArtifactIndex.keySet()) {
@@ -139,6 +142,7 @@ public class SynapseLibrary implements Library {
      *
      * @return success
      */
+    @Override
     public synchronized boolean unLoadLibrary() {
         //TODO when components are un-loaded iterate and execute Lifecycle method #destroy() ?
         libComponentIndex.clear();
@@ -146,6 +150,7 @@ public class SynapseLibrary implements Library {
         return true;
     }
 
+    @Override
     public ClassLoader getLibClassLoader() {
         return libClassLoader;  //To change body of implemented methods use File | Settings | File Templates.
     }
@@ -162,6 +167,7 @@ public class SynapseLibrary implements Library {
      * @param artifacName
      * @return
      */
+    @Override
     public Object getArtifact(String artifacName) {
         if (libComponentIndex.containsKey(artifacName)) {
             return libComponentIndex.get(artifacName);
@@ -169,18 +175,22 @@ public class SynapseLibrary implements Library {
         return null;
     }
 
+    @Override
     public String toString() {
         return qualifiedName.toString();
     }
 
+    @Override
     public String getPackage() {
         return packageN;
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
index e0869e686..2225df176 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
@@ -40,6 +40,7 @@ public abstract class AbstractListMediator extends AbstractMediator
 
     private boolean contentAware = false;
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         int parentsEffectiveTraceState = synCtx.getTracingState();
@@ -79,26 +80,32 @@ public abstract class AbstractListMediator extends AbstractMediator
         return true;
     }
 
+    @Override
     public List<Mediator> getList() {
         return mediators;
     }
 
+    @Override
     public boolean addChild(Mediator m) {
         return mediators.add(m);
     }
 
+    @Override
     public boolean addAll(List<Mediator> c) {
         return mediators.addAll(c);
     }
 
+    @Override
     public Mediator getChild(int pos) {
         return mediators.get(pos);
     }
 
+    @Override
     public boolean removeChild(Mediator m) {
         return mediators.remove(m);
     }
 
+    @Override
     public Mediator removeChild(int pos) {
         return mediators.remove(pos);
     }
@@ -107,6 +114,7 @@ public abstract class AbstractListMediator extends AbstractMediator
      * Initialize child mediators recursively
      * @param se synapse environment
      */
+    @Override
     public void init(SynapseEnvironment se) {
         if (log.isDebugEnabled()) {
             log.debug("Initializing child mediators of mediator : " + getType());
@@ -126,6 +134,7 @@ public abstract class AbstractListMediator extends AbstractMediator
     /**
      * Destroy child mediators recursively
      */
+    @Override
     public void destroy() {
         if (log.isDebugEnabled()) {
             log.debug("Destroying child mediators of mediator : " + getType());
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
index a24c3cd93..de555b980 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
@@ -57,6 +57,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      * Returns the class name of the mediator
      * @return the class name of the mediator
      */
+    @Override
     public String getType() {
         String cls = getClass().getName();
         int p = cls.lastIndexOf(".");
@@ -70,6 +71,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      * Returns the tracing state
      * @return the tracing state for this mediator (see SynapseConstants)
      */
+    @Override
     public int getTraceState() {
         return traceState;
     }
@@ -78,6 +80,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      * Set the tracing state variable
      * @param traceState the new tracing state for this mediator (see SynapseConstants)
      */
+    @Override
     public void setTraceState(int traceState) {
         this.traceState = traceState;
     }
@@ -86,6 +89,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      * Set the description of the mediator
      * @param description tobe set to the mediator
      */
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
@@ -94,6 +98,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      * Gives the description of the mediator
      * @return description of the mediator
      */
+    @Override
     public String getDescription() {
         return this.description;
     }
@@ -315,6 +320,7 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      *
      * @param aspectConfiguration AspectConfiguration instance
      */
+    @Override
     public void configure(AspectConfiguration aspectConfiguration) {
        this.aspectConfiguration = aspectConfiguration;
     }
@@ -324,10 +330,12 @@ public abstract class AbstractMediator implements Mediator, AspectConfigurable {
      *
      * @return AspectConfiguration instance
      */
+    @Override
     public AspectConfiguration getAspectConfiguration() {
         return aspectConfiguration;
     }
 
+    @Override
     public boolean isContentAware() {
         return true;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java b/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
index 65fbd3454..66da73b0c 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
@@ -80,6 +80,7 @@ public class GetPropertyFunction implements Function {
      * @return The string value of a property
      * @throws FunctionCallException
      */
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
 
         if (synCtx == null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java
index 6cb7dbf51..b599f9c9d 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorFaultHandler.java
@@ -60,6 +60,7 @@ public class MediatorFaultHandler extends FaultHandler {
      * @throws SynapseException in case there is a failure in the fault execution
      * @see org.apache.synapse.FaultHandler#handleFault(org.apache.synapse.MessageContext)
      */
+    @Override
     public void onFault(MessageContext synCtx) throws SynapseException {
 
         boolean traceOn = synCtx.getTracingState() == SynapseConstants.TRACING_ON;
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java
index a62a92e87..1ec7eb561 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorLog.java
@@ -49,6 +49,7 @@ public class MediatorLog implements SynapseLog {
         this.synCtx = synCtx;
     }
 
+    @Override
     public boolean isTraceOrDebugEnabled() {
         return traceOn || defaultLog.isDebugEnabled();
     }
@@ -57,6 +58,7 @@ public class MediatorLog implements SynapseLog {
      * Log a message to the default log at level DEBUG and and to the trace log
      * at level INFO if trace is enabled for the mediator.
      */
+    @Override
     public void traceOrDebug(Object msg) {
         if (traceOn) {
             traceLog.info(msg);
@@ -68,6 +70,7 @@ public class MediatorLog implements SynapseLog {
      * Log a message at level WARN to the default log, if level DEBUG is enabled,
      * and to the trace log, if trace is enabled for the mediator.
      */
+    @Override
     public void traceOrDebugWarn(Object msg) {
         if (traceOn) {
             traceLog.warn(msg);
@@ -77,6 +80,7 @@ public class MediatorLog implements SynapseLog {
         }
     }
     
+    @Override
     public boolean isTraceTraceEnabled() {
         return traceOn && traceLog.isTraceEnabled();
     }
@@ -84,6 +88,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message to the trace log at level TRACE if trace is enabled for the mediator.
      */
+    @Override
     public void traceTrace(Object msg) {
         if (traceOn) {
             traceLog.trace(msg);
@@ -93,6 +98,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level INFO to all available/enabled logs.
      */
+    @Override
     public void auditLog(Object msg) {
         defaultLog.info(msg);
         if (synCtx.getServiceLog() != null) {
@@ -106,6 +112,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level DEBUG to all available/enabled logs.
      */
+    @Override
     public void auditDebug(Object msg) {
         defaultLog.debug(msg);
         if (synCtx.getServiceLog() != null) {
@@ -119,6 +126,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level TRACE to all available/enabled logs.
      */
+    @Override
     public void auditTrace(Object msg) {
         defaultLog.trace(msg);
         if (synCtx.getServiceLog() != null) {
@@ -132,6 +140,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level WARN to all available/enabled logs.
      */
+    @Override
     public void auditWarn(Object msg) {
         defaultLog.warn(msg);
         if (synCtx.getServiceLog() != null) {
@@ -145,6 +154,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level ERROR to all available/enabled logs.
      */
+    @Override
     public void auditError(Object msg) {
         defaultLog.error(msg);
         if (synCtx.getServiceLog() != null) {
@@ -158,6 +168,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level FATAL to all available/enabled logs.
      */
+    @Override
     public void auditFatal(Object msg) {
         defaultLog.fatal(msg);
         if (synCtx.getServiceLog() != null) {
@@ -171,6 +182,7 @@ public class MediatorLog implements SynapseLog {
     /**
      * Log a message at level ERROR to the default log and to the trace, if trace is enabled.
      */
+    @Override
     public void error(Object msg) {
         defaultLog.error(msg);
         if (traceOn) {
@@ -182,6 +194,7 @@ public class MediatorLog implements SynapseLog {
      * Log a message at level ERROR to the default log, the service log and the trace, if trace
      * is enabled.
      */
+    @Override
     public void logSynapseException(String msg, Throwable cause) {
         defaultLog.error(msg, cause);
         if (synCtx.getServiceLog() != null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorWorker.java b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorWorker.java
index 8f94930da..2525efd33 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/MediatorWorker.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/MediatorWorker.java
@@ -64,6 +64,7 @@ public class MediatorWorker implements Runnable {
      * Execution method of the thread. This will just call the mediation of the specified
      * Synapse MessageContext using the specified Sequence Mediator
      */
+    @Override
     public void run() {
         try {
             seq.mediate(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
index 05480b983..195bad4c2 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
@@ -66,6 +66,7 @@ public class SequenceMediator extends AbstractListMediator implements Nameable {
      * @param synCtx the synapse message
      * @return as per standard mediator result
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -203,6 +204,7 @@ public class SequenceMediator extends AbstractListMediator implements Nameable {
      * To get the name of the sequence
      * @return the name of the sequence
      */
+    @Override
     public String getName() {
         return name;
     }
@@ -211,6 +213,7 @@ public class SequenceMediator extends AbstractListMediator implements Nameable {
      * setting the name of the sequence
      * @param name the name of the this sequence
      */
+    @Override
     public void setName(String name) {
         this.name = name;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
index 8d11441f1..dae8252ab 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
@@ -41,6 +41,7 @@ public class SynapseMediator extends AbstractListMediator {
      * @param synCtx the message context
      * @return as per standard mediate() semantics
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/bean/BeanMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/bean/BeanMediator.java
index 5e694c2fa..fc3ad9a3c 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/bean/BeanMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/bean/BeanMediator.java
@@ -81,6 +81,7 @@ public class BeanMediator extends AbstractMediator {
      * @param synCtx The current message for mediation
      * @return true If mediation should continue
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/bean/enterprise/EJBMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/bean/enterprise/EJBMediator.java
index 99fca7047..f6a6f515a 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/bean/enterprise/EJBMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/bean/enterprise/EJBMediator.java
@@ -91,6 +91,7 @@ public class EJBMediator extends AbstractMediator implements ManagedLifecycle {
      *
      * @param se SynapseEnvironment to be used for initialization
      */
+    @Override
     public void init(SynapseEnvironment se) {
 
         EnterpriseBeanstalkManager beanstalkManager =
@@ -116,6 +117,7 @@ public class EJBMediator extends AbstractMediator implements ManagedLifecycle {
      * @param synCtx The current message for mediation
      * @return true If mediation should continue
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         Object ejb = beanstalk.getEnterpriseBean(
@@ -148,6 +150,7 @@ public class EJBMediator extends AbstractMediator implements ManagedLifecycle {
         return true;
     }
 
+    @Override
     public void destroy() {
     }
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
index d4750813b..62af517d3 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
@@ -76,18 +76,21 @@ public class CacheMediator extends AbstractMediator implements ManagedLifecycle
 
     private String cacheKey = "synapse.cache_key";
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (onCacheHitSequence != null) {
             onCacheHitSequence.init(se);
         }
     }
 
+    @Override
     public void destroy() {
         if (onCacheHitSequence != null) {
             onCacheHitSequence.destroy();
         }
     }
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
index 20db16cee..135c5a606 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
@@ -90,6 +90,7 @@ public class CalloutMediator extends AbstractMediator implements ManagedLifecycl
 
     private Axis2BlockingClient blockingMsgSender = null;
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -284,6 +285,7 @@ public class CalloutMediator extends AbstractMediator implements ManagedLifecycl
         return null;
     }
 
+    @Override
     public void init(SynapseEnvironment synEnv) {
         blockingMsgSender = new Axis2BlockingClient(clientRepository, axis2xml);
         blockingMsgSender.setInitClientOptions(initClientOptions);
@@ -323,6 +325,7 @@ public class CalloutMediator extends AbstractMediator implements ManagedLifecycl
         }
     }
 
+    @Override
     public void destroy() {
         if (!isWrappingEndpointCreated) {
             endpoint.destroy();
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
index 5917a498c..1d5dd57d5 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
@@ -35,6 +35,7 @@ public class DropMediator extends AbstractMediator {
      * @param synCtx the current message
      * @return false always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
          SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/EnqueueMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/EnqueueMediator.java
index 045bdd2fa..ed895f557 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/EnqueueMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/EnqueueMediator.java
@@ -45,6 +45,7 @@ public class EnqueueMediator extends AbstractMediator {
 
     private String sequenceName = null;
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         SynapseLog log = getLog(synCtx);
         if (log.isTraceOrDebugEnabled()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
index 2b3edf9f7..01acad76b 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
@@ -74,6 +74,7 @@ public class LogMediator extends AbstractMediator {
      * @param synCtx (current) message to be logged
      * @return true always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LoopbackMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LoopbackMediator.java
index bc11eb0b9..01a7bff13 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LoopbackMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LoopbackMediator.java
@@ -24,6 +24,7 @@ import org.apache.synapse.mediators.AbstractMediator;
 
 public class LoopbackMediator extends AbstractMediator {
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
index 110af76fe..32e262b10 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
@@ -79,6 +79,7 @@ public class PropertyMediator extends AbstractMediator {
      * @param synCtx the message context
      * @return true always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -224,6 +225,7 @@ public class PropertyMediator extends AbstractMediator {
         this.value = convertValue(value, type);
     }
 
+    @Override
     public String getType() {
         return type;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RespondMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RespondMediator.java
index 56052103e..2cc5e7e64 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RespondMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RespondMediator.java
@@ -36,6 +36,7 @@ public class RespondMediator extends AbstractMediator {
      * @param synCtx the current message for mediation
      * @return false
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
         SynapseLog synapseLog = getLog(synCtx);
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
index 171651b77..bb2ae6132 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
@@ -47,6 +47,7 @@ public class SendMediator extends AbstractMediator implements ManagedLifecycle {
      * @param synCtx the current message to be sent
      * @return false always as this is a leaf mediator
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -108,12 +109,14 @@ public class SendMediator extends AbstractMediator implements ManagedLifecycle {
         this.receivingSequence = receivingSequence;
     }
 
+    @Override
     public void init(SynapseEnvironment synapseEnvironment) {
         if (endpoint != null) {
             endpoint.init(synapseEnvironment);
         }
     }
 
+    @Override
     public void destroy() {
         if (endpoint != null) {
             endpoint.destroy();
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
index 1f45e0fe5..7ca4412ef 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
@@ -100,6 +100,7 @@ public class ValidateMediator extends AbstractListMediator {
     private final SchemaFactory factory = SchemaFactory.newInstance(
             XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
+    @Override
     @SuppressWarnings({"ThrowableResultOfMethodCallIgnored"})
     public boolean mediate(MessageContext synCtx) {
 
@@ -285,16 +286,19 @@ public class ValidateMediator extends AbstractListMediator {
         private boolean validationError = false;
         private SAXParseException saxParseException = null;
 
+        @Override
         public void error(SAXParseException exception) throws SAXException {
             validationError = true;
             saxParseException = exception;
         }
 
+        @Override
         public void fatalError(SAXParseException exception) throws SAXException {
             validationError = true;
             saxParseException = exception;
         }
 
+        @Override
         public void warning(SAXParseException exception) throws SAXException {
         }
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
index e75542d3e..346b8af86 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
@@ -73,6 +73,7 @@ public abstract class AbstractDBMediator extends AbstractMediator implements Man
      *  
      * @param se the Synapse environment reference
      */
+    @Override
     public void init(SynapseEnvironment se) {
         // check whether we shall try to lookup an existing data source or create a new custom data source
         if (dataSourceName != null) {
@@ -85,6 +86,7 @@ public abstract class AbstractDBMediator extends AbstractMediator implements Man
     /**
      * Destroys the mediator. If we are using our custom DataSource, then shut down the connections
      */
+    @Override
     public void destroy() {
         if (dataSourceName != null) {
             // Don't touch the globally configured JNDI data sources
@@ -108,6 +110,7 @@ public abstract class AbstractDBMediator extends AbstractMediator implements Man
      * @param synCtx the current message
      * @return true, always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         String name = (this instanceof DBLookupMediator ? "DBLookup" : "DBReport");
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
index 27e69d34d..9e6575103 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
@@ -32,6 +32,7 @@ import java.sql.Connection;
  */
 public class DBLookupMediator extends AbstractDBMediator {
 
+    @Override
     protected void processStatement(Statement stmnt, MessageContext msgCtx) {
 
         SynapseLog synLog = getLog(msgCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java
index d0e2d1462..fa42eaca9 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/db/DBReportMediator.java
@@ -43,6 +43,7 @@ public class DBReportMediator extends AbstractDBMediator {
     // default do not participate in a distribute tx
     boolean useTransaction = false;
 
+    @Override
     protected void processStatement(Statement stmnt, MessageContext msgCtx) {
 
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java
index 22bd3a91a..85595cc81 100755
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/Aggregate.java
@@ -215,6 +215,7 @@ public class Aggregate extends TimerTask {
         this.expiryTimeMillis = expiryTimeMillis;
     }
 
+    @Override
     public void run() {
         while (true) {
             if (completed) {
@@ -237,6 +238,7 @@ public class Aggregate extends TimerTask {
             this.aggregate = aggregate;
         }
 
+        @Override
         public void run() {
             aggregateMediator.completeAggregate(aggregate);
         }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
index 111ee8c81..a05f75232 100755
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
@@ -100,12 +100,14 @@ public class AggregateMediator extends AbstractMediator implements ManagedLifecy
         }
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (onCompleteSequence != null) {
             onCompleteSequence.init(se);
         }
     }
 
+    @Override
     public void destroy() {
         if (onCompleteSequence != null) {
             onCompleteSequence.destroy();
@@ -119,6 +121,7 @@ public class AggregateMediator extends AbstractMediator implements ManagedLifecy
      * @param synCtx - MessageContext to be mediated and aggregated
      * @return boolean true if the complete condition for the particular aggregate is validated
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/SamplingThrottleMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/SamplingThrottleMediator.java
index 81421380c..9e6f8663b 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/SamplingThrottleMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/SamplingThrottleMediator.java
@@ -66,6 +66,7 @@ public class SamplingThrottleMediator extends AbstractMediator implements Manage
 
     private TimerTask messageProcessor;
 
+    @Override
     public void init(SynapseEnvironment synapseEnvironment) {
 
         if (messageQueue.isPersistent()) {
@@ -80,6 +81,7 @@ public class SamplingThrottleMediator extends AbstractMediator implements Manage
         samplingTimer.schedule(messageProcessor, 0, unitTime);
     }
 
+    @Override
     public void destroy() {
         messageProcessor.cancel();
         if (!messageQueue.isEmpty()) {
@@ -101,6 +103,7 @@ public class SamplingThrottleMediator extends AbstractMediator implements Manage
         }
     }
 
+    @Override
     public boolean mediate(MessageContext messageContext) {
 
         SynapseLog synLog = getLog(messageContext);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/UnboundedMessageQueue.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/UnboundedMessageQueue.java
index d9915409d..2c556542b 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/UnboundedMessageQueue.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/sample/UnboundedMessageQueue.java
@@ -31,10 +31,12 @@ public class UnboundedMessageQueue implements MessageQueue {
 
     private List<MessageContext> messageQueue = new ArrayList<MessageContext>();
 
+    @Override
     public void add(MessageContext synCtx) {
         messageQueue.add(synCtx);
     }
 
+    @Override
     public MessageContext get() {
         if (!messageQueue.isEmpty()) {
             return messageQueue.remove(0);
@@ -43,18 +45,22 @@ public class UnboundedMessageQueue implements MessageQueue {
         }
     }
 
+    @Override
     public boolean isEmpty() {
         return messageQueue.isEmpty();
     }
 
+    @Override
     public boolean isPersistent() {
         return false;
     }
 
+    @Override
     public boolean persist() {
         return false;
     }
 
+    @Override
     public void load() {
         throw new UnsupportedOperationException("Not Implemented");
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
index 53ac09339..511bc7f26 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
@@ -65,6 +65,7 @@ public class CloneMediator extends AbstractMediator implements ManagedLifecycle
      * @param synCtx - MessageContext which is subjected to the cloning
      * @return boolean true if this needs to be further mediated (continueParent=true)
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -187,6 +188,7 @@ public class CloneMediator extends AbstractMediator implements ManagedLifecycle
         this.sequential = sequential;
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
 
         for (Target target : targets) {
@@ -201,6 +203,7 @@ public class CloneMediator extends AbstractMediator implements ManagedLifecycle
         }
     }
 
+    @Override
     public void destroy() {
 
         for (Target target : targets) {
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
index c3fa48a47..29a4c7ed2 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
@@ -78,6 +78,7 @@ public class IterateMediator extends AbstractMediator implements ManagedLifecycl
      * @param synCtx - MessageContext to be mediated
      * @return boolean false if need to stop processing of the parent message
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -272,6 +273,7 @@ public class IterateMediator extends AbstractMediator implements ManagedLifecycl
         this.id = id;
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (target != null) {
             Endpoint endpoint = target.getEndpoint();
@@ -286,6 +288,7 @@ public class IterateMediator extends AbstractMediator implements ManagedLifecycl
         }
     }
 
+    @Override
     public void destroy() {
         if (target != null) {
             Endpoint endpoint = target.getEndpoint();
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
index 937ff64d2..fd8227b29 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
@@ -68,6 +68,7 @@ public class EnrichMediator extends AbstractMediator {
 
     private Target target = null;
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         SynapseLog synLog = getLog(synCtx);
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eventing/EventPublisherMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eventing/EventPublisherMediator.java
index 7da24cb4c..199a0234a 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/eventing/EventPublisherMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/eventing/EventPublisherMediator.java
@@ -28,6 +28,7 @@ public class EventPublisherMediator extends AbstractMediator {
     private static final Log log = LogFactory.getLog(EventPublisherMediator.class);
     private String eventSourceName = null;
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         if (log.isDebugEnabled()) {
             log.debug("Mediation for Event Publisher started");
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
index ab9fff3c1..ab25a4bed 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
@@ -56,7 +56,8 @@ public class ClassMediator extends AbstractMediator implements ManagedLifecycle
 	 *            the message context
 	 * @return as per standard semantics
 	 */
-	public boolean mediate(MessageContext synCtx) {
+	@Override
+    public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
 
@@ -87,6 +88,7 @@ public class ClassMediator extends AbstractMediator implements ManagedLifecycle
         return result;
     }
 
+    @Override
     public void destroy() {
         if (log.isDebugEnabled()) {
             log.debug("Destroying class mediator instance for : " + mediator.getClass());
@@ -96,6 +98,7 @@ public class ClassMediator extends AbstractMediator implements ManagedLifecycle
         }
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (log.isDebugEnabled()) {
             log.debug("Initializing class mediator instance for : " + mediator.getClass());
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
index 589e384fb..d402c289f 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
@@ -89,6 +89,7 @@ public class POJOCommandMediator extends AbstractMediator {
      * @param synCtx - Synapse MessageContext to be mediated
      * @return boolean true since this will not stop exection chain
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
index 30a53af9f..3f694aa3f 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
@@ -68,6 +68,7 @@ public class FilterMediator extends AbstractListMediator implements
      * @param synCtx the current message
      * @return true if filter condition fails. else returns as per List mediator semantics
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -167,6 +168,7 @@ public class FilterMediator extends AbstractListMediator implements
      * @param synCtx the current message for evaluation of the test condition
      * @return true if evaluation of the XPath/Regex results in true
      */
+    @Override
     public boolean test(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
index 2cf385407..b7b312a8b 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
@@ -37,6 +37,7 @@ public class InMediator extends AbstractListMediator implements org.apache.synap
      * @param synCtx the current message
      * @return true if filter condition fails. else returns as per List mediator semantics
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
@@ -69,6 +70,7 @@ public class InMediator extends AbstractListMediator implements org.apache.synap
      * @param synCtx the message context
      * @return MessageContext#isResponse()
      */
+    @Override
     public boolean test(MessageContext synCtx) {
         return !synCtx.isResponse();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
index c2e92219e..0a5abfba8 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
@@ -37,6 +37,7 @@ public class OutMediator extends AbstractListMediator implements org.apache.syna
      * @param synCtx the current message
      * @return true if filter condition fails. else returns as per List mediator semantics
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
         
         SynapseLog synLog = getLog(synCtx);
@@ -69,6 +70,7 @@ public class OutMediator extends AbstractListMediator implements org.apache.syna
      * @param synCtx the message context
      * @return MessageContext#isResponse()
      */
+    @Override
     public boolean test(MessageContext synCtx) {
         return synCtx.isResponse();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
index ee1470245..529167246 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
@@ -45,6 +45,7 @@ public class SwitchMediator extends AbstractMediator implements ManagedLifecycle
     /** The default switch case, if any */
     private SwitchCase defaultCase = null;
 
+    @Override
     public void init(SynapseEnvironment se) {
         for (ManagedLifecycle swCase : cases) {
             swCase.init(se);
@@ -54,6 +55,7 @@ public class SwitchMediator extends AbstractMediator implements ManagedLifecycle
         }
     }
 
+    @Override
     public void destroy() {
         for (ManagedLifecycle swCase : cases) {
             swCase.destroy();
@@ -69,6 +71,7 @@ public class SwitchMediator extends AbstractMediator implements ManagedLifecycle
      * @param synCtx current context
      * @return as per standard semantics
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
index d8fc48a09..322c0d8fa 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
@@ -44,6 +44,7 @@ public class ConditionalRouterMediator extends AbstractMediator {
     
     private boolean continueAfterExplicitlySet;
     
+    @Override
     public boolean mediate(MessageContext synCtx) {
         
         Axis2MessageContext axis2smc = (Axis2MessageContext) synCtx;
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
index 0103f2b94..6dbd96a48 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/store/MessageStoreMediator.java
@@ -49,6 +49,7 @@ public class MessageStoreMediator extends AbstractMediator{
     private String  onStoreSequence;
 
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         if(synCtx != null) {
             MessageStore messageStore = synCtx.getConfiguration().getMessageStore(messageStoreName);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java
index 08b34553d..ec65eba61 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java
@@ -55,6 +55,7 @@ public class InvokeMediator extends AbstractMediator {
         pName2ExpressionMap = new LinkedHashMap<String, Value>();
     }
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         SynapseLog synLog = getLog(synCtx);
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java
index 587aa60d6..72c17f7a8 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java
@@ -61,6 +61,7 @@ public class TemplateMediator extends AbstractListMediator {
         return eipPatternName;
     }
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
         SynapseLog synLog = getLog(synCtx);
 
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
index 07b445746..1293b041a 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transaction/TransactionMediator.java
@@ -45,6 +45,7 @@ public class TransactionMediator extends AbstractMediator {
 
     private String action = "";
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         UserTransaction tx = null;
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
index e8998c000..dc247415e 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
@@ -85,6 +85,7 @@ public class FaultMediator extends AbstractMediator {
     /** array of fault detail elements */
     private final List<OMElement> faultDetailElements = new ArrayList<OMElement>();
 
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
index ba74df8ed..efec8ebd5 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
@@ -71,6 +71,7 @@ public class HeaderMediator extends AbstractMediator {
      * @param synCtx the current message which is altered as necessary
      * @return true always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
index caee2a485..36bd48c10 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
@@ -64,6 +64,7 @@ public class PayloadFactoryMediator extends AbstractMediator {
      * @param synCtx the current message for mediation
      * @return true if the transformation is successful, false otherwise.
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SOAPBody soapBody = synCtx.getEnvelope().getBody();
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
index 4915f5554..bcfb2700f 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
@@ -70,17 +70,20 @@ public class XSLTMediator extends AbstractMediator {
             this.activity = activity;
         }
         
+        @Override
         public void warning(TransformerException e) throws TransformerException {
             if (synLog.isTraceOrDebugEnabled()) {
                 synLog.traceOrDebugWarn("Warning encountered during " + activity + " : " + e);
             }
         }
         
+        @Override
         public void error(TransformerException e) throws TransformerException {
             synLog.error("Error occurred in " + activity + " : " + e);
             throw e;
         }
         
+        @Override
         public void fatalError(TransformerException e) throws TransformerException {
             synLog.error("Fatal error occurred in " + activity + " : " + e);
             throw e;
@@ -178,6 +181,7 @@ public class XSLTMediator extends AbstractMediator {
      * @param synCtx the current message where the transformation will apply
      * @return true always
      */
+    @Override
     public boolean mediate(MessageContext synCtx) {
 
         SynapseLog synLog = getLog(synCtx);
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/url/URLRewriteMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/url/URLRewriteMediator.java
index 47cfebf24..32e2d301d 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/url/URLRewriteMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/url/URLRewriteMediator.java
@@ -41,6 +41,7 @@ public class URLRewriteMediator extends AbstractMediator {
     private String inputProperty;
     private String outputProperty;
 
+    @Override
     public boolean mediate(MessageContext messageContext) {
         URIFragments fragments;
         URI inputURI = getInputAddress(messageContext);
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java b/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
index d33b8c882..e3d63e8b5 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
@@ -68,11 +68,13 @@ public abstract class AbstractMessageProcessor implements MessageProcessor {
     private State state  = State.DESTROY;
 
 
+    @Override
     public void init(SynapseEnvironment se) {
         configuration = se.getSynapseConfiguration();
     }
 
 
+    @Override
     public void setMessageStoreName(String  messageStore) {
         if (messageStore != null) {
             this.messageStore = messageStore;
@@ -81,51 +83,63 @@ public abstract class AbstractMessageProcessor implements MessageProcessor {
         }
     }
 
+    @Override
     public String getMessageStoreName() {
         return messageStore;
     }
 
+    @Override
     public void setParameters(Map<String, Object> parameters) {
         this.parameters = parameters;
     }
 
+    @Override
     public Map<String, Object> getParameters() {
         return parameters;
     }
 
+    @Override
     public boolean isStarted() {
         return state == State.START;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
 
+    @Override
     public void setDescription(String description) {
         this.description=description;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
 
+    @Override
     public void setFileName(String filename) {
         this.fileName = filename;
     }
 
+    @Override
     public String getFileName() {
         return fileName;
     }
 
+    @Override
     public void setTargetEndpoint(String targetEndpoint) {
         this.targetEndpoint = targetEndpoint;
     }
 
+    @Override
     public String getTargetEndpoint() {
         return targetEndpoint;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/ScheduledMessageProcessor.java b/modules/core/src/main/java/org/apache/synapse/message/processors/ScheduledMessageProcessor.java
index eeb4eed74..8f93e1ab2 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/ScheduledMessageProcessor.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/ScheduledMessageProcessor.java
@@ -67,6 +67,7 @@ public abstract class ScheduledMessageProcessor extends AbstractMessageProcessor
     protected State state = State.DESTROY;
 
 
+    @Override
     public void start() {
         Trigger trigger;
         TriggerBuilder<Trigger> triggerBuilder = TriggerBuilder.newTrigger().
@@ -98,6 +99,7 @@ public abstract class ScheduledMessageProcessor extends AbstractMessageProcessor
         }
     }
 
+    @Override
     public void stop() {
         if (state == State.START) {
             try {
@@ -116,6 +118,7 @@ public abstract class ScheduledMessageProcessor extends AbstractMessageProcessor
     }
 
 
+    @Override
     public void setParameters(Map<String, Object> parameters) {
         super.setParameters(parameters);
         if (parameters != null && !parameters.isEmpty()) {
@@ -138,6 +141,7 @@ public abstract class ScheduledMessageProcessor extends AbstractMessageProcessor
         }
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         super.init(se);
         StdSchedulerFactory sf = new StdSchedulerFactory();
@@ -179,6 +183,7 @@ public abstract class ScheduledMessageProcessor extends AbstractMessageProcessor
         return new JobDataMap();
     }
 
+    @Override
     public void destroy() {
         try {
             scheduler.deleteJob( new JobKey(name + "-trigger",SCHEDULED_MESSAGE_PROCESSOR_GROUP));
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
index aee0d08e4..08088bcbe 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
@@ -67,6 +67,7 @@ public class ForwardingJob implements StatefulJob {
     private ScheduledMessageForwardingProcessor processor;
     private String targetEndpoint = null;
 
+    @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         //Get the Global Objects from DataMap
         JobDataMap jdm = jobExecutionContext.getMergedJobDataMap();
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/MessageForwardingProcessorView.java b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/MessageForwardingProcessorView.java
index ec292a7cd..c91fb49a4 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/MessageForwardingProcessorView.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/MessageForwardingProcessorView.java
@@ -69,6 +69,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
 
     }
 
+    @Override
     public void resendAll() throws Exception {
         if (!processor.isActive()) {
 
@@ -81,6 +82,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
         }
     }
 
+    @Override
     public void deleteAll() throws Exception {
         if (!processor.isActive()) {
             messageStore.clear();
@@ -90,6 +92,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
         }
     }
 
+    @Override
     public List<String> messageIdList() throws Exception {
         if (!processor.isActive()) {
             int size = messageStore.size();
@@ -110,6 +113,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
 
     }
 
+    @Override
     public void resend(String messageID) throws Exception {
         if (!processor.isActive()) {
             if (messageID != null && !"".equals(messageID.trim())) {
@@ -125,6 +129,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
         }
     }
 
+    @Override
     public void delete(String messageID) throws Exception {
         if (!processor.isActive()) {
              if (messageID != null && !"".equals(messageID.trim())) {
@@ -136,6 +141,7 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
         }
     }
 
+    @Override
     public String getEnvelope(String messageID) throws Exception {
         if (!processor.isActive()) {
              if (messageID != null && !"".equals(messageID.trim())) {
@@ -156,22 +162,26 @@ public class MessageForwardingProcessorView implements MessageForwardingProcesso
         return null;
     }
 
+    @Override
     public int getSize() {
         return messageStore.size();
     }
 
 
+    @Override
     public boolean isActive() {
         assert processor != null;
         return processor.isActive();
     }
 
+    @Override
     public void activate() {
         assert processor != null;
         processor.resetSentAttemptCount();
         processor.activate();
     }
 
+    @Override
     public void deactivate() {
         assert processor != null;
         processor.deactivate();
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java b/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
index 5c2e457fe..a9cde3367 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/resequence/ResequencingJob.java
@@ -55,6 +55,7 @@ public class ResequencingJob implements Job {
      * @param jobExecutionContext - a bundle with information related to environment
      * @throws JobExecutionException - to indicate Quartz scheduler that an error occurred while executing the job
      */
+    @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 
         final JobDataMap jdm = jobExecutionContext.getMergedJobDataMap();
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingJob.java b/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingJob.java
index 899268589..398127484 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingJob.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingJob.java
@@ -38,6 +38,7 @@ import java.util.concurrent.ExecutorService;
 public class SamplingJob implements Job {
     private static Log log = LogFactory.getLog(SamplingJob.class);
 
+    @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         JobDataMap jdm = jobExecutionContext.getMergedJobDataMap();
 
@@ -72,6 +73,7 @@ public class SamplingJob implements Job {
                     final ExecutorService executor = messageContext.getEnvironment().
                             getExecutorService();
                     executor.submit(new Runnable() {
+                        @Override
                         public void run() {
                             try {
                                 Mediator processingSequence = messageContext.getSequence(sequence);
diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingProcessorView.java b/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingProcessorView.java
index 16836885e..c6dad95b5 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingProcessorView.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/sampler/SamplingProcessorView.java
@@ -27,16 +27,19 @@ public class SamplingProcessorView implements SamplingProcessorViewMBean{
         this.processor = processor;
     }
 
+    @Override
     public void activate() {
         assert processor != null;
         processor.activate();
     }
 
+    @Override
     public void deactivate() {
         assert processor != null;
         processor.deactivate();
     }
 
+    @Override
     public boolean isActive() {
         assert processor != null;
         return processor.isActive();
diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/AbstractMessageStore.java b/modules/core/src/main/java/org/apache/synapse/message/store/AbstractMessageStore.java
index b2f99c5b0..179f2c84f 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/store/AbstractMessageStore.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/store/AbstractMessageStore.java
@@ -81,15 +81,18 @@ public abstract class AbstractMessageStore implements MessageStore {
 
 
 
+    @Override
     public void init(SynapseEnvironment se) {
         this.synapseEnvironment = se;
         this.synapseConfiguration = synapseEnvironment.getSynapseConfiguration();
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
         messageStoreMBean = new MessageStoreView(name, this);
@@ -98,12 +101,14 @@ public abstract class AbstractMessageStore implements MessageStore {
     }
 
 
+    @Override
     public void registerObserver(MessageStoreObserver observer) {
         if(observer != null && !messageStoreObservers.contains(observer)) {
             messageStoreObservers.add(observer);
         }
     }
 
+    @Override
     public void unregisterObserver(MessageStoreObserver observer) {
         if(observer != null && messageStoreObservers.contains(observer)) {
             messageStoreObservers.remove(observer);
@@ -129,36 +134,44 @@ public abstract class AbstractMessageStore implements MessageStore {
             o.messageRemoved(messageId);
         }
     }
+    @Override
     public int size() {
         return -1;
     }
 
 
+    @Override
     public Map<String, Object> getParameters() {
         return parameters;
     }
 
+    @Override
     public void setParameters(Map<String, Object> parameters) {
         this.parameters = parameters;
     }
 
 
+    @Override
     public void destroy() {
         MBeanRegistrar.getInstance().unRegisterMBean("MessageStore", this.name);
     }
 
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
 
+    @Override
     public String getDescription() {
         return this.description;
     }
 
+    @Override
     public void setFileName(String filename) {
         this.fileName = filename;
     }
 
+    @Override
     public String getFileName() {
         return this.fileName;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/InMemoryMessageStore.java b/modules/core/src/main/java/org/apache/synapse/message/store/InMemoryMessageStore.java
index 83be214ce..2203a5a9a 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/store/InMemoryMessageStore.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/store/InMemoryMessageStore.java
@@ -40,6 +40,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
 
     private Lock lock = new ReentrantLock();
 
+    @Override
     public boolean offer(MessageContext messageContext) {
         lock.lock();
         try {
@@ -59,6 +60,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         return true;
     }
 
+    @Override
     public MessageContext poll() {
         lock.lock();
         try {
@@ -73,10 +75,12 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         }
     }
 
+    @Override
     public MessageContext peek() {
         return messageList.peek();        
     }
 
+    @Override
     public MessageContext remove() throws NoSuchElementException {
         lock.lock();
         try {
@@ -90,6 +94,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         }
     }
 
+    @Override
     public MessageContext get(int index) {
         lock.lock();
         try {
@@ -108,6 +113,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         }
     }
 
+    @Override
     public MessageContext remove(String messageID) {
         lock.lock();
         try {
@@ -130,6 +136,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         return null;
     }
 
+    @Override
     public void clear() {
         lock.lock();
         try {
@@ -143,6 +150,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         }
     }
 
+    @Override
     public List<MessageContext> getAll() {
         lock.lock();
         try {
@@ -154,6 +162,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         }
     }
 
+    @Override
     public MessageContext get(String messageId) {
         lock.lock();
         try {
@@ -170,6 +179,7 @@ public class InMemoryMessageStore extends AbstractMessageStore {
         return null;
     }
 
+    @Override
     public int size() {
         return messageList.size();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/MessageStoreView.java b/modules/core/src/main/java/org/apache/synapse/message/store/MessageStoreView.java
index 5e81b6282..25634992e 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/store/MessageStoreView.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/store/MessageStoreView.java
@@ -40,11 +40,13 @@ public class MessageStoreView implements MessageStoreViewMBean{
     }
 
 
+    @Override
     public void deleteAll() {
         messageStore.clear();
         log.info("All messages in Message Store" + messageStoreName + " were deleted");
     }
 
+    @Override
     public List<String> getMessageIds() {
 
         List<String> returnList = new ArrayList<String>();
@@ -56,6 +58,7 @@ public class MessageStoreView implements MessageStoreViewMBean{
         return returnList;
     }
 
+    @Override
     public void delete(String messageID) {
         if(messageID != null) {
             MessageContext m =messageStore.remove(messageID);
@@ -65,6 +68,7 @@ public class MessageStoreView implements MessageStoreViewMBean{
         }
     }
 
+    @Override
     public String getEnvelope(String messageID) {
         if (messageID != null) {
             MessageContext m = messageStore.get(messageID);
@@ -76,6 +80,7 @@ public class MessageStoreView implements MessageStoreViewMBean{
         return null;
     }
 
+    @Override
     public int getSize() {
         return messageStore.size();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java b/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java
index 89acde160..0f961492b 100644
--- a/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java
@@ -30,6 +30,7 @@ import org.apache.axis2.handlers.AbstractHandler;
 
 public class GlobalRequestCountHandler extends AbstractHandler {
 
+    @Override
     public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
         msgContext
                 .setProperty(MetricsConstants.REQUEST_RECEIVED_TIME, System.currentTimeMillis());
diff --git a/modules/core/src/main/java/org/apache/synapse/metrics/MetricsAggregatorModule.java b/modules/core/src/main/java/org/apache/synapse/metrics/MetricsAggregatorModule.java
index 838e71b1e..26302915d 100644
--- a/modules/core/src/main/java/org/apache/synapse/metrics/MetricsAggregatorModule.java
+++ b/modules/core/src/main/java/org/apache/synapse/metrics/MetricsAggregatorModule.java
@@ -34,6 +34,7 @@ import org.apache.neethi.Policy;
 
 public class MetricsAggregatorModule implements Module {
     // initialize the module
+    @Override
     public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault {
         AxisConfiguration axiConfiguration = configContext.getAxisConfiguration();
 
@@ -45,16 +46,20 @@ public class MetricsAggregatorModule implements Module {
 
     }
 
+    @Override
     public void engageNotify(AxisDescription axisDescription) throws AxisFault {}
 
+    @Override
     public boolean canSupportAssertion(Assertion assertion) {
         return false;
     }
 
+    @Override
     public void applyPolicy(Policy policy, AxisDescription axisDescription) throws AxisFault {
         // no implementation 
     }
 
     // shutdown the module
+    @Override
     public void shutdown(ConfigurationContext configurationContext) throws AxisFault {}
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java b/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
index ea9205dbd..7340464d5 100644
--- a/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
+++ b/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
@@ -45,6 +45,7 @@ public abstract class AbstractRegistry implements Registry {
      * @param properties bag of properties with additional information
      * @return the matching resultant object
      */
+    @Override
     public Object getResource(Entry entry, Properties properties) {
 
         OMNode omNode = null;
@@ -195,18 +196,22 @@ public abstract class AbstractRegistry implements Registry {
         return null;
     }
 
+    @Override
     public String getProviderClass() {
         return this.getClass().getName();
     }
 
+    @Override
     public Properties getConfigurationProperties() {
         return properties;
     }
 
+    @Override
     public void init(Properties properties) {
         this.properties.putAll(properties);
     }
 
+    @Override
     public Properties getResourceProperties(String entryKey) {
         return null;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java b/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
index f459bdf29..3ec023f76 100644
--- a/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/synapse/registry/RegistryEntryImpl.java
@@ -40,6 +40,7 @@ public class RegistryEntryImpl implements RegistryEntry {
     private long lastModified;
     private long cachableDuration;
 
+    @Override
     public String getKey() {
         return key;
     }
@@ -48,6 +49,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.key = key;
     }
 
+    @Override
     public String getName() {
         return name;
     }
@@ -56,6 +58,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.name = name;
     }
 
+    @Override
     public long getVersion() {
         return version;
     }
@@ -64,6 +67,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.version = version;
     }
 
+    @Override
     public String getType() {
         return type;
     }
@@ -81,6 +85,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         }
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
@@ -89,6 +94,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.description = description;
     }
 
+    @Override
     public long getCreated() {
         return created;
     }
@@ -97,6 +103,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.created = created;
     }
 
+    @Override
     public long getLastModified() {
         return lastModified;
     }
@@ -105,6 +112,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.lastModified = lastModified;
     }
 
+    @Override
     public long getCachableDuration() {
         return cachableDuration;
     }
@@ -113,6 +121,7 @@ public class RegistryEntryImpl implements RegistryEntry {
         this.cachableDuration = cachableDuration;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("RegistryEntry {")
diff --git a/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java b/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
index 30ef8f0b4..fc6c46933 100644
--- a/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
+++ b/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
@@ -54,6 +54,7 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
     private String root = "";
     private final OMFactory omFactory = OMAbstractFactory.getOMFactory();
 
+    @Override
     public OMNode lookup(String key) {
 
         if (log.isDebugEnabled()) {
@@ -140,6 +141,7 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
         return result;
     }
 
+    @Override
     public RegistryEntry getRegistryEntry(String key) {
 
         if (log.isDebugEnabled()) {
@@ -175,6 +177,7 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
         return wre;
     }
 
+    @Override
     public void init(Properties properties) {
         super.init(properties);
         String value = properties.getProperty("root");
@@ -197,18 +200,22 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
     }
 
 
+    @Override
     public void delete(String path) {
         //TODO
     }
 
+    @Override
     public void newResource(String path, boolean isDirectory) {
         //TODO
     }
 
+    @Override
     public void updateResource(String path, Object value) {
         //TODO
     }
 
+    @Override
     public void updateRegistryEntry(RegistryEntry entry) {
         //TODO
     }
@@ -219,6 +226,7 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
         return cachableDuration == null ? 1500 : Long.parseLong(cachableDuration);
     }
 
+    @Override
     public RegistryEntry[] getChildren(RegistryEntry entry) {
         URL url;
         if (entry == null) {
@@ -278,6 +286,7 @@ public class SimpleURLRegistry extends AbstractRegistry implements Registry {
         }
     }
 
+    @Override
     public RegistryEntry[] getDescendants(RegistryEntry entry) {
 
         ArrayList<RegistryEntry> list = new ArrayList<RegistryEntry>();
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/API.java b/modules/core/src/main/java/org/apache/synapse/rest/API.java
index 82e12a8c5..ea9b23f3a 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/API.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/API.java
@@ -161,6 +161,7 @@ public class API extends AbstractRESTProcessor implements ManagedLifecycle {
         return handlers.toArray(new Handler[handlers.size()]);
     }
 
+    @Override
     boolean canProcess(MessageContext synCtx) {
         if (synCtx.isResponse()) {
             String apiName = (String) synCtx.getProperty(RESTConstants.SYNAPSE_REST_API);
@@ -243,6 +244,7 @@ public class API extends AbstractRESTProcessor implements ManagedLifecycle {
         return true;
     }
 
+    @Override
     void process(MessageContext synCtx) {
         if (log.isDebugEnabled()) {
             log.debug("Processing message with ID: " + synCtx.getMessageID() + " through the " +
@@ -394,6 +396,7 @@ public class API extends AbstractRESTProcessor implements ManagedLifecycle {
         }
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (resources.isEmpty()) {
             handleException("The API: " + name + " has been configured without " +
@@ -412,6 +415,7 @@ public class API extends AbstractRESTProcessor implements ManagedLifecycle {
         }
     }
 
+    @Override
     public void destroy() {
         log.info("Destroying API: " + name);
         for (Resource resource : resources.values()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/Resource.java b/modules/core/src/main/java/org/apache/synapse/rest/Resource.java
index 0e3566418..3f6c4aec5 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/Resource.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/Resource.java
@@ -257,6 +257,7 @@ public class Resource extends AbstractRESTProcessor implements ManagedLifecycle
         return true;
     }
 
+    @Override
     void process(MessageContext synCtx) {
         if (log.isDebugEnabled()) {
             log.debug("Processing message with ID: " + synCtx.getMessageID() + " through the " +
@@ -393,6 +394,7 @@ public class Resource extends AbstractRESTProcessor implements ManagedLifecycle
         return value.toString();
     }
 
+    @Override
     public void init(SynapseEnvironment se) {
         if (log.isDebugEnabled()) {
             log.debug("Initializing resource with ID: " + name);
@@ -409,6 +411,7 @@ public class Resource extends AbstractRESTProcessor implements ManagedLifecycle
         }
     }
 
+    @Override
     public void destroy() {
         if (log.isDebugEnabled()) {
             log.debug("Destroying resource with ID: " + name);
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/DefaultDispatcher.java b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/DefaultDispatcher.java
index 1ed5e1479..3866d38d2 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/DefaultDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/DefaultDispatcher.java
@@ -27,6 +27,7 @@ import java.util.Collection;
 
 public class DefaultDispatcher implements RESTDispatcher {
 
+    @Override
     public Resource findResource(MessageContext synCtx, Collection<Resource> resources) {
         for (Resource resource : resources) {
             if (resource.getDispatcherHelper() == null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateBasedDispatcher.java b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateBasedDispatcher.java
index 5f7f39538..e2aebb0be 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateBasedDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateBasedDispatcher.java
@@ -28,6 +28,7 @@ import java.util.Map;
 
 public class URITemplateBasedDispatcher implements RESTDispatcher {
 
+    @Override
     public Resource findResource(MessageContext synCtx, Collection<Resource> resources) {
         String url = RESTUtils.getSubRequestPath(synCtx);
         for (Resource r : resources) {
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateHelper.java b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateHelper.java
index 551665905..f00700c8b 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateHelper.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URITemplateHelper.java
@@ -42,6 +42,7 @@ public class URITemplateHelper implements DispatcherHelper {
         return uriTemplate;
     }
 
+    @Override
     public String getString() {
         return templateString;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingBasedDispatcher.java b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingBasedDispatcher.java
index 7c22a97f4..db75dcd96 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingBasedDispatcher.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingBasedDispatcher.java
@@ -30,6 +30,7 @@ public class URLMappingBasedDispatcher implements RESTDispatcher {
 
     private static final Log log = LogFactory.getLog(URLMappingBasedDispatcher.class);
 
+    @Override
     public Resource findResource(MessageContext synCtx, Collection<Resource> resources) {
         List<URLMappingHelper> mappings = new ArrayList<URLMappingHelper>();
         List<Resource> filteredResources = new ArrayList<Resource>();
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingHelper.java b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingHelper.java
index 8507a8f52..e488d912e 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingHelper.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/dispatch/URLMappingHelper.java
@@ -91,6 +91,7 @@ public class URLMappingHelper implements DispatcherHelper {
         return 0;
     }
 
+    @Override
     public String getString() {
         if (pathSegments != null) {
             StringBuilder str = new StringBuilder("");
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/version/AbstractVersionStrategy.java b/modules/core/src/main/java/org/apache/synapse/rest/version/AbstractVersionStrategy.java
index bd76a9990..ddf8a90bf 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/version/AbstractVersionStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/version/AbstractVersionStrategy.java
@@ -31,6 +31,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
         this.versionType = versionType;
     }
 
+    @Override
     public String getVersion() {
         return version;
     }
@@ -39,6 +40,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
         return api;
     }
 
+    @Override
     public String getVersionType(){
         return versionType;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/version/DefaultStrategy.java b/modules/core/src/main/java/org/apache/synapse/rest/version/DefaultStrategy.java
index 3bad31b4d..8467c5fac 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/version/DefaultStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/version/DefaultStrategy.java
@@ -27,10 +27,12 @@ public class DefaultStrategy extends  AbstractVersionStrategy{
         super(api, "", VersionStrategyFactory.TYPE_NULL);
     }
 
+    @Override
     public boolean isMatchingVersion(Object versionInfoObj) {
         return true;
     }
 
+    @Override
     public String getVersionParam() {
         return "";
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/rest/version/URLBasedVersionStrategy.java b/modules/core/src/main/java/org/apache/synapse/rest/version/URLBasedVersionStrategy.java
index 1d7ae0858..8816a2a85 100644
--- a/modules/core/src/main/java/org/apache/synapse/rest/version/URLBasedVersionStrategy.java
+++ b/modules/core/src/main/java/org/apache/synapse/rest/version/URLBasedVersionStrategy.java
@@ -31,6 +31,7 @@ public class URLBasedVersionStrategy extends AbstractVersionStrategy {
         this.versionParam = versionParam;
     }
 
+    @Override
     public boolean isMatchingVersion(Object versionInfoObj) {
         MessageContext msgContext = (MessageContext) versionInfoObj;
         String path = RESTUtils.getFullRequestPath(msgContext);
@@ -62,6 +63,7 @@ public class URLBasedVersionStrategy extends AbstractVersionStrategy {
         return version.equals(incomingVersionStr);
     }
 
+    @Override
     public String getVersionParam() {
         return versionParam;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java b/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
index a3e67033f..db93fc6f8 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
@@ -46,6 +46,7 @@ public abstract class AbstractStartup implements Startup {
      *
      * @return String representing the name
      */
+    @Override
     public String getName() {
         return this.name;
     }
@@ -56,6 +57,7 @@ public abstract class AbstractStartup implements Startup {
      * @param name
      *          String name to be set to the startup
      */
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -65,6 +67,7 @@ public abstract class AbstractStartup implements Startup {
      *
      * @return a file name as a string or null
      */
+    @Override
     public String getFileName() {
         return fileName;
     }
@@ -74,6 +77,7 @@ public abstract class AbstractStartup implements Startup {
      *
      * @param fileName the name of the file as a string
      */
+    @Override
     public void setFileName(String fileName) {
         this.fileName = fileName;
     }
@@ -83,6 +87,7 @@ public abstract class AbstractStartup implements Startup {
      *
      * @return description of the startup
      */
+    @Override
     public String getDescription() {
         return description;
     }
@@ -92,6 +97,7 @@ public abstract class AbstractStartup implements Startup {
      *
      * @param description tobe set to the artifact
      */
+    @Override
     public void setDescription(String description) {
         this.description = description;
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
index ec938824c..30413656a 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
@@ -54,10 +54,12 @@ public class SimpleQuartz extends AbstractStartup {
 
     private Task task = null;
 
+    @Override
     public QName getTagQName() {
         return SimpleQuartzFactory.TASK;
     }
 
+    @Override
     public void destroy() {
 
         if (taskDescription == null) {
@@ -86,6 +88,7 @@ public class SimpleQuartz extends AbstractStartup {
         }
     }
 
+    @Override
     public void init(SynapseEnvironment synapseEnvironment) {
 
         if (taskDescription == null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
index 7187dee77..74b103165 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
@@ -48,6 +48,7 @@ public class SimpleQuartzFactory implements StartupFactory {
 
     private final static Log log = LogFactory.getLog(SimpleQuartzFactory.class);
 
+    @Override
     public Startup createStartup(OMElement el) {
         
         if (log.isDebugEnabled()) {
@@ -74,10 +75,12 @@ public class SimpleQuartzFactory implements StartupFactory {
         }
     }
 
+    @Override
     public Class<SimpleQuartzSerializer> getSerializerClass() {
         return SimpleQuartzSerializer.class;
     }
 
+    @Override
     public QName getTagQName() {
         return TASK;
     }  
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
index 4457a00ab..76cf49bf6 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
@@ -42,6 +42,7 @@ public class SimpleQuartzJob implements Job {
 
     private static final Log log = LogFactory.getLog(SimpleQuartzJob.class);
 
+    @Override
     public void execute(JobExecutionContext ctx) throws JobExecutionException {
 
         String jobName = ctx.getJobDetail().getKey().getName();
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
index 7b9737572..cd1b4853d 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
@@ -29,6 +29,7 @@ import org.apache.synapse.config.xml.StartupSerializer;
 
 public class SimpleQuartzSerializer implements StartupSerializer {
 
+    @Override
     public OMElement serializeStartup(OMElement parent, Startup s) {
 
         if (!(s instanceof SimpleQuartz)) {
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java b/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
index 48acf47bc..87675a379 100644
--- a/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
+++ b/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
@@ -109,6 +109,7 @@ public class MessageInjector implements Task, ManagedLifecycle {
      * @param se
      *          SynapseEnvironment of synapse
      */
+    @Override
     public void init(SynapseEnvironment se) {
 		synapseEnvironment = se;
 	}
@@ -180,6 +181,7 @@ public class MessageInjector implements Task, ManagedLifecycle {
      * This will be invoked by the scheduler to inject the message
      * in to the SynapseEnvironment
      */
+    @Override
     public void execute() {
 
         if (log.isDebugEnabled()) {
@@ -324,6 +326,7 @@ public class MessageInjector implements Task, ManagedLifecycle {
     /**
      * Destroys the Injector
      */
+    @Override
     public void destroy() {
     }
 
diff --git a/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java b/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java
index b50502493..e53d0358b 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java
@@ -29,6 +29,7 @@ import java.net.URLStreamHandler;
 
 public final class ClasspathURLStreamHandler extends URLStreamHandler {
 
+    @Override
     public URLConnection openConnection(URL url) {
         return new URLConnectionImpl(url);
     }
@@ -39,8 +40,10 @@ public final class ClasspathURLStreamHandler extends URLStreamHandler {
             super(url);
         }
 
+        @Override
         public void connect() {}
 
+        @Override
         public InputStream getInputStream() throws IOException {
             if (url == null) {
                 throw new MalformedURLException("Null or empty classpath URL");
@@ -55,6 +58,7 @@ public final class ClasspathURLStreamHandler extends URLStreamHandler {
             return is;
         }
 
+        @Override
         public OutputStream getOutputStream() {
             throw new UnsupportedOperationException();
         }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/FixedByteArrayOutputStream.java b/modules/core/src/main/java/org/apache/synapse/util/FixedByteArrayOutputStream.java
index d9218af2a..c0f687264 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/FixedByteArrayOutputStream.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/FixedByteArrayOutputStream.java
@@ -28,6 +28,7 @@ public class FixedByteArrayOutputStream extends ByteArrayOutputStream {
         super(size);
     }
 
+    @Override
     public synchronized void write(int b) {
         if (count+1 > buf.length) {
             throw new SynapseException("Fixed size of internal byte array exceeded");
@@ -35,6 +36,7 @@ public class FixedByteArrayOutputStream extends ByteArrayOutputStream {
         super.write(b);
     }
 
+    @Override
     public synchronized void write(byte b[], int off, int len) {
         if (count+len > buf.length) {
             throw new SynapseException("Fixed size of internal byte array exceeded");
diff --git a/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java b/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
index 911887546..8b77b8553 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
@@ -211,6 +211,7 @@ public class MessageHelper {
         Map<String, Object> clonedHeaders;
         if (headers instanceof TreeMap) {
             clonedHeaders = new TreeMap<String, Object>(new Comparator<String>() {
+                @Override
                 public int compare(String s1, String s2) {
                     return s1.compareToIgnoreCase(s2);
                 }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java b/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
index f9177496e..d935bce0d 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/SimpleMapImpl.java
@@ -71,10 +71,12 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         super();
     }
 
+    @Override
     public Object get(String name) {
         return this.get((Object) name);
     }
 
+    @Override
     public boolean getBoolean(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Boolean) {
@@ -85,6 +87,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public byte getByte(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Byte) {
@@ -95,6 +98,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public byte[] getBytes(String name) {
         Object o = this.get((Object) name);
         if (o instanceof byte[]) {
@@ -105,6 +109,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public char getChar(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Character) {
@@ -116,6 +121,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public double getDouble(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Double) {
@@ -126,6 +132,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public float getFloat(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Float) {
@@ -136,6 +143,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public int getInt(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Integer) {
@@ -146,6 +154,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public long getLong(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Long) {
@@ -156,6 +165,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public short getShort(String name) {
         Object o = this.get((Object) name);
         if (o instanceof Short) {
@@ -166,6 +176,7 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public String getString(String name) {
         Object o = this.get((Object) name);
         if (o instanceof String) {
@@ -176,46 +187,57 @@ public class SimpleMapImpl extends HashMap implements SimpleMap {
         }
     }
 
+    @Override
     public void put(String name, Object value) {
         this.put((Object) name, value);
     }
 
+    @Override
     public void putBoolean(String name, boolean b) {
         this.put((Object) name, b);
     }
 
+    @Override
     public void putByte(String name, byte b) {
         this.put((Object) name, b);
     }
 
+    @Override
     public void putBytes(String name, byte[] bytes) {
         this.put((Object) name, bytes);
     }
 
+    @Override
     public void putChar(String name, char c) {
         this.put((Object) name, c);
     }
 
+    @Override
     public void putDouble(String name, double d) {
         this.put((Object) name, d);
     }
 
+    @Override
     public void putFloat(String name, float fl) {
         this.put((Object) name, fl);
     }
 
+    @Override
     public void putInt(String name, int i) {
         this.put((Object) name, i);
     }
 
+    @Override
     public void putLong(String name, long l) {
         this.put((Object) name, l);
     }
 
+    @Override
     public void putShort(String name, short s) {
         this.put((Object) name, s);
     }
 
+    @Override
     public void putString(String name, String value) {
         this.put((Object) name, value);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java b/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
index 37678a255..4c8388334 100755
--- a/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/SynapseBinaryDataSource.java
@@ -68,18 +68,22 @@ public class SynapseBinaryDataSource implements DataSource {
         inputstream.close();
     }
 
+    @Override
     public String getContentType() {
         return contentType;
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         return data.getInputStream();
     }
 
+    @Override
     public String getName() {
         return this.getClass().getName();
     }
 
+    @Override
     public OutputStream getOutputStream() throws IOException {
         return data.getOutputStream();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java b/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
index ffc12d648..10fe8aa95 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
@@ -51,6 +51,7 @@ public class TextFileDataSource extends AbstractPullOMDataSource {
         return fac.createOMElement(txtFileDS, BaseConstants.DEFAULT_TEXT_WRAPPER);
     }
 
+    @Override
     public XMLStreamReader getReader() throws XMLStreamException {
         InputStream is;
         try {
@@ -63,14 +64,17 @@ public class TextFileDataSource extends AbstractPullOMDataSource {
                 BaseConstants.DEFAULT_TEXT_WRAPPER, new InputStreamReader(is, charset));
     }
 
+    @Override
     public Object getObject() {
         return overflowBlob;
     }
 
+    @Override
     public boolean isDestructiveRead() {
         return false;
     }
 
+    @Override
     public OMDataSourceExt copy() {
         return new TextFileDataSource(overflowBlob, charset);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java b/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java
index b523cc4aa..7be6ae2e9 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/concurrent/SynapseThreadFactory.java
@@ -58,6 +58,7 @@ public class SynapseThreadFactory implements ThreadFactory {
      * @param runnable - Runnable class to run by the created thread
      * @return a Thread executing the given runnable
      */
+    @Override
     public Thread newThread(final Runnable runnable) {
         StringBuffer buffer = new StringBuffer();
         buffer.append(this.namePrefix);
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java
index 06074f919..502c0132c 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java
@@ -34,14 +34,17 @@ import org.apache.axiom.om.OMElement;
 public class AXIOMResultBuilder implements ResultBuilder {
 	private final OMDocument document = OMAbstractFactory.getOMFactory().createOMDocument();
     
+    @Override
     public SAXResult getResult() {
         return document.getSAXResult();
     }
 
+    @Override
     public OMElement getNode(Charset charset) {
         return document.getOMDocumentElement();
     }
 
+    @Override
     public void release() {
     }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilderFactory.java
index dcc906e61..df8f8a9ce 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * instances.
  */
 public class AXIOMResultBuilderFactory implements ResultBuilderFactory {
+    @Override
     public ResultBuilder createResultBuilder(SynapseEnvironment synEnv,
             Output expectedOutput) {
         return new AXIOMResultBuilder();
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java
index fc5953a09..713d8e2ec 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java
@@ -29,10 +29,12 @@ import org.apache.axiom.om.OMElement;
  * using {@link OMContainer#getSAXSource(boolean)}.
  */
 public class AXIOMSourceBuilder implements SourceBuilder {
+    @Override
     public SAXSource getSource(OMElement node) {
         return node.getSAXSource(true);
     }
 
+    @Override
     public void release() {
     }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilderFactory.java
index be1ba027f..71d418de2 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * instances.
  */
 public class AXIOMSourceBuilderFactory implements SourceBuilderFactory {
+    @Override
     public SourceBuilder createSourceBuilder(SynapseEnvironment synEnv) {
         return new AXIOMSourceBuilder();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java
index ba9bc5d5f..8aab37a86 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java
@@ -44,6 +44,7 @@ public class DOOMResultBuilder implements ResultBuilder {
     
     private Document document;
 
+    @Override
     public Result getResult() {
         DOMMetaFactory domMetaFactory
                 = ((DOMMetaFactory)OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM));
@@ -55,6 +56,7 @@ public class DOOMResultBuilder implements ResultBuilder {
         return new DOMResult(document);
     }
 
+    @Override
     public OMElement getNode(Charset charset) {
         // TODO: we need to support SOAPEnvelope
         //       (not supported by the original code in XSLTMediator)
@@ -68,6 +70,7 @@ public class DOOMResultBuilder implements ResultBuilder {
         return null;
     }
 
+    @Override
     public void release() {
     }
 
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilderFactory.java
index e16cc579d..d2c4c0e5c 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * objects.
  */
 public class DOOMResultBuilderFactory implements ResultBuilderFactory {
+    @Override
     public ResultBuilder createResultBuilder(SynapseEnvironment synEnv,
             ResultBuilderFactory.Output expectedOutput) {
         return new DOOMResultBuilder();
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilder.java
index cd86afb74..3e7ead37d 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilder.java
@@ -32,12 +32,14 @@ import org.w3c.dom.Element;
  * to DOOM and produces a {@link DOMSource}.
  */
 public class DOOMSourceBuilder implements SourceBuilder {
+    @Override
     public Source getSource(OMElement node) {
         return new DOMSource(
                 ((Element) ElementHelper.importOMElement(node, OMAbstractFactory.getMetaFactory(
                         OMAbstractFactory.FEATURE_DOM).getOMFactory())).getOwnerDocument());
     }
 
+    @Override
     public void release() {
     }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilderFactory.java
index 1f1391580..5583ba774 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMSourceBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * instances.
  */
 public class DOOMSourceBuilderFactory implements SourceBuilderFactory {
+    @Override
     public SourceBuilder createSourceBuilder(SynapseEnvironment synEnv) {
         return new DOOMSourceBuilder();
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceLSInput.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceLSInput.java
index ff69cf5c2..862423285 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceLSInput.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceLSInput.java
@@ -40,66 +40,82 @@ public class SchemaResourceLSInput implements LSInput {
     String publicId = null;
     String baseURI = null;
 
+    @Override
     public Reader getCharacterStream() {
         return null;
     }
 
+    @Override
     public void setCharacterStream(Reader characterStream) {
 
     }
 
+    @Override
     public InputStream getByteStream() {
         return byteStream;
     }
 
+    @Override
     public void setByteStream(InputStream byteStream) {
         this.byteStream = byteStream;
     }
 
+    @Override
     public String getStringData() {
         return null;
     }
 
+    @Override
     public void setStringData(String stringData) {
 
     }
 
+    @Override
     public String getSystemId() {
         return systemId;
     }
 
+    @Override
     public void setSystemId(String systemId) {
         this.systemId = systemId;
     }
 
+    @Override
     public String getPublicId() {
         return publicId;
     }
 
+    @Override
     public void setPublicId(String publicId) {
         this.publicId = publicId;
     }
 
+    @Override
     public String getBaseURI() {
         return baseURI;
     }
 
+    @Override
     public void setBaseURI(String baseURI) {
         this.baseURI = baseURI;
     }
 
+    @Override
     public String getEncoding() {
         return null;
     }
 
+    @Override
     public void setEncoding(String encoding) {
 
     }
 
+    @Override
     public boolean getCertifiedText() {
         return false;
     }
 
+    @Override
     public void setCertifiedText(boolean certifiedText) {
 
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceResolver.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceResolver.java
index a3950c4dd..ddcebb382 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceResolver.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/SchemaResourceResolver.java
@@ -48,6 +48,7 @@ public class SchemaResourceResolver implements LSResourceResolver {
      * Lookup in {@link org.apache.synapse.util.resolver.ResourceMap} and returns
      * {@link org.apache.synapse.util.jaxp.SchemaResourceLSInput}
      */
+    @Override
     public LSInput resolveResource(String type, String namespaceURI,
                                    String publicId, String systemId,
                                    String baseURI) {
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
index 81b3ebd2c..7bed0ad60 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
@@ -55,12 +55,14 @@ public class StreamResultBuilder implements ResultBuilder {
         this.expectedOutput = expectedOutput;
     }
 
+    @Override
     public Result getResult() {
         tmp = synEnv.createOverflowBlob();
         out = tmp.getOutputStream();
         return new StreamResult(out);
     }
 
+    @Override
     public OMElement getNode(Charset charset) {
         try {
             out.close();
@@ -88,6 +90,7 @@ public class StreamResultBuilder implements ResultBuilder {
         }
     }
 
+    @Override
     public void release() {
         if (tmp != null) {
             tmp.release();
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilderFactory.java
index 65b84afca..d8db586fd 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * objects.
  */
 public class StreamResultBuilderFactory implements ResultBuilderFactory {
+    @Override
     public ResultBuilder createResultBuilder(SynapseEnvironment synEnv,
             ResultBuilderFactory.Output expectedOutput) {
         return new StreamResultBuilder(synEnv, expectedOutput);
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java
index bf6c78bc6..95e71a1a3 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilder.java
@@ -48,6 +48,7 @@ public class StreamSourceBuilder implements SourceBuilder {
         this.synEnv = synEnv;
     }
 
+    @Override
     public Source getSource(OMElement node) {
         tmp = synEnv.createOverflowBlob();
         OutputStream out = tmp.getOutputStream();
@@ -68,6 +69,7 @@ public class StreamSourceBuilder implements SourceBuilder {
         }
     }
 
+    @Override
     public void release() {
         if (in != null) {
             try {
diff --git a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilderFactory.java b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilderFactory.java
index 26c9150a9..6716fa25d 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilderFactory.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamSourceBuilderFactory.java
@@ -26,6 +26,7 @@ import org.apache.synapse.core.SynapseEnvironment;
  * instances.
  */
 public class StreamSourceBuilderFactory implements SourceBuilderFactory {
+    @Override
     public SourceBuilder createSourceBuilder(SynapseEnvironment synEnv) {
         return new StreamSourceBuilder(synEnv);
     }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomJAXPURIResolver.java b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomJAXPURIResolver.java
index 9494ab8f7..8f800c3cf 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomJAXPURIResolver.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomJAXPURIResolver.java
@@ -54,6 +54,7 @@ public class CustomJAXPURIResolver implements URIResolver {
      * returns null, it will resolve the location using
      * {@link SynapseConfigUtils#resolveRelativeURI(String, String)}.
      */
+    @Override
     public Source resolve(String href, String base) throws TransformerException {
         Source result = null;
         if (resourceMap != null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
index 35778ca7d..0d2960276 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
@@ -51,10 +51,12 @@ public class CustomWSDLLocator implements WSDLLocator {
         this.synCfg = synCfg;
     }
 
+    @Override
     public InputSource getBaseInputSource() {
         return baseInputSource;
     }
 
+    @Override
     public String getBaseURI() {
         return baseURI;
     }
@@ -67,6 +69,7 @@ public class CustomWSDLLocator implements WSDLLocator {
      * returns null, it will resolve the location using
      * {@link SynapseConfigUtils#resolveRelativeURI(String, String)}.
      */
+    @Override
     public InputSource getImportInputSource(String parentLocation, String relativeLocation) {
         InputSource result = null;
         if (resourceMap != null) {
@@ -82,10 +85,12 @@ public class CustomWSDLLocator implements WSDLLocator {
         return result;
     }
 
+    @Override
     public String getLatestImportURI() {
         return latestImportURI;
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
index 71ce725b6..69b79e8c3 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
@@ -55,6 +55,7 @@ public class CustomXmlSchemaURIResolver implements URIResolver {
      * returns null, it will resolve the location using
      * {@link SynapseConfigUtils#resolveRelativeURI(String, String)}.
      */
+    @Override
     public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) {
         InputSource result = null;
         if (resourceMap != null) {
diff --git a/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64DecodeFunction.java b/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64DecodeFunction.java
index 1eba43eb5..4a13c4408 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64DecodeFunction.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64DecodeFunction.java
@@ -46,6 +46,7 @@ public class Base64DecodeFunction implements Function {
      * @return The string value of a property
      * @throws FunctionCallException
      */
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
         if (args == null || args.size() == 0) {
             if (log.isDebugEnabled()) {
diff --git a/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64EncodeFunction.java b/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64EncodeFunction.java
index 3aee2be0c..638ee4ced 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64EncodeFunction.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/xpath/Base64EncodeFunction.java
@@ -45,6 +45,7 @@ public class Base64EncodeFunction implements Function {
      * @return The string value of a property
      * @throws FunctionCallException
      */
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
         boolean debugOn = log.isDebugEnabled();
 
diff --git a/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java b/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
index d61cdca6d..3f91ca15f 100755
--- a/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
@@ -69,6 +69,7 @@ public class SynapseXPathFunctionContext implements FunctionContext {
      * @return resolved function
      * @throws UnresolvableException if the function specified does not found
      */
+    @Override
     public Function getFunction(String namespaceURI, String prefix, String localName)
         throws UnresolvableException {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java b/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java
index cf438374b..0805efe9f 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java
@@ -127,6 +127,7 @@ public class SynapseXPathVariableContext implements VariableContext {
      * @return Resolved variable value
      * @throws UnresolvableException if the variable specified does not found
      */
+    @Override
     public Object getVariableValue(String namespaceURI, String prefix, String localName)
         throws UnresolvableException {
 
diff --git a/modules/core/src/main/java/org/apache/synapse/util/xpath/URLEncodeFunction.java b/modules/core/src/main/java/org/apache/synapse/util/xpath/URLEncodeFunction.java
index 3c41f6a2d..18123795e 100644
--- a/modules/core/src/main/java/org/apache/synapse/util/xpath/URLEncodeFunction.java
+++ b/modules/core/src/main/java/org/apache/synapse/util/xpath/URLEncodeFunction.java
@@ -45,6 +45,7 @@ public class URLEncodeFunction implements Function {
      * @return The string value of a property
      * @throws FunctionCallException
      */
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
         boolean debugOn = log.isDebugEnabled();
 
diff --git a/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java b/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
index 2e2edcb40..289ad1077 100644
--- a/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
+++ b/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
@@ -56,34 +56,42 @@ public class TestMessageContext implements MessageContext {
 
     private String soapAction = null;
     
+    @Override
     public SynapseConfiguration getConfiguration() {
         return synCfg;
     }
 
+    @Override
     public void setConfiguration(SynapseConfiguration cfg) {
         this.synCfg = cfg;
     }
 
+    @Override
     public SynapseEnvironment getEnvironment() {
         return synEnv;
     }
 
+    @Override
     public void setEnvironment(SynapseEnvironment se) {
         synEnv = se;
     }
 
+    @Override
     public Map<String, Object> getContextEntries() {
         return localEntries;
     }
 
+    @Override
     public void setContextEntries(Map<String, Object> entries) {
         this.localEntries = entries;
     }
 
+    @Override
     public Object getProperty(String key) {
         return properties.get(key);
     }
 
+    @Override
     public Object getEntry(String key) {
         Object ret = properties.get(key);
         if (ret != null) {
@@ -95,6 +103,7 @@ public class TestMessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Object getLocalEntry(String key) {
         Object ret = properties.get(key);
         if (ret != null) {
@@ -106,14 +115,17 @@ public class TestMessageContext implements MessageContext {
         }
     }
 
+    @Override
     public void setProperty(String key, Object value) {
         properties.put(key, value);
     }
 
+    @Override
     public Set getPropertyKeySet() {
         return properties.keySet();
     }
 
+    @Override
     public Mediator getMainSequence() {
         Object o = localEntries.get(SynapseConstants.MAIN_SEQUENCE_KEY);
         if (o != null && o instanceof Mediator) {
@@ -125,6 +137,7 @@ public class TestMessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Mediator getFaultSequence() {
         Object o = localEntries.get(SynapseConstants.FAULT_SEQUENCE_KEY);
         if (o != null && o instanceof Mediator) {
@@ -136,6 +149,7 @@ public class TestMessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Mediator getSequence(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Mediator) {
@@ -155,6 +169,7 @@ public class TestMessageContext implements MessageContext {
         }
     }
 
+    @Override
     public Endpoint getEndpoint(String key) {
         Object o = localEntries.get(key);
         if (o != null && o instanceof Endpoint) {
@@ -172,6 +187,7 @@ public class TestMessageContext implements MessageContext {
     }
 
     //---------
+    @Override
     public SOAPEnvelope getEnvelope() {
         if (envelope == null)
             return OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
@@ -179,127 +195,161 @@ public class TestMessageContext implements MessageContext {
             return envelope;
     }
 
+    @Override
     public void setEnvelope(SOAPEnvelope envelope) throws AxisFault {
         this.envelope = envelope;
     }
 
+    @Override
     public EndpointReference getFaultTo() {
         return null;
     }
 
+    @Override
     public void setFaultTo(EndpointReference reference) {
     }
 
+    @Override
     public EndpointReference getFrom() {
         return null;
     }
 
+    @Override
     public void setFrom(EndpointReference reference) {
     }
 
+    @Override
     public String getMessageID() {
         return null;
     }
 
+    @Override
     public void setMessageID(String string) {
     }
 
+    @Override
     public RelatesTo getRelatesTo() {
         return null;
     }
 
+    @Override
     public void setRelatesTo(RelatesTo[] reference) {
     }
 
+    @Override
     public EndpointReference getReplyTo() {
         return null;
     }
 
+    @Override
     public void setReplyTo(EndpointReference reference) {
     }
 
+    @Override
     public EndpointReference getTo() {
         return to;
     }
 
+    @Override
     public void setTo(EndpointReference reference) {
         to = reference;
     }
 
+    @Override
     public void setWSAAction(String actionURI) {
     }
 
+    @Override
     public String getWSAAction() {
         return null;
     }
 
+    @Override
     public String getSoapAction() {
         return soapAction;
     }
 
+    @Override
     public void setSoapAction(String string) {
         soapAction = string;
     }
 
+    @Override
     public void setWSAMessageID(String messageID) {
         // TODO
     }
 
+    @Override
     public String getWSAMessageID() {
         return null;  // TODO
     }
 
+    @Override
     public boolean isDoingMTOM() {
         return false;
     }
 
+    @Override
     public boolean isDoingSWA() {
         return false;
     }
 
+    @Override
     public void setDoingMTOM(boolean b) {
     }
 
+    @Override
     public void setDoingSWA(boolean b) {
     }
 
+    @Override
... 6777 lines suppressed ...