You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/01/04 22:21:58 UTC
[cxf] branch 3.1.x-fixes updated (ed078ad -> ddd76ff)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from ed078ad [CXF-6811] Remove unused method that will cause issues on Java9
new 23d43fd Start adjusting import orders to match what checkstyle 8.x requires. :(
new 50e633b Bunch of whitespace changes to start making latest Checkstyle happy
new 172164a Update things to NOT use the old junit3 based frameworks
new ddd76ff Recording .gitmergeinfo Changes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +
.../bus/managers/ConduitInitiatorManagerImpl.java | 1 -
.../BusApplicationContextResourceResolver.java | 1 -
.../cxf/bus/spring/BusExtensionPostProcessor.java | 1 -
.../cxf/common/injection/ResourceInjector.java | 1 +
.../common/util/ReflectionInvokationHandler.java | 1 -
.../jsse/MultiKeyPasswordKeyManager.java | 1 +
.../apache/cxf/helpers/MapNamespaceContext.java | 1 +
.../cxf/interceptor/ClientFaultConverter.java | 1 +
.../cxf/interceptor/LoggingOutInterceptor.java | 1 +
.../apache/cxf/resource/ClassLoaderResolver.java | 1 -
.../cxf/security/transport/TLSSessionInfo.java | 1 +
.../apache/cxf/staxutils/W3CDOMStreamReader.java | 1 -
.../org/apache/cxf/staxutils/WoodstoxHelper.java | 1 +
.../transport/AbstractMultiplexDestination.java | 1 +
.../java/org/apache/cxf/ws/addressing/Names.java | 1 +
.../cxf/ws/addressing/VersionTransformer.java | 5 -
.../cxf/attachment/AttachmentSerializerTest.java | 1 +
.../java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +-
.../cxf/bus/extension/ExtensionManagerTest.java | 1 +
.../managers/EndpointResolverRegistryImplTest.java | 2 +-
.../ServiceContractResolverRegistryImplTest.java | 1 +
.../apache/cxf/bus/osgi/OSGiBusListenerTest.java | 422 +++++++++++----------
.../cxf/bus/spring/BusApplicationListenerTest.java | 3 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 3 +-
.../cxf/bus/spring/SpringBusFactoryTest.java | 1 +
.../buslifecycle/CXFBusLifeCycleManagerTest.java | 1 +
.../common/annotation/AnnotatedGreeterImpl.java | 1 +
.../common/annotation/AnnotationProcessorTest.java | 2 +
.../org/apache/cxf/common/i18n/MessageTest.java | 1 +
.../cxf/common/injection/ResourceInjectorTest.java | 2 -
.../apache/cxf/common/util/PackageUtilsTest.java | 1 +
.../configuration/spring/ConfigurerImplTest.java | 4 +-
.../SuspendedInvocationExceptionTest.java | 1 +
.../feature/transform/XSLTInterceptorsTest.java | 303 +++++++--------
.../org/apache/cxf/helpers/ServiceUtilsTest.java | 1 +
.../cxf/interceptor/LoggingInInterceptorTest.java | 1 -
.../cxf/interceptor/LoggingOutInterceptorTest.java | 2 +-
.../interceptor/OutgoingChainInterceptorTest.java | 1 +
.../interceptor/ServiceInvokerInterceptorTest.java | 1 +
.../security/JAASLoginInterceptorTest.java | 1 +
.../OperationInfoAuthorizingInterceptorTest.java | 2 +-
.../security/SecureAnnotationsInterceptorTest.java | 2 +-
.../security/SimpleAuthorizingInterceptorTest.java | 2 +-
.../org/apache/cxf/io/CachedStreamTestBase.java | 1 +
.../cxf/phase/PhaseInterceptorChainTest.java | 2 +-
.../org/apache/cxf/resource/URIResolverTest.java | 1 +
.../PropertiesExpandingStreamReaderTest.java | 1 +
.../validation/Stax2ValidationUtilsTest.java | 2 +
.../cxf/transport/ChainInitiationObserverTest.java | 1 +
.../common/gzip/GZIPAcceptEncodingTest.java | 2 +-
.../apache/cxf/ws/addressing/ContextUtilsTest.java | 1 +
.../java/org/apache/cxf/cdi/AbstractCXFBean.java | 1 +
.../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 1 +
.../AbstractManagedConnectionImpl.java | 1 +
.../jca/core/resourceadapter/UriHandlerInit.java | 1 +
.../cxf/jca/cxf/ManagedConnectionFactoryImpl.java | 1 -
.../apache/cxf/jca/cxf/ResourceAdapterImpl.java | 1 -
.../jca/outbound/ManagedConnectionFactoryImpl.java | 1 -
.../core/classloader/PlugInClassLoaderTest.java | 1 +
.../cxf/jca/core/logging/LoggerHelperTest.java | 1 +
.../ResourceAdapterInternalExceptionTest.java | 1 +
...AssociatedManagedConnectionFactoryImplTest.java | 6 +-
.../org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 1 +
.../jca/cxf/ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 3 +-
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 1 +
.../handlers/AbstractInvocationHandlerTest.java | 1 +
.../cxf/jca/cxf/handlers/HandlerTestBase.java | 1 +
.../cxf/handlers/InvocationHandlerFactoryTest.java | 1 +
.../handlers/InvokingInvocationHandlerTest.java | 1 +
.../ObjectMethodInvocationHandlerTest.java | 1 +
.../cxf/handlers/ProxyInvocationHandlerTest.java | 1 +
.../apache/cxf/jca/jarloader/JarLoaderTest.java | 1 +
.../jca/outbound/ManagedConnectionImplTest.java | 1 +
.../autoconfigure/CxfAutoConfigurationTests.java | 1 +
.../brave/AbstractBraveClientInterceptor.java | 1 -
.../tracing/brave/AbstractBraveClientProvider.java | 1 -
.../cxf/tracing/brave/AbstractBraveProvider.java | 1 -
.../cxf/tracing/brave/BraveClientFeature.java | 1 -
.../tracing/brave/BraveClientStartInterceptor.java | 1 -
.../tracing/brave/BraveClientStopInterceptor.java | 1 -
.../org/apache/cxf/tracing/brave/BraveFeature.java | 1 -
.../cxf/tracing/brave/BraveStartInterceptor.java | 1 -
.../cxf/tracing/brave/BraveStopInterceptor.java | 1 -
.../cxf/tracing/brave/BraveTracerContext.java | 1 -
.../cxf/tracing/brave/HttpClientSpanParser.java | 1 -
.../cxf/tracing/brave/HttpServerSpanParser.java | 1 -
.../tracing/brave/jaxrs/BraveClientProvider.java | 1 -
.../tracing/brave/jaxrs/BraveContextProvider.java | 1 -
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 1 -
.../cxf/tracing/brave/jaxrs/BraveProvider.java | 1 -
.../tracing/htrace/ext/LogbackSpanConverter.java | 1 -
.../corba/maven/plugins/IDLToWSDLPlugin.java | 1 -
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 +
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 3 +
.../cxf/osgi/itests/soap/HttpServiceTest.java | 1 -
.../cxf/osgi/itests/soap/JmsServiceTest.java | 1 +
.../karaf/commands/completers/BusCompleter.java | 1 -
.../cxf/binding/coloc/ColocInInterceptor.java | 2 -
.../cxf/binding/coloc/ColocOutInterceptor.java | 2 -
.../binding/coloc/ColocMessageObserverTest.java | 1 +
.../cxf/binding/coloc/ColocOutInterceptorTest.java | 2 +-
.../apache/cxf/binding/coloc/ColocUtilTest.java | 2 +-
.../org/apache/cxf/binding/corba/CorbaBinding.java | 1 -
.../apache/cxf/binding/corba/CorbaStreamable.java | 1 -
.../binding/corba/runtime/CorbaStreamableImpl.java | 1 -
.../types/AbstractNoStartEndEventProducer.java | 1 -
.../corba/types/AbstractStartEndEventProducer.java | 1 -
.../corba/types/CorbaAnonStructEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaAnyHandler.java | 1 -
.../corba/types/CorbaArrayEventProducer.java | 1 -
.../corba/types/CorbaExceptionEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaFixedHandler.java | 1 -
.../binding/corba/types/CorbaObjectHandler.java | 1 -
.../corba/types/CorbaObjectReferenceListener.java | 1 -
.../types/CorbaPrimitiveSequenceEventProducer.java | 1 -
.../corba/types/CorbaSequenceEventProducer.java | 1 -
.../corba/types/CorbaTypeEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaUnionHandler.java | 1 -
.../corba/types/ParameterEventProducer.java | 1 -
.../corba/types/SkipStartEndEventProducer.java | 1 -
.../WrappedParameterSequenceEventProducer.java | 1 -
.../cxf/binding/corba/CorbaBindingFactoryTest.java | 3 +-
.../apache/cxf/binding/corba/CorbaBindingTest.java | 1 +
.../apache/cxf/binding/corba/CorbaConduitTest.java | 1 +
.../cxf/binding/corba/CorbaDestinationTest.java | 4 +-
.../apache/cxf/binding/corba/CorbaMessageTest.java | 1 +
.../cxf/binding/corba/CorbaServerConduitTest.java | 1 +
.../apache/cxf/binding/corba/CorbaTypeMapTest.java | 1 +
.../org/apache/cxf/binding/corba/TestUtils.java | 2 +
.../binding/corba/runtime/CorbaDSIServantTest.java | 3 +-
.../corba/runtime/CorbaObjectReaderTest.java | 1 +
.../corba/runtime/CorbaObjectWriterTest.java | 1 +
.../corba/runtime/CorbaStreamReaderTest.java | 1 +
.../corba/runtime/CorbaStreamWriterTest.java | 1 +
.../binding/corba/runtime/CorbaStreamableTest.java | 1 +
.../binding/corba/types/CorbaAnyHandlerTest.java | 1 +
.../binding/corba/types/CorbaArrayHandlerTest.java | 1 +
.../binding/corba/types/CorbaHandlerUtilsTest.java | 1 +
.../corba/types/CorbaObjectHandlerTest.java | 1 -
.../corba/types/CorbaPrimitiveHandlerTest.java | 3 +-
.../corba/types/CorbaSequenceHandlerTest.java | 3 +-
.../cxf/binding/corba/utils/ContextUtilsTest.java | 1 +
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 1 +
.../cxf/binding/soap/wsdl11/SoapAddressPlugin.java | 1 +
.../soap/MustUnderstandInterceptorTest.java | 1 +
.../cxf/binding/soap/RPCInInterceptorTest.java | 1 +
.../cxf/binding/soap/RPCOutInterceptorTest.java | 1 +
.../cxf/binding/soap/ServiceModelUtilTest.java | 1 +
.../binding/soap/SoapActionInterceptorTest.java | 1 +
.../cxf/binding/soap/SoapBindingFactoryTest.java | 2 +-
.../apache/cxf/binding/soap/SoapBindingTest.java | 1 +
.../cxf/binding/soap/SoapOutInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/TestBase.java | 1 +
.../interceptor/SoapActionInInterceptorTest.java | 2 +-
.../soap/interceptor/SoapFaultSerializerTest.java | 6 +-
.../SoapPreProtocolOutInterceptorTest.java | 2 +-
.../soap/jms/interceptor/SoapFaultFactoryTest.java | 2 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 1 +
.../binding/soap/saaj/SAAJInInterceptorTest.java | 1 +
.../cxf/binding/xml/wsdl11/XmlBindingPlugin.java | 1 +
.../apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java | 1 +
.../cxf/binding/xml/XMLBindingFactoryTest.java | 1 +
.../cxf/binding/xml/interceptor/TestBase.java | 1 +
.../interceptor/XMLFaultOutInterceptorTest.java | 1 +
.../interceptor/XMLMessageOutInterceptorTest.java | 1 +
.../apache/cxf/aegis/AegisElementDataWriter.java | 1 +
.../apache/cxf/aegis/AegisXMLStreamDataReader.java | 1 +
.../org/apache/cxf/aegis/AbstractAegisTest.java | 1 +
.../apache/cxf/aegis/exception/ExceptionTest.java | 1 +
.../inheritance/ExceptionInheritanceTest.java | 1 +
.../inheritance/intf/InterfaceInheritanceTest.java | 1 +
.../aegis/integration/ParameterMappingTest.java | 1 +
.../cxf/aegis/namespaces/ExplicitPrefixTest.java | 1 +
.../cxf/aegis/namespaces/impl/NameServiceImpl.java | 1 +
.../cxf/aegis/override/OverrideTypeTest.java | 1 +
.../java/org/apache/cxf/aegis/proxy/ProxyTest.java | 1 +
.../cxf/aegis/services/base64/BinaryDataTest.java | 1 +
.../cxf/aegis/standalone/StandaloneReadTest.java | 2 +
.../cxf/aegis/type/array/DuplicateArrayTest.java | 1 +
.../apache/cxf/aegis/type/basic/BadXMLTest.java | 8 +-
.../cxf/aegis/type/basic/DynamicProxyTest.java | 1 +
.../cxf/aegis/type/encoded/SoapArrayTypeTest.java | 1 +
.../cxf/aegis/type/encoded/StructTypeTest.java | 1 +
.../cxf/aegis/type/java5/map/StudentTest.java | 1 +
.../org/apache/cxf/aegis/type/map/MapsTest.java | 1 +
.../aegis/type/missing/MissingTypeWSDLTest.java | 1 +
.../org/apache/cxf/aegis/xml/stax/ReaderTest.java | 1 +
.../org/apache/cxf/aegis/xml/stax/WriterTest.java | 1 +
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 2 +
.../org/apache/cxf/jaxb/BareInInterceptorTest.java | 2 +-
.../apache/cxf/jaxb/BareOutInterceptorTest.java | 2 +-
.../cxf/jaxb/DocLiteralInInterceptorTest.java | 2 +-
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 2 +-
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 1 +
.../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 1 +
.../test/java/org/apache/cxf/jaxb/TestBase.java | 1 +
.../cxf/jaxb/io/XMLStreamDataReaderTest.java | 1 +
.../cxf/ext/logging/DefaultLogEventMapperTest.java | 1 +
.../apache/cxf/ext/logging/RESTLoggingTest.java | 1 +
.../cxf/ext/logging/TestPrettyLoggingFilter.java | 1 +
.../apache/cxf/jaxrs/provider/SourceProvider.java | 1 +
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 2 +-
.../cxf/jaxrs/ext/MessageContextImplTest.java | 2 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 2 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 2 +-
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 2 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 2 +-
.../lifecycle/PerRequestResourceProviderTest.java | 2 +-
.../cxf/jaxrs/model/OperationResourceInfoTest.java | 2 +-
.../provider/AbstractConfigurableProviderTest.java | 1 +
.../jaxrs/provider/JAXBElementProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 2 +-
.../security/JAASAuthenticationFilterTest.java | 1 +
.../springmvc/SpringViewResolverProviderTest.java | 2 +
.../cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 1 +
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 2 +-
.../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../cxf/jaxws/binding/soap/SOAPBindingImpl.java | 1 +
.../jaxws/blueprint/EndpointDefinitionParser.java | 2 +
.../JaxWsProxyFactoryBeanDefinitionParser.java | 1 -
.../JaxWsWebServicePublisherBeanPostProcessor.java | 1 -
.../org/apache/cxf/jaxws/AbstractJaxWsTest.java | 1 +
.../org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 1 +
.../apache/cxf/jaxws/ConfiguredEndpointTest.java | 1 +
.../java/org/apache/cxf/jaxws/GreeterTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/HeaderTest.java | 1 +
.../apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 2 +
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 1 +
.../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 2 +
.../apache/cxf/jaxws/MessageReplayObserver.java | 1 +
.../org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 1 +
.../java/org/apache/cxf/jaxws/SOAPBindingTest.java | 1 +
.../java/org/apache/cxf/jaxws/SchemaFirstTest.java | 1 +
.../java/org/apache/cxf/jaxws/ServiceImplTest.java | 1 +
.../apache/cxf/jaxws/ServiceModelUtilsTest.java | 1 +
.../java/org/apache/cxf/jaxws/SoapFaultTest.java | 1 +
.../cxf/jaxws/WrapperClassGeneratorTest.java | 1 +
.../jaxws/context/WebServiceContextImplTest.java | 1 +
.../apache/cxf/jaxws/dispatch/DispatchOpTest.java | 2 +
.../AbstractProtocolHandlerInterceptorTest.java | 1 +
.../handler/AnnotationHandlerChainBuilderTest.java | 1 +
.../cxf/jaxws/handler/HandlerChainBuilderTest.java | 2 +-
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 1 +
.../handler/LogicalHandlerInterceptorTest.java | 1 +
.../cxf/jaxws/handler/LogicalMessageImplTest.java | 1 +
.../handler/soap/SOAPHandlerInterceptorTest.java | 1 +
.../header/ProviderHeaderClientServerTest.java | 1 +
.../org/apache/cxf/jaxws/holder/HolderTest.java | 1 +
.../WebFaultOutInterceptorTestCase.java | 1 +
.../jaxws/provider/ProviderServiceFactoryTest.java | 1 +
.../apache/cxf/jaxws/provider/ProviderTest.java | 1 +
.../apache/cxf/jaxws/service/ArrayServiceImpl.java | 1 +
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 1 +
.../support/ContextPropertiesMappingTest.java | 1 +
.../support/JaxWsServiceConfigurationTest.java | 2 +-
.../jaxws/support/JaxWsServiceFactoryBeanTest.java | 1 +
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 4 +-
.../JAXWSHttpSpiDestinationTest.java | 1 +
.../JAXWSHttpSpiTransportFactoryTest.java | 1 +
.../org/apache/cxf/js/rhino/ProviderFactory.java | 1 -
.../java/org/apache/cxf/js/rhino/ServerApp.java | 1 -
.../cxf/js/rhino/AbstractDOMProviderTest.java | 2 +-
.../apache/cxf/js/rhino/ProviderFactoryTest.java | 2 +-
.../java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +
.../frontend/soap/SoapBindingSelectionTest.java | 1 +
.../spring/AbstractSimpleFrontendSpringTest.java | 2 +
.../cxf/frontend/spring/ClientServerTest.java | 1 +
.../cxf/frontend/spring/SpringBeansTest.java | 1 +
.../factory/AbstractSimpleFrontendTest.java | 1 +
.../cxf/service/factory/ClientFactoryBeanTest.java | 1 +
.../factory/ReflectionServiceFactoryTest.java | 1 +
.../apache/cxf/service/factory/RountripTest.java | 1 +
.../cxf/service/factory/ServerFactoryTest.java | 1 +
.../cxf/service/stax/StaxDatabindingTest.java | 1 +
.../apache/cxf/javascript/GenericAegisTest.java | 1 +
.../cxf/javascript/JavascriptTestUtilities.java | 1 +
.../management/jmx/InstrumentationManagerImpl.java | 1 -
.../export/runtime/ModelMBeanInfoSupporter.java | 2 -
.../management/counters/CounterRepositoryTest.java | 1 +
.../AbstractMessageResponseTestBase.java | 2 +-
.../ResponseTimeMessageInInterceptorTest.java | 2 +-
.../ResponseTimeMessageInvokerInterceptorTest.java | 1 +
.../ResponseTimeMessageOutInterceptorTest.java | 1 +
.../jmx/export/ModelMBeanAssemblerTest.java | 1 +
.../client/spring/JAXRSClientFactoryBeanTest.java | 2 +
.../apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 1 +
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
.../jaxrs/provider/atom/AtomEntryProviderTest.java | 1 +
.../jaxrs/provider/atom/AtomFeedProviderTest.java | 1 +
.../jaxrs/provider/dom4j/DOM4JProviderTest.java | 2 +-
.../cxf/jaxrs/resources/CollectionsResource.java | 1 +
.../jpa/AbstractJPATypedQueryVisitorTest.java | 1 +
.../search/jpa/JPATypedQueryVisitorODataTest.java | 1 +
.../lucene/AbstractLuceneQueryVisitorTest.java | 406 ++++++++++----------
.../lucene/LuceneQueryVisitorAnalyzerFiqlTest.java | 1 +
.../search/lucene/LuceneQueryVisitorFiqlTest.java | 1 +
.../search/lucene/LuceneQueryVisitorODataTest.java | 394 +++++++++----------
.../rs/security/oauth/client/OAuthClientUtils.java | 1 -
.../security/oauth/filters/AbstractAuthFilter.java | 1 -
.../security/oauth/filters/OAuthRequestFilter.java | 1 -
.../oauth/provider/DefaultOAuthValidator.java | 1 -
.../oauth/services/AbstractOAuthService.java | 1 -
.../oauth/services/AccessTokenHandler.java | 1 -
.../services/AuthorizationRequestHandler.java | 1 -
.../oauth/services/OOBResponseProvider.java | 1 -
.../oauth/services/RequestTokenHandler.java | 1 -
.../cxf/rs/security/oauth/utils/OAuthUtils.java | 1 -
.../grants/saml/Saml2BearerGrantHandler.java | 1 +
.../code/DefaultEHCacheCodeDataProvider.java | 1 -
.../oauth2/grants/code/JCacheCodeDataProvider.java | 1 +
.../provider/DefaultEHCacheOAuthDataProvider.java | 1 -
.../cxf/rs/security/oauth2/utils/EHCacheUtil.java | 1 -
.../grants/code/JCacheCodeDataProviderTest.java | 1 +
.../grants/code/JPACMTOAuthDataProviderTest.java | 2 +
.../grants/code/JPACodeDataProviderTest.java | 2 +
.../oauth2/grants/jwt/AbstractJwtHandlerTest.java | 3 +-
.../provider/JCacheOAuthDataProviderTest.java | 1 +
.../oauth2/provider/JPAOAuthDataProviderTest.java | 2 +
.../tokens/hawk/HawkAccessTokenValidatorTest.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImplTest.java | 2 +-
.../oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java | 2 +
.../oidc/idp/JPAOidcUserSubjectCMTTest.java | 1 +
.../security/oidc/idp/JPAOidcUserSubjectTest.java | 2 +
.../AbstractRequestAssertionConsumerHandler.java | 1 +
.../saml/sso/AbstractServiceProviderFilter.java | 1 +
.../security/saml/sso/EHCacheTokenReplayCache.java | 1 -
.../cxf/rs/security/saml/sso/MetadataService.java | 1 +
.../saml/sso/SAMLProtocolResponseValidator.java | 1 +
.../rs/security/saml/sso/SSOValidatorResponse.java | 1 +
.../security/saml/sso/SamlPostBindingFilter.java | 1 +
.../saml/sso/SamlRedirectBindingFilter.java | 1 +
.../saml/sso/state/EHCacheSPStateManager.java | 1 -
.../security/saml/sso/AuthnRequestBuilderTest.java | 1 +
.../security/saml/sso/CombinedValidatorTest.java | 1 +
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 1 -
.../saml/sso/SAMLResponseValidatorTest.java | 1 +
.../saml/sso/SAMLSSOResponseValidatorTest.java | 1 +
.../cxf/rs/security/common/RSSecurityUtils.java | 1 +
.../rs/security/saml/AbstractSamlInHandler.java | 1 +
.../authorization/SecurityContextProviderImpl.java | 1 +
.../rs/security/xml/AbstractXmlEncInHandler.java | 1 +
.../rs/security/xml/AbstractXmlSecInHandler.java | 1 +
.../security/xml/AbstractXmlSecOutInterceptor.java | 1 +
.../rs/security/xml/AbstractXmlSigInHandler.java | 1 +
.../cxf/rs/security/xml/XmlEncOutInterceptor.java | 1 +
.../cxf/rs/security/xml/XmlSigOutInterceptor.java | 1 +
.../security/saml/claims/SAMLSecurityContext.java | 1 +
.../saml/interceptor/WSS4JBasicAuthValidator.java | 1 +
.../cxf/rt/security/saml/utils/SAMLUtils.java | 1 +
.../rt/security/saml/xacml/CXFMessageParser.java | 1 +
.../rt/security/saml/claims/SAMLClaimsTest.java | 2 +
.../ClaimsAuthorizingInterceptorTest.java | 1 +
.../saml/xacml2/RequestComponentBuilderTest.java | 1 +
.../xacml2/SamlRequestComponentBuilderTest.java | 1 +
.../JettyHTTPServerEngineBeanDefinitionParser.java | 1 +
...TTPServerEngineFactoryBeanDefinitionParser.java | 1 -
.../http_jetty/JettyHTTPDestinationTest.java | 3 +
.../http_jetty/JettyHTTPServerEngineTest.java | 3 +
.../netty/client/integration/NettyClientTest.java | 3 +
.../http/netty/server/NettyHttpContextHandler.java | 2 +-
.../http/netty/server/NettyHttpHandler.java | 2 +
.../http/netty/server/NettyHttpServerEngine.java | 3 +-
.../server/interceptor/ChannelInterceptor.java | 1 -
.../server/interceptor/HttpSessionInterceptor.java | 1 +
.../server/servlet/NettyHttpServletRequest.java | 1 +
.../NettyHttpServerEngineBeanDefinitionParser.java | 1 -
.../netty/server/NettyHttpDestinationTest.java | 2 +-
.../server/NettyHttpServerEngineFactoryTest.java | 1 +
.../netty/server/NettyHttpServerEngineTest.java | 1 +
.../http/netty/server/NettyHttpTestHandler.java | 1 +
.../netty/server/integration/NettyServerTest.java | 3 +
.../integration/SSLNettySpringServerTest.java | 3 +
.../HttpAuthSupplierBeanDefinitionParser.java | 1 +
.../cxf/transport/https/CertConstraints.java | 1 -
.../org/apache/cxf/transport/https/SSLUtils.java | 1 -
.../http/DestinationRegistryImplTest.java | 2 +-
.../http/HTTPConduitURLConnectionTest.java | 1 +
.../transport/http/HTTPConduitURLEasyMockTest.java | 1 +
.../org/apache/cxf/transport/http/HeadersTest.java | 2 +-
.../http/auth/DigestAuthSupplierTest.java | 2 +-
.../http/policy/ClientPolicyCalculatorTest.java | 1 +
.../policy/HTTPClientAssertionBuilderTest.java | 1 +
.../policy/HTTPServerAssertionBuilderTest.java | 1 +
.../cxf/transport/http/policy/PolicyUtilsTest.java | 1 +
.../http/policy/ServerPolicyCalculatorTest.java | 1 +
.../https/HttpsURLConnectionFactoryTest.java | 2 +
.../cxf/transport/servlet/BaseUrlHelperTest.java | 1 -
.../transport/servlet/ServletControllerTest.java | 2 +-
.../cxf/transport/jms/JMSTransportFactory.java | 1 -
.../cxf/transport/jms/AbstractJMSTester.java | 1 +
.../apache/cxf/transport/jms/JMSConduitTest.java | 1 +
.../cxf/transport/jms/JMSConfigFactoryTest.java | 1 +
.../cxf/transport/jms/JMSDestinationTest.java | 1 +
.../MessageIdAsCorrelationIdJMSConduitTest.java | 1 +
.../cxf/transport/jms/RequestResponseTest.java | 1 +
.../continuations/JMSContinuationProviderTest.java | 1 +
.../jms/continuations/JMSContinuationTest.java | 1 +
.../cxf/transport/jms/uri/JMSEndpointTest.java | 1 +
.../jms/uri/URIConfiguredConduitTest.java | 1 +
.../apache/cxf/transport/jms/util/JMSUtilTest.java | 1 +
.../transport/jms/util/MessageListenerTest.java | 1 +
.../transport/local/LocalTransportFactoryTest.java | 2 +-
.../jetty/JettyWebSocketDestinationTest.java | 2 +-
.../cxf/ws/addressing/impl/ContextUtilsTest.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 2 +-
.../addressing/soap/DecoupledFaultHandlerTest.java | 1 +
.../cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
.../ws/eventing/shared/faults/WSEventingFault.java | 1 +
.../handlers/ReferenceParametersAddingHandler.java | 1 +
.../eventing/shared/utils/DurationAndDateUtil.java | 2 +
.../base/SimpleEventingIntegrationTest.java | 1 +
.../ws/eventing/integration/NotificationTest.java | 1 +
.../eventing/integration/SubscriptionEndTest.java | 1 +
.../integration/SubscriptionGrantingTest.java | 2 +
.../integration/SubscriptionManagementTest.java | 1 +
.../eventsink/TestingEndToEndpointImpl.java | 1 +
.../external/ExternalAttachmentProvider.java | 1 +
.../attachment/external/PolicyAttachment.java | 1 +
.../policy/blueprint/PolicyBPDefinitionParser.java | 1 +
.../blueprint/PolicyFeatureBPDefinitionParser.java | 1 +
.../policy/AssertionBuilderRegistryImplTest.java | 1 +
.../apache/cxf/ws/policy/AssertionInfoMapTest.java | 1 +
.../cxf/ws/policy/EffectivePolicyImplTest.java | 2 +-
.../cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../org/apache/cxf/ws/policy/NormalizeTest.java | 1 +
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 1 +
.../org/apache/cxf/ws/policy/PolicyEngineTest.java | 2 +-
.../PolicyInterceptorProviderRegistryImplTest.java | 1 +
.../cxf/ws/policy/PolicyInterceptorsTest.java | 1 +
.../cxf/ws/policy/PolicyRegistryImplTest.java | 1 +
.../PolicyVerificationInFaultInterceptorTest.java | 1 +
.../PolicyVerificationInInterceptorTest.java | 1 +
.../PolicyVerificationOutInterceptorTest.java | 1 +
.../DomainExpressionBuilderRegistryTest.java | 1 +
.../EndpointReferenceDomainExpressionTest.java | 1 +
.../external/ExternalAttachmentProviderTest.java | 2 +
.../attachment/external/PolicyAttachmentTest.java | 1 +
.../external/URIDomainExpressionTest.java | 1 +
.../reference/ReferenceResolverTest.java | 1 +
.../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 1 +
.../ws/policy/builder/jaxb/JaxbAssertionTest.java | 1 +
.../selector/FirstAlternativeSelectorTest.java | 2 +-
.../MinimalMaximalAlternativeSelectorTest.java | 2 +-
.../cxf/ws/policy/spring/PolicyBeansTest.java | 1 +
.../org/apache/cxf/ws/rm/AbstractEndpointTest.java | 1 +
.../cxf/ws/rm/AbstractRMInterceptorTest.java | 2 +-
.../apache/cxf/ws/rm/DestinationSequenceTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/DestinationTest.java | 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/ProxyTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMContextUtilsTest.java | 1 +
.../java/org/apache/cxf/ws/rm/RMEndpointTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMInInterceptorTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMUtilsTest.java | 1 +
.../java/org/apache/cxf/ws/rm/ServantTest.java | 2 +-
.../org/apache/cxf/ws/rm/SourceSequenceTest.java | 1 +
.../jdbc/RMTxStoreConfigurationTest.java | 1 +
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java | 3 +-
.../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 2 +-
.../persistence/jdbc/RMTxStoreTwoSchemasTest.java | 276 +++++++-------
.../apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 2 +-
.../ws/rm/soap/RetransmissionQueueImplTest.java | 2 +-
.../cxf/ws/rm/soap/SoapFaultFactoryTest.java | 2 +-
.../apache/cxf/ws/security/cache/EHCacheUtils.java | 1 -
.../security/policy/interceptors/STSInvoker.java | 1 +
.../SecureConversationInInterceptor.java | 1 +
.../ws/security/tokenstore/EHCacheTokenStore.java | 1 -
.../cxf/ws/security/tokenstore/SecurityToken.java | 1 +
.../cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 1 +
.../ws/security/trust/STSStaxTokenValidator.java | 1 +
.../org/apache/cxf/ws/security/trust/STSUtils.java | 1 +
.../delegation/ReceivedTokenCallbackHandler.java | 1 +
.../delegation/WSSUsernameCallbackHandler.java | 1 +
.../wss4j/BinarySecurityTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/CryptoCoverageUtil.java | 1 +
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 1 +
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 1 +
.../ws/security/wss4j/SamlTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/StaxSerializer.java | 1 +
.../security/wss4j/UsernameTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 1 +
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 1 +
.../policyhandlers/AbstractBindingBuilder.java | 1 +
.../policyhandlers/AsymmetricBindingHandler.java | 1 +
.../policyhandlers/SymmetricBindingHandler.java | 1 +
.../policyhandlers/TransportBindingHandler.java | 1 +
.../AbstractBindingPolicyValidator.java | 1 +
.../AbstractSupportingTokenPolicyValidator.java | 1 +
.../PolicyValidatorParameters.java | 1 +
.../SecuredElementsPolicyValidator.java | 1 +
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 2 +-
.../apache/cxf/ws/security/sts/STSClientTest.java | 2 +
.../security/tokenstore/EHCacheTokenStoreTest.java | 1 +
.../security/tokenstore/MemoryTokenStoreTest.java | 1 +
.../security/wss4j/CryptoCoverageCheckerTest.java | 2 +
.../security/wss4j/CustomPolicyAlgorithmsTest.java | 1 +
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 +
.../wss4j/DOMToStaxSignatureIdentifierTest.java | 1 +
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 1 +
.../wss4j/PluggablePolicyValidatorTest.java | 1 +
.../ws/security/wss4j/SecurityActionTokenTest.java | 1 +
.../wss4j/SecurityVerificationOutTest.java | 1 +
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 1 +
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 1 +
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 1 +
.../ws/security/wss4j/saml/DOMToStaxSamlTest.java | 1 +
.../security/wss4j/saml/PolicyBasedSamlTest.java | 1 +
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 1 +
.../ws/security/wss4j/saml/StaxToDOMSamlTest.java | 1 +
.../org/apache/cxf/wsdl/AbstractWSDLPlugin.java | 1 +
.../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 1 +
.../apache/cxf/wsdl/WSDLExtensibilityPlugin.java | 1 +
.../main/java/org/apache/cxf/wsdl/WSDLManager.java | 2 +
.../cxf/wsdl11/AbstractWrapperWSDLLocator.java | 1 +
.../apache/cxf/wsdl11/PartialWSDLProcessor.java | 2 -
.../cxf/wsdl11/ResourceManagerWSDLLocator.java | 1 +
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 1 +
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 1 +
.../interceptors/DocLiteralInInterceptorTest.java | 2 +-
.../factory/ReflectionServiceFactorBeanTest.java | 2 +-
.../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 1 +
.../apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
.../java/org/apache/cxf/sts/cache/CacheUtils.java | 1 +
.../apache/cxf/sts/cache/EHCacheIdentityCache.java | 1 -
.../org/apache/cxf/sts/claims/ClaimsManager.java | 1 +
.../cxf/sts/claims/IdentityClaimsParser.java | 1 +
.../java/org/apache/cxf/sts/claims/LdapUtils.java | 1 -
.../cxf/sts/event/LoggerPatternLayoutLogback.java | 1 -
.../cxf/sts/operation/AbstractOperation.java | 1 +
.../org/apache/cxf/sts/request/ReceivedToken.java | 1 +
.../org/apache/cxf/sts/request/RequestParser.java | 1 +
.../cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 1 +
.../cxf/sts/token/canceller/SCTCanceller.java | 1 +
.../token/delegation/SAMLDelegationHandler.java | 1 +
.../cxf/sts/token/provider/SAMLTokenProvider.java | 1 +
.../token/provider/SubjectProviderParameters.java | 1 +
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 1 +
.../sts/token/renewer/TokenRenewerResponse.java | 1 +
.../sts/token/validator/SAMLTokenValidator.java | 1 +
.../token/validator/UsernameTokenValidator.java | 1 +
.../cxf/sts/cache/HazelCastTokenStoreTest.java | 1 +
.../sts/claims/mapper/JexlClaimsMapperTest.java | 1 +
.../apache/cxf/sts/common/CustomClaimParser.java | 1 +
.../cxf/sts/common/PasswordCallbackHandler.java | 2 +
.../cxf/sts/common/RealmSupportClaimsHandler.java | 1 +
.../cxf/sts/operation/DummyTokenProvider.java | 1 +
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 2 +
.../sts/operation/IssueJWTOnbehalfofUnitTest.java | 1 +
.../cxf/sts/operation/IssueJWTRealmUnitTest.java | 1 +
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlRealmUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlUnitTest.java | 1 +
.../cxf/sts/operation/RenewSamlUnitTest.java | 1 +
.../operation/ValidateJWTTransformationTest.java | 1 +
.../cxf/sts/operation/ValidateJWTUnitTest.java | 1 +
.../ValidateTokenTransformationUnitTest.java | 1 +
.../cxf/sts/request/RequestParserUnitTest.java | 1 +
.../sts/token/provider/JWTProviderActAsTest.java | 1 +
.../token/provider/JWTProviderOnBehalfOfTest.java | 1 +
.../sts/token/provider/JWTTokenProviderTest.java | 1 +
.../cxf/sts/token/provider/SAMLClaimsTest.java | 1 +
.../token/provider/SAMLProviderKeyTypeTest.java | 1 +
.../cxf/sts/token/realm/RealmSupportTest.java | 1 +
.../renewer/SAMLTokenRenewerLifetimeTest.java | 1 +
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 2 +
.../token/renewer/SAMLTokenRenewerRealmTest.java | 1 +
.../sts/token/renewer/SAMLTokenRenewerTest.java | 1 +
.../SAMLTokenValidatorCachedRealmTest.java | 3 +-
.../token/validator/SAMLTokenValidatorTest.java | 2 +
.../asymmetric_encr/AsymmetricEncryptionTest.java | 1 +
.../systest/sts/basic_auth/JaxwsBasicAuthTest.java | 1 +
.../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 1 +
.../systest/sts/batch/SimpleBatchSTSClient.java | 1 +
.../BinarySecurityTokenTest.java | 1 +
.../cxf/systest/sts/caching/CachingTest.java | 1 +
.../systest/sts/caching/DoubleItPortTypeImpl.java | 1 -
.../cxf/systest/sts/caching/ServerCachingTest.java | 1 +
.../apache/cxf/systest/sts/claims/ClaimsTest.java | 1 +
.../cxf/systest/sts/claims/ClaimsValidator.java | 1 +
.../systest/sts/claims/StaxClaimsValidator.java | 1 +
.../systest/sts/common/CommonCallbackHandler.java | 2 +
.../systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../cxf/systest/sts/common/TokenTestUtils.java | 1 +
.../systest/sts/cross_domain/CrossDomainTest.java | 1 +
.../systest/sts/custom/CustomParameterTest.java | 1 +
.../custom_onbehalfof/CustomOnBehalfOfTest.java | 2 +-
.../LocalDoubleItPortTypeImpl.java | 1 +
.../SAMLDoubleItPortTypeImpl.java | 1 +
.../systest/sts/deployment/CustomClaimsParser.java | 1 +
.../DistributedCachingTest.java | 2 +-
.../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 1 +
.../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java | 1 +
.../systest/sts/kerberos/DoubleItPortTypeImpl.java | 1 +
.../sts/kerberos/IntermediaryPortTypeImpl.java | 1 +
.../sts/kerberos/KerberosDelegationTokenTest.java | 1 +
.../cxf/systest/sts/realms/DifferentRealmTest.java | 2 +-
.../cxf/systest/sts/renew/SAMLRenewTest.java | 2 +-
.../cxf/systest/sts/renew/SAMLRenewUnitTest.java | 1 +
.../sts/secure_conv/SCTSAMLTokenProvider.java | 1 +
.../sts/secure_conv/SecureConversationTest.java | 2 +-
.../secure_conv/SecurityContextTokenUnitTest.java | 1 +
.../apache/cxf/systest/sts/soap12/Soap12Test.java | 2 +
.../sts_sender_vouches/STSSenderVouchesTest.java | 1 +
.../sts/transformation/DoubleItPortTypeImpl.java | 1 +
.../sts/transformation/TransformationTest.java | 2 +-
.../sts/usernametoken/UsernameTokenTest.java | 1 +
.../sts/asymmetric/AsymmetricBindingTest.java | 1 +
.../apache/cxf/systest/sts/bearer/BearerTest.java | 1 +
.../systest/sts/common/CommonCallbackHandler.java | 2 +
.../systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../systest/sts/delegation/SAMLDelegationTest.java | 2 +
.../DoubleItPortTypeImpl.java | 1 +
.../IntermediaryCachingPortTypeImpl.java | 1 +
.../IntermediaryPortTypeImpl.java | 1 +
.../IntermediaryTransformationCachingTest.java | 1 +
.../IntermediaryTransformationTest.java | 1 +
.../apache/cxf/systest/sts/issuer/IssuerTest.java | 1 +
.../cxf/systest/sts/issueunit/IssueUnitTest.java | 2 +
.../org/apache/cxf/systest/sts/jaas/JAASTest.java | 1 +
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 1 +
.../sts/sendervouches/SenderVouchesTest.java | 1 +
.../cxf/systest/sts/stsclient/STSClientTest.java | 1 +
.../cxf/systest/sts/template/TemplateTest.java | 1 +
.../sts/transport/TransportBindingTest.java | 1 +
.../systest/sts/username_actas/ActAsValidator.java | 1 +
.../username_actas/UsernameActAsCachingTest.java | 1 +
.../sts/username_actas/UsernameActAsTest.java | 1 +
.../UsernameOnBehalfOfCachingTest.java | 1 +
.../UsernameOnBehalfOfTest.java | 1 +
.../sts/x509/X509AsymmetricBindingTest.java | 1 +
.../systest/sts/x509/X509SymmetricBindingTest.java | 1 +
.../sts/itests/BasicSTSIntegrationTest.java | 1 +
.../sts/itests/unit/CommonCallbackHandler.java | 2 +
.../cxf/systest/sts/itests/unit/STSUnitTest.java | 1 +
.../systest/sts/osgi/CommonCallbackHandler.java | 2 +
.../java/org/apache/cxf/wsn/client/PullPoint.java | 1 +
.../org/apache/cxf/wsn/AbstractSubscription.java | 1 +
.../cxf/wsn/services/JaxwsCreatePullPoint.java | 1 +
.../cxf/xkms/cache/EHCacheXKMSClientCache.java | 1 -
.../cxf/xkms/itests/BasicIntegrationTest.java | 2 +
.../handlers/validator/ValidatorCRLTest.java | 1 +
.../itests/handlers/validator/ValidatorTest.java | 1 +
.../cxf/xkms/itests/service/XKMSServiceTest.java | 1 +
.../cxf/xkms/itests/service/XKRSSDisableTest.java | 1 +
.../org/apache/cxf/xkms/service/CheckXKRSS.java | 1 +
.../cxf/xkms/x509/handlers/X509LocatorTest.java | 1 +
.../x509/repo/file/FileCertificateRepoTest.java | 1 +
.../apache/cxf/xkms/x509/utils/X509UtilsTest.java | 1 +
.../xkms/x509/validator/BasicValidationTest.java | 1 +
.../cxf/xkms/x509/validator/DateValidatorTest.java | 1 +
.../TrustedAuthorityValidatorCRLTest.java | 1 +
.../x509/repo/ldap/LDAPCertificateRepoTest.java | 1 +
.../systests/cdi/base/AbstractCdiMultiAppTest.java | 1 +
.../cdi/base/AbstractCdiSingleAppTest.java | 1 +
.../cxf/systests/cdi/base/BookStoreByIds.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../cxf/systest/grizzly/EndpointAPITest.java | 1 +
.../apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java | 1 +
.../jaxb/validators/CustomValidatorJAXBTest.java | 1 +
.../jaxrs/AbstractJAXRSContinuationsTest.java | 1 +
.../systest/jaxrs/JAXRSClientServerBookTest.java | 1 +
.../jaxrs/JAXRSClientServerNonSpringBookTest.java | 1 +
.../jaxrs/JAXRSClientServerODataSearchTest.java | 112 +++---
...ClientServerResourceCreatedOutsideBookTest.java | 1 +
...SClientServerResourceCreatedSpringBookTest.java | 1 +
.../jaxrs/JAXRSClientServerStreamingTest.java | 1 +
.../JAXRSClientServerUserResourceAsteriskTest.java | 1 +
.../JAXRSClientServerUserResourceDefaultTest.java | 1 +
.../jaxrs/JAXRSClientServerUserResourceTest.java | 1 +
.../jaxrs/JAXRSCxfContinuationsServlet3Test.java | 1 +
.../systest/jaxrs/JAXRSCxfContinuationsTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/XXETest.java | 1 +
.../AbstractSwagger2ServiceDescriptionTest.java | 2 +-
.../discovery/JAXRSServerSpringDiscoveryTest.java | 1 +
.../extraction/JAXRSClientServerTikaTest.java | 1 +
.../jaxrs/failover/FailoverWebClientTest.java | 1 +
.../failover/LoadDistributorWebClientTest.java | 1 +
.../jaxrs/provider/JsrJsonpProviderTest.java | 1 +
...patchClientServerWithMalformedResponseTest.java | 1 +
.../systest/handlers/AddNumbersServiceUnwrap.java | 1 +
.../handlers/AddNumbersServiceWithAnnotation.java | 1 +
.../handlers/DispatchHandlerInvocationTest.java | 2 +-
.../systest/handlers/HandlerInvocationTest.java | 2 +
.../HandlerInvocationUsingAddNumbersTest.java | 2 +-
.../cxf/systest/handlers/HandlerTestImpl.java | 2 +-
.../handlers/SpringConfiguredHandlerTest.java | 1 +
.../apache/cxf/systest/handlers/TestHandler.java | 1 -
.../cxf/systest/jaxws/AnyClientServerTest.java | 1 +
.../cxf/systest/jaxws/ArrayServiceServer.java | 1 +
.../org/apache/cxf/systest/jaxws/CXF5061Test.java | 1 +
.../org/apache/cxf/systest/jaxws/CXF6655Test.java | 1 +
.../jaxws/ClientServerGreeterBaseNoWsdlTest.java | 1 +
.../systest/jaxws/ClientServerGreeterBaseTest.java | 1 +
.../jaxws/ClientServerGreeterNoWsdlTest.java | 1 +
.../systest/jaxws/ClientServerMixedStyleTest.java | 1 +
.../systest/jaxws/ClientServerPartialWsdlTest.java | 2 +-
.../jaxws/ClientServerRPCLitDefatulAnnoTest.java | 1 +
.../cxf/systest/jaxws/ClientServerRPCLitTest.java | 1 +
.../apache/cxf/systest/jaxws/ClientServerTest.java | 1 +
.../systest/jaxws/DocLitBareCodeFirstService.java | 1 -
.../jaxws/DocLitWrappedCodeFirstService.java | 1 -
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 1 +
.../cxf/systest/jaxws/JaxwsExecutorTest.java | 1 +
.../apache/cxf/systest/jaxws/OASISCatalogTest.java | 1 -
.../JavaFirstSchemaValidationTest.java | 1 +
.../apache/cxf/systest/provider/CXF4130Test.java | 1 +
.../apache/cxf/systest/provider/CXF4818Test.java | 1 +
.../provider/NBProviderClientServerTest.java | 1 +
.../systest/provider/ProviderClientServerTest.java | 1 +
.../provider/ProviderRPCClientServerTest.java | 1 +
.../kerberos/common/DoubleItPortTypeImpl.java | 1 +
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 1 +
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 1 +
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 1 +
.../apache/cxf/jaxrs/servlet/AbstractSciTest.java | 1 +
.../servlet/jetty/JettyEmptyApplicationTest.java | 1 +
.../jetty/JettyEmptyPathApplicationTest.java | 1 +
.../servlet/jetty/JettyNoApplicationTest.java | 1 +
.../JettySingleApplicationOnlyClassesTest.java | 1 +
.../JettySingleApplicationOnlySingletonsTest.java | 1 +
.../servlet/jetty/JettySingleApplicationTest.java | 1 +
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 1 +
.../security/jose/jwejws/JweJwsReferenceTest.java | 1 +
.../jaxrs/security/jose/jwt/BookStoreAuthn.java | 1 +
.../jaxrs/security/jose/jwt/JWTPropertiesTest.java | 1 +
.../oauth/TemporaryCredentialServiceTest.java | 1 -
.../security/oauth2/common/OAuth2TestUtils.java | 1 +
.../security/oauth2/filters/OAuth2FiltersTest.java | 1 +
.../grants/AuthorizationGrantNegativeTest.java | 1 +
.../oauth2/grants/AuthorizationGrantTest.java | 1 +
.../oauth2/grants/IntrospectionServiceTest.java | 1 +
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 1 -
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 1 +
.../jaxrs/security/oidc/OIDCNegativeTest.java | 1 +
.../systest/jaxrs/security/oidc/UserInfoTest.java | 1 +
.../security/oidc/filters/OIDCFiltersTest.java | 1 +
.../systest/jaxrs/security/saml/JAXRSSamlTest.java | 1 +
.../security/saml/SamlRetrievalInterceptor.java | 1 -
.../jaxrs/security/samlsso/MetadataTest.java | 2 +
.../cxf/systest/jaxrs/tracing/brave/HasSpan.java | 1 -
.../tracing/brave/IsAnnotationContaining.java | 1 -
.../brave/IsBinaryAnnotationContaining.java | 1 -
.../htrace/HTraceTracingCustomHeadersTest.java | 1 +
.../jaxrs/tracing/htrace/HTraceTracingTest.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 1 -
.../jaxws/tracing/brave/BraveTracingTest.java | 1 +
.../jaxws/tracing/htrace/HTraceTracingTest.java | 1 +
.../testsuite/testcases/JavaFirstNoWsdlTest.java | 1 +
.../testsuite/testcases/SOAPJMSTestSuiteTest.java | 1 +
.../jms/testsuite/testcases/SoapJmsSpecTest.java | 1 +
.../apache/cxf/systest/jms/AbstractVmJMSTest.java | 1 +
.../cxf/systest/jms/JMSClientServerTest.java | 2 +
.../org/apache/cxf/systest/jms/JMSTestMtom.java | 1 +
.../org/apache/cxf/systest/jms/JaxWsAPITest.java | 1 +
.../HelloWorldContinuationsClientServerTest.java | 1 +
.../HelloWorldContinuationsThrottleTest.java | 1 +
.../JMSContinuationsClientServerTest.java | 1 +
.../continuations/ProviderJMSContinuationTest.java | 1 +
.../MultiTransportClientServerTest.java | 1 +
.../systest/jms/security/JMSWSSecurityTest.java | 1 +
.../cxf/systest/jms/shared/JMSSharedQueueTest.java | 1 +
.../cxf/systest/jms/swa/ClientServerSwaTest.java | 1 +
.../systest/jms/tx/GreeterImplWithTransaction.java | 1 +
.../cxf/systest/jms/tx/JMSTransactionTest.java | 1 +
.../java/org/apache/cxf/https/ssl3/SSLv3Test.java | 1 +
.../apache/cxf/systest/http/HTTPConduitTest.java | 1 +
.../cxf/systest/http/HTTPProxyConduitTest.java | 1 -
.../cxf/systest/http/PublishedEndpointUrlTest.java | 1 +
.../org/apache/cxf/systest/http/WSDLQueryTest.java | 1 +
.../cxf/systest/http/auth/DigestAuthTest.java | 1 +
.../systest/http_jetty/EngineLifecycleTest.java | 5 -
.../cxf/systest/http_jetty/JettyBasicAuthTest.java | 1 +
.../systest/http_jetty/JettyDigestAuthTest.java | 1 +
.../cxf/systest/http_jetty/ThreadPoolTest.java | 1 +
.../ClientServerWrappedContinuationTest.java | 1 +
.../https/ciphersuites/CipherSuitesTest.java | 1 +
.../systest/https/clientauth/ClientAuthTest.java | 1 +
.../cxf/systest/https/conduit/HTTPSClientTest.java | 1 +
.../systest/https/conduit/HTTPSConduitTest.java | 1 +
.../https/constraints/CertConstraintsTest.java | 1 +
.../https/hostname/HostnameVerificationTest.java | 1 +
.../cxf/systest/https/trust/TrustManagerTest.java | 1 +
.../systest/servlet/ErrorContextSerletTest.java | 1 +
.../cxf/cxf1226/MissingQualification1226Test.java | 1 +
.../RespectBindingFeatureClientServerTest.java | 1 +
.../cxf/systest/bus/BusExtensionLoadingTest.java | 1 +
.../apache/cxf/systest/bus/BusShutdownTest.java | 1 -
.../cxf/systest/bus/SpringBusFactoryTest.java | 2 +
.../systest/callback/CallbackClientServerTest.java | 1 +
.../LoadDistributorAddressOverrideTest.java | 3 +-
.../LoadDistributorSequentialStrategy.java | 1 +
.../clustering/LoadDistributorStaticStrategy.java | 1 +
.../systest/clustering/LoadDistributorTest.java | 3 +
.../coloc/AbstractHeaderServiceDocLitTest.java | 1 -
.../coloc/AbstractHeaderServiceRpcLitTest.java | 1 -
.../systest/coloc/AbstractWrappedDocLitTest.java | 2 +-
.../systest/coloc/BaseHeaderTesterDocLitImpl.java | 2 +-
.../cxf/systest/coloc/ColocHeaderDocLitTest.java | 1 +
.../cxf/systest/coloc/ColocHeaderRpcLitTest.java | 1 +
.../cxf/systest/coloc/ColocWrappedDocLitTest.java | 1 +
.../apache/cxf/systest/corba/BaseGreeterImpl.java | 1 +
.../cxf/systest/corba/BaseGreeterTimeoutImpl.java | 1 +
.../corba/CorbaBindingFactoryConfigurerTest.java | 1 +
.../org/apache/cxf/systest/corba/CorbaTest.java | 1 +
.../apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 +
.../cxf/systest/cxf6319/Cxf6319TestCase.java | 1 +
.../org/apache/cxf/systest/cxf993/Cxf993Test.java | 2 +
.../cxf/systest/jca/OutBoundConnectionTest.java | 1 +
.../apache/cxf/systest/js/JSClientServerTest.java | 1 +
.../management/CountersClientServerTest.java | 1 +
.../management/ManagedClientServerTest.java | 1 +
.../cxf/systest/mtom/ClientMtomXopWithJMSTest.java | 1 +
.../systest/mtom/TestAttachmentOutInterceptor.java | 1 +
.../mtom/TestMultipartMessageInterceptor.java | 1 +
.../cxf/systest/mtom_bindingtype/HelloImpl.java | 1 +
.../mtom_bindingtype/MTOMBindingTypeTest.java | 1 +
.../apache/cxf/systest/mtom_feature/HelloImpl.java | 1 +
.../cxf/systest/mtom_feature/ImageHelper.java | 1 +
.../mtom_feature/MtomFeatureClientServerTest.java | 1 +
.../systest/outofband/header/OOBHeaderTest.java | 4 +-
.../cxf/systest/outofband/header/Server.java | 2 -
.../cxf/systest/resolver/JarResolverTest.java | 1 +
.../systest/schemaimport/sayhi2/SayHiArray.java | 1 +
.../schemaimport/sayhi2/SayHiArrayResponse.java | 1 +
.../cxf/systest/simple/SimpleFrontendTest.java | 1 +
.../apache/cxf/systest/soap/SoapActionTest.java | 1 +
.../systest/soapheader/HeaderClientServerTest.java | 1 +
.../cxf/systest/stringarray/StringArrayTest.java | 1 +
.../AppleFindClientServerTest.java | 1 +
.../type_substitution/TypeSubClientServerTest.java | 1 +
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../systest/type_test/AbstractTypeTestClient4.java | 1 +
.../systest/type_test/AbstractTypeTestClient5.java | 1 +
.../type_test/corba/CORBADocLitClientTypeTest.java | 1 +
.../versioning/ClientServerVersioningTest.java | 1 +
.../cxf/systest/ws/rm/DecoupledBareTest.java | 1 +
.../ws/rm/DecoupledClientServerOnewayTest.java | 1 +
.../systest/ws/rm/DecoupledClientServerTest.java | 1 +
.../examples/common/DoubleItPortTypeImpl.java | 1 +
.../systest/wssec/examples/saml/SamlTokenTest.java | 1 +
.../examples/secconv/SecureConversationTest.java | 1 +
.../wssec/examples/ut/UsernameTokenTest.java | 1 +
.../systest/wssec/examples/x509/X509TokenTest.java | 1 +
.../apache/cxf/systest/ws/action/ActionTest.java | 1 +
.../systest/ws/action/SignatureWhitespaceTest.java | 1 +
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 1 -
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 1 -
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 1 +
.../systest/ws/bindings/BindingPropertiesTest.java | 1 +
.../apache/cxf/systest/ws/cache/CachingTest.java | 1 +
.../systest/ws/common/DoubleItPortTypeImpl.java | 1 +
.../CryptoCoverageCheckerTest.java | 1 +
.../org/apache/cxf/systest/ws/fault/FaultTest.java | 1 +
.../cxf/systest/ws/fault/ModifiedRequestTest.java | 2 +
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 1 +
.../systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 1 +
.../apache/cxf/systest/ws/httpget/HTTPGetTest.java | 1 +
.../cxf/systest/ws/https/HttpsTokenTest.java | 1 +
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 1 +
.../org/apache/cxf/systest/ws/parts/PartsTest.java | 1 +
.../JavaFirstURIDomainExpressionBuilder.java | 3 +
.../systest/ws/policy/PolicyAlternativeTest.java | 1 +
.../handler/PolicyHandlerFaultResponseTest.java | 1 +
.../apache/cxf/systest/ws/saml/SamlTokenTest.java | 1 +
.../ws/saml/subjectconf/SamlSubjectConfTest.java | 1 +
.../systest/ws/security/WSSecurityClientTest.java | 1 +
.../cxf/systest/ws/security/handler/WSSecTest.java | 1 +
.../apache/cxf/systest/ws/swa/SWAActionTest.java | 1 +
.../apache/cxf/systest/ws/swa/SWAPolicyTest.java | 1 +
.../systest/ws/tokens/BinarySecurityTokenTest.java | 2 +
.../cxf/systest/ws/tokens/DoubleItBSTImpl.java | 1 +
.../ws/tokens/EndorsingSupportingTokenTest.java | 1 +
.../cxf/systest/ws/tokens/SupportingTokenTest.java | 1 +
.../systest/ws/ut/UsernameTokenDerivedTest.java | 1 -
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 1 +
.../cxf/systest/ws/ut/UsernameTokenTest.java | 1 +
.../cxf/systest/ws/wssc/PingServiceImpl.java | 1 -
.../apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 1 +
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity111Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity112Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity11Common.java | 1 -
.../systest/ws/x509/DoubleItPropertiesImpl.java | 1 -
.../cxf/systest/ws/x509/SHA512PolicyLoader.java | 1 +
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 1 +
.../org/apache/cxf/systest/ws/xkms/XKMSTest.java | 1 +
.../ws/addr_feature/WSAClientServerTest.java | 2 +
.../systest/ws/addr_fromjava/WSAFromJavaTest.java | 1 +
.../WSAResponsesClientServerTest.java | 1 +
...SDLAddrPolicyAttachmentJaxwsMMProviderTest.java | 1 +
.../cxf/systest/ws/addressing/MAPTestBase.java | 1 +
.../ws/addressing/spring/WSAFeatureTest.java | 1 +
.../ws/addressing/spring/WSAFeatureXmlTest.java | 1 +
.../org/apache/cxf/systest/ws/mex/MEXTest.java | 1 +
.../ws/policy/AddressingAnonymousPolicyTest.java | 1 +
.../ws/policy/AddressingInlinePolicyTest.java | 1 +
...dressingPolicyExternalAttachmentWsdl11Test.java | 1 +
.../systest/ws/policy/HTTPClientPolicyTest.java | 1 +
.../systest/ws/policy/HTTPServerPolicyTest.java | 1 +
.../org/apache/cxf/test/AbstractCXFSpringTest.java | 2 +
.../main/java/org/apache/cxf/test/XPathAssert.java | 30 +-
.../testutil/common/AbstractTestServerBase.java | 1 +
.../cxf/testutil/handler/TrivialSOAPHandler.java | 1 +
.../AnnotatedGreeterImpl.java | 1 +
.../AnnotatedGreeterNoOverloadImpl.java | 1 +
.../hello_world_soap_http/BaseGreeterImpl.java | 1 -
.../hello_world_soap_http/DocLitBareImpl.java | 1 +
.../java/org/apache/cxf/test/XPathAssertTest.java | 17 +-
.../header_test/rpc/TestRPCHeaderTest.java | 1 +
.../apache/cxf/tools/common/ProcessorTestBase.java | 1 +
.../main/java/org/apache/cxf/tools/common/Tag.java | 1 +
.../cxf/tools/common/model/JavaInterface.java | 1 +
.../apache/cxf/tools/common/model/JavaPort.java | 2 +
.../apache/cxf/tools/common/model/JavaType.java | 1 +
.../cxf/tools/common/toolspec/ToolContext.java | 6 +-
.../cxf/tools/common/model/JAnnotationTest.java | 1 +
.../common/toolspec/AbstractToolContainerTest.java | 1 +
.../tools/common/toolspec/ToolExceptionTest.java | 1 +
.../cxf/tools/common/toolspec/ToolSpecTest.java | 1 +
.../cxf/tools/common/toolspec/ToolSupportTest.java | 1 +
.../toolspec/parser/CommandLineParserTest.java | 1 +
.../org/apache/cxf/tools/util/StAXUtilTest.java | 1 +
.../apache/cxf/tools/util/URIParserUtilTest.java | 1 +
.../java/org/apache/cxf/tools/corba/IDLToWSDL.java | 1 -
.../apache/cxf/tools/corba/common/WSDLUtils.java | 2 -
.../processors/idl/ConstrTypeSpecVisitor.java | 2 +
.../corba/processors/idl/ParamTypeSpecVisitor.java | 2 +
.../processors/idl/SimpleTypeSpecVisitor.java | 2 +
.../processors/idl/TemplateTypeSpecVisitor.java | 2 +
.../org/apache/cxf/tools/corba/IDLToWSDLTest.java | 44 ++-
.../org/apache/cxf/tools/corba/WSDLToIDLTest.java | 48 ++-
.../tools/corba/common/CorbaPrimitiveMapTest.java | 16 +-
.../cxf/tools/corba/common/ToolTestBase.java | 19 +-
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 13 +-
.../corba/processors/WSDLToCorbaBindingTest.java | 1 +
.../processors/WSDLToCorbaBindingTypeTest.java | 1 +
.../corba/processors/WSDLToIDLGenerationTest.java | 1 +
.../tools/corba/utils/TestWSDLCorbaWriterImpl.java | 1 -
.../generator/wsdl11/FaultBeanGenerator.java | 1 +
.../internal/SpringServiceBuilderFactory.java | 1 -
.../org/apache/cxf/tools/fortest/ImageSender.java | 1 +
.../fortest/cxf523/Operation0ResponseType.java | 1 +
.../apache/cxf/tools/fortest/cxf774/ListTest.java | 1 -
.../cxf/tools/fortest/cxf774/ListTestImpl.java | 6 +-
.../cxf/tools/fortest/date/EchoCalendar.java | 1 +
.../apache/cxf/tools/fortest/date/EchoDate.java | 1 +
.../java2js/processor/JavaToJSProcessorTest.java | 1 +
.../org/apache/cxf/tools/java2ws/AegisTest.java | 7 +-
.../cxf/tools/java2wsdl/JavaToWSFlagTest.java | 1 +
.../wsdl11/DateTypeCustomGeneratorTest.java | 1 +
.../generator/wsdl11/FaultBeanGeneratorTest.java | 1 +
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 1 +
.../wsdl11/annotator/WrapperBeanAnnotatorTest.java | 2 +
.../annotator/WrapperBeanFieldAnnotatorTest.java | 1 +
.../java2wsdl/processor/FrontendFactoryTest.java | 1 +
.../internal/ServiceBuilderFactoryTest.java | 1 +
.../processor/internal/jaxws/FaultBeanTest.java | 1 +
.../jaxws/JaxwsServiceBuilderNoAnnoTest.java | 1 +
.../internal/jaxws/JaxwsServiceBuilderTest.java | 1 +
.../internal/jaxws/RequestWrapperTest.java | 1 +
.../internal/jaxws/ResponseWrapperTest.java | 1 +
.../processor/internal/jaxws/WrapperTest.java | 2 +
.../test/java/org/apache/xmladapter/Greeter.java | 1 -
.../cxf/tools/validator/internal/Stax2DOM.java | 1 +
.../tools/validator/internal/ValidationResult.java | 1 +
.../tools/validator/internal/WSDL11Validator.java | 1 +
.../cxf/tools/validator/internal/model/XNode.java | 1 +
.../cxf/tools/validator/WSDLValidationTest.java | 1 +
.../validator/internal/WSDL11ValidatorTest.java | 1 +
.../cxf/tools/wsdlto/core/FrontEndProfile.java | 1 +
.../cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 1 +
.../tools/wsdlto/core/AbstractGeneratorTest.java | 1 +
.../databinding/jaxb/ClassNameAllocatorImpl.java | 1 +
.../wsdlto/javascript/WSDLToJavaScriptTest.java | 1 +
.../jaxws/customization/CustomNodeSelector.java | 1 +
.../jaxws/customization/CustomizationParser.java | 1 +
.../customization/JAXWSBindingDeserializer.java | 7 +-
.../jaxws/processor/WSDLToJavaProcessor.java | 1 +
.../jaxws/validator/UniqueBodyValidator.java | 1 +
.../WrapperStyleNameCollisionValidator.java | 1 +
.../tools/wsdlto/frontend/jaxws/CatalogTest.java | 1 +
.../processor/internal/ParameterProcessorTest.java | 1 +
.../internal/annotator/WebMethodAnnotatorTest.java | 1 +
.../internal/annotator/WebParamAnnotatorTest.java | 1 +
.../annotator/XmlSeeAlsoAnnotatorTest.java | 1 +
.../internal/mapper/InterfaceMapperTest.java | 1 +
.../internal/mapper/MethodMapperTest.java | 1 +
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 +
.../cxf/tools/misc/processor/address/Address.java | 1 +
.../misc/processor/WSDLToServiceProcessorTest.java | 1 +
.../misc/processor/WSDLToXMLProcessorTest.java | 1 +
.../misc/processor/XSDToWSDLProcessorTest.java | 1 +
.../cxf/tools/wsdlto/AbstractCodeGenTest.java | 1 +
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 1 +
.../tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java | 1 +
.../apache/cxf/tools/wsdlto/jaxws/CatalogTest.java | 1 +
.../cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java | 1 +
.../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 1 +
.../cxf/tools/wsdlto/validator/ValidatorTest.java | 1 +
1033 files changed, 2088 insertions(+), 1293 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf] 03/04: Update things to NOT use the old junit3 based
frameworks
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 172164ab6427ad9c4cd3a933ff4c4ef74194b3c6
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Jan 4 14:18:18 2018 -0500
Update things to NOT use the old junit3 based frameworks
(cherry picked from commit 4142d44c4db7c9971829d15a4aa4b7056788e9e6)
# Conflicts:
# testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
# tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
# tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
# tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
# tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
---
.../soap/interceptor/SoapFaultSerializerTest.java | 6 +--
.../main/java/org/apache/cxf/test/XPathAssert.java | 29 +++++++------
.../java/org/apache/cxf/test/XPathAssertTest.java | 17 +++++---
.../org/apache/cxf/tools/corba/IDLToWSDLTest.java | 44 ++++++++++++++++----
.../org/apache/cxf/tools/corba/WSDLToIDLTest.java | 48 +++++++++++++++-------
.../tools/corba/common/CorbaPrimitiveMapTest.java | 16 ++++----
.../cxf/tools/corba/common/ToolTestBase.java | 19 +++++----
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 13 ++++--
.../org/apache/cxf/tools/java2ws/AegisTest.java | 7 ++--
9 files changed, 129 insertions(+), 70 deletions(-)
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 6d8ab71..2ed03c8 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -35,8 +35,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import junit.framework.AssertionFailedError;
-
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapFault;
@@ -68,8 +66,8 @@ public class SoapFaultSerializerTest extends Assert {
namespaces.put("xml", "http://www.w3.org/XML/1998/namespace");
XPathUtils xpu = new XPathUtils(namespaces);
if (!xpu.isExist(xpathExpression, doc, XPathConstants.NODE)) {
- throw new AssertionFailedError("Failed to select any nodes for expression:\n" + xpathExpression
- + " from document:\n" + StaxUtils.toString(doc));
+ fail("Failed to select any nodes for expression:\n" + xpathExpression
+ + " from document:\n" + StaxUtils.toString(doc));
}
}
diff --git a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
index f9993e6..5431888 100644
--- a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
+++ b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
@@ -32,7 +32,6 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import junit.framework.AssertionFailedError;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
@@ -59,8 +58,8 @@ public final class XPathAssert {
NodeList nodes = (NodeList)createXPath(namespaces).evaluate(xpath, node, XPathConstants.NODESET);
if (nodes.getLength() == 0) {
- throw new AssertionFailedError("Failed to select any nodes for expression:\n" + xpath
- + " from document:\n" + writeNodeToString(node));
+ Assert.fail("Failed to select any nodes for expression:\n" + xpath
+ + " from document:\n" + writeNodeToString(node));
}
return nodes;
@@ -79,14 +78,14 @@ public final class XPathAssert {
Boolean b = (Boolean)createXPath(namespaces).evaluate(xpath, node, XPathConstants.BOOLEAN);
if (b == null) {
- throw new AssertionFailedError("Failed to select any nodes for expression:\n" + xpath
- + " from document:\n" + writeNodeToString(node));
+ Assert.fail("Failed to select any nodes for expression:\n" + xpath
+ + " from document:\n" + writeNodeToString(node));
}
if (!b.booleanValue()) {
- throw new AssertionFailedError("Boolean XPath assertion evaluated to false:\n"
- + xpath
- + " from document:\n" + writeNodeToString(node));
+ Assert.fail("Boolean XPath assertion evaluated to false:\n"
+ + xpath
+ + " from document:\n" + writeNodeToString(node));
}
}
@@ -110,7 +109,7 @@ public final class XPathAssert {
if (nodes.getLength() > 0) {
String value = writeNodeToString(node);
- throw new AssertionFailedError("Found multiple nodes for expression:\n" + xpath + "\n" + value);
+ Assert.fail("Found multiple nodes for expression:\n" + xpath + "\n" + value);
}
return nodes;
@@ -144,9 +143,9 @@ public final class XPathAssert {
return;
}
}
- throw new AssertionFailedError("No nodes were found for expression: "
- + xpath
- + " in document "
+ Assert.fail("No nodes were found for expression: "
+ + xpath
+ + " in document "
+ writeNodeToString(node));
}
@@ -180,9 +179,9 @@ public final class XPathAssert {
return;
}
}
- throw new AssertionFailedError("No nodes were found for expression: "
- + xpath
- + " in document "
+ Assert.fail("No nodes were found for expression: "
+ + xpath
+ + " in document "
+ writeNodeToString(node));
}
diff --git a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
index 3b61051..4e943f9 100644
--- a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
+++ b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
@@ -24,8 +24,6 @@ import java.util.Map;
import org.w3c.dom.Document;
-import junit.framework.AssertionFailedError;
-
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
@@ -40,19 +38,26 @@ public class XPathAssertTest extends Assert {
XPathAssert.assertValid("//a", document, null);
XPathAssert.assertInvalid("//aasd", document, null);
+ boolean f = false;
try {
XPathAssert.assertInvalid("//a", document, null);
- fail("Expression is valid!");
- } catch (AssertionFailedError e) {
+ f = true;
+ } catch (AssertionError e) {
// this is correct
}
+ if (f) {
+ fail("Expression is valid!");
+ }
try {
XPathAssert.assertValid("//aa", document, null);
- fail("Expression is invalid!");
- } catch (AssertionFailedError e) {
+ f = true;
+ } catch (AssertionError e) {
// this is correct
}
+ if (f) {
+ fail("Expression is valid!");
+ }
XPathAssert.assertXPathEquals("//b", "foo", document, null);
}
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
index b3c72cc..7cb9cd0 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
@@ -46,6 +46,10 @@ import org.apache.cxf.tools.corba.common.ToolTestBase;
import org.apache.cxf.tools.corba.utils.TestUtils;
import org.apache.cxf.tools.corba.utils.WSDLGenerationTester;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
public class IDLToWSDLTest extends ToolTestBase {
private static StringBuffer usageBuf;
@@ -59,7 +63,8 @@ public class IDLToWSDLTest extends ToolTestBase {
public IDLToWSDLTest() {
wsdlGenTester = new WSDLGenerationTester();
}
-
+
+ @Before
public void setUp() {
super.setUp();
try {
@@ -87,6 +92,7 @@ public class IDLToWSDLTest extends ToolTestBase {
FileUtils.removeDir(dir);
}
+ @After
public void tearDown() {
try {
deleteDir(output);
@@ -129,8 +135,9 @@ public class IDLToWSDLTest extends ToolTestBase {
}
origReader.close();
genReader.close();
- }
-
+ }
+
+ @Test
public void testNoArgs() throws Exception {
String[] cmdArgs = {};
int exc = execute(cmdArgs);
@@ -140,7 +147,8 @@ public class IDLToWSDLTest extends ToolTestBase {
strBuf.append(usageBuf.toString());
checkStrings(strBuf.toString().getBytes(), bout.toByteArray());
}
-
+
+ @Test
public void testDetailOutput() throws Exception {
String[] args = new String[] {"-?"};
int exc = execute(args);
@@ -148,6 +156,7 @@ public class IDLToWSDLTest extends ToolTestBase {
assertNotNull(bout.toByteArray());
}
+ @Test
public void testVersionOutput() throws Exception {
String[] args = new String[] {"-v"};
int exc = execute(args);
@@ -155,17 +164,20 @@ public class IDLToWSDLTest extends ToolTestBase {
assertNotNull(bout.toByteArray());
}
+ @Test
public void testHelpOutput() throws Exception {
String[] args = new String[] {"-help"};
int exc = execute(args);
assertEquals("IDLToWSDL Failed", noError, exc);
assertNotNull(bout.toByteArray());
}
-
+
+ @Test
public void testBase64SequenceOctetMappingOption() throws Exception {
doTestSequenceOctetMappingOption(ToolCorbaConstants.CFG_SEQUENCE_OCTET_TYPE_BASE64BINARY);
}
+ @Test
public void testHexBinarySequenceOctetMappingOption() throws Exception {
doTestSequenceOctetMappingOption(ToolCorbaConstants.CFG_SEQUENCE_OCTET_TYPE_HEXBINARY);
}
@@ -203,8 +215,9 @@ public class IDLToWSDLTest extends ToolTestBase {
wsdlGenTester.compare(expectedStream, actualStream);
}
}
-
- // test "-x <schema-namespace>"
+
+ // test "-x <schema-namespace>"
+ @Test
public void testSchemaNamespace() throws Exception {
File input = new File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "HelloWorld.wsdl");
@@ -221,6 +234,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
// test "-f <corba-address-file>"
+ @Test
public void testCorbaAddressFile() throws Exception {
File input = new File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "HelloWorld.wsdl");
@@ -252,6 +266,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
// test "-t <corba-type-map target-namespace>"
+ @Test
public void testCorbaTypeMapTargetNamespace() throws Exception {
File input = new File(getClass().getResource("/idl/sequence_octet.idl").toURI());
File actual = new File(output, "sequence_octet.wsdl");
@@ -268,6 +283,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
// test "-b Treat bounded strings as unbounded."
+ @Test
public void testTreatBoundedStringsAsUnbounded() throws Exception {
File input = new File(getClass().getResource("/idl/String.idl").toURI());
File actual = new File(output, "String.wsdl");
@@ -283,6 +299,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
// test "-b Treat bounded strings as unbounded."
+ @Test
public void testTreatBoundedAnonStringsAsUnbounded() throws Exception {
File input = new File(getClass().getResource("/idl/Anonstring.idl").toURI());
File actual = new File(output, "Anonstring.wsdl");
@@ -297,6 +314,7 @@ public class IDLToWSDLTest extends ToolTestBase {
doTestGeneratedWsdl(expected, actual);
}
+ @Test
public void testExceptionsWithSchemasInDifferentNS() throws Exception {
File input = new File(getClass().getResource("/idl/Exception.idl").toURI());
File actual = new File(output, "Exception.wsdl");
@@ -311,6 +329,7 @@ public class IDLToWSDLTest extends ToolTestBase {
doTestGeneratedWsdl(expected, actual);
}
+ @Test
public void testOutputWSDLFileName() throws Exception {
File input = new File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "ArtixHelloWorld.wsdl");
@@ -325,7 +344,8 @@ public class IDLToWSDLTest extends ToolTestBase {
assertEquals("IDLToWSDL Failed", noError, exc);
doTestGeneratedWsdl(expected, actual);
}
-
+
+ @Test
public void testMultipleIncludes() throws Exception {
File input = new File(getClass().getResource("/idl/Parent.idl").toURI());
File actual = new File(output, "Parent.wsdl");
@@ -346,7 +366,8 @@ public class IDLToWSDLTest extends ToolTestBase {
assertEquals("IDLToWSDL Failed", noError, exc);
doTestGeneratedWsdl(expected, actual);
}
-
+
+ @Test
public void testExternalInterfaceRef() throws Exception {
File input = new File(getClass().getResource("/idl/ExternalInterfaceRef.idl").toURI());
File actual = new File(output, "ExternalInterfaceRef.wsdl");
@@ -367,6 +388,7 @@ public class IDLToWSDLTest extends ToolTestBase {
doTestGeneratedWsdl(expected, actual);
}
+ @Test
public void testDuplicateTypeGeneration() throws Exception {
File input = new File(getClass().getResource("/idl/duplicateAttribute.idl").toURI());
File expected =
@@ -384,6 +406,7 @@ public class IDLToWSDLTest extends ToolTestBase {
doTestGeneratedWsdl(expected, actual);
}
+ @Test
public void testUndefinedTypeRef() throws Exception {
File input = new File(getClass().getResource("/idl/ReferUndefinedType.idl").toURI());
File include1Dir = new File(getClass().getResource("/idl").toURI());
@@ -402,6 +425,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
}
+ @Test
public void testCXF4541() throws Exception {
File input = new File(getClass().getResource("/idl/missing_struct_member.idl").toURI());
String[] args = new String[] {
@@ -423,6 +447,7 @@ public class IDLToWSDLTest extends ToolTestBase {
}
fail("Did not find foo element");
}
+ @Test
public void testCXF3329() throws Exception {
File input = new File(getClass().getResource("/idl/CXF3329.idl").toURI());
String[] args = new String[] {
@@ -437,6 +462,7 @@ public class IDLToWSDLTest extends ToolTestBase {
assertTrue(s.contains("name=\"myStruct\""));
}
+ @Test
public void testCXF5340() throws Exception {
File input = new File(getClass().getResource("/idl/CXF5340.idl").toURI());
String[] args = new String[] {
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
index 03eb599..989c4cb 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
@@ -39,6 +39,10 @@ import org.apache.cxf.tools.corba.common.ToolTestBase;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToProcessor;
import org.apache.cxf.tools.corba.utils.TestUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
public class WSDLToIDLTest extends ToolTestBase {
private static String usage;
@@ -48,6 +52,7 @@ public class WSDLToIDLTest extends ToolTestBase {
PrintStream newOut;
private File output;
+ @Before
public void setUp() {
super.setUp();
try {
@@ -75,6 +80,7 @@ public class WSDLToIDLTest extends ToolTestBase {
FileUtils.removeDir(dir);
}
+ @After
public void tearDown() {
try {
deleteDir(output);
@@ -118,6 +124,7 @@ public class WSDLToIDLTest extends ToolTestBase {
genReader.close();
}
+ @Test
public void testBindingGenDefault() throws Exception {
String[] cmdArgs = {"-corba", "-i", "BasePortType",
"-d", output.getCanonicalPath(),
@@ -139,7 +146,8 @@ public class WSDLToIDLTest extends ToolTestBase {
fail("WSDLToCORBA generated an invalid simpleList-corba.wsdl");
}
}
-
+
+ @Test
public void testBindingGenSpecifiedFile() throws Exception {
String[] cmdArgs = {"-corba", "-i", "BasePortType",
@@ -162,10 +170,11 @@ public class WSDLToIDLTest extends ToolTestBase {
} catch (Exception e) {
fail("WSDLToIDL generated an invalid simpleList-corba.wsdl");
}
- }
-
-
- public void testIDLGenDefault() throws Exception {
+ }
+
+
+ @Test
+ public void testIDLGenDefault() throws Exception {
String[] cmdArgs = {"-idl", "-b", "BaseCORBABinding",
"-d", output.getCanonicalPath(),
getClass().getResource("/wsdl/simple-binding.wsdl").toString()};
@@ -177,8 +186,9 @@ public class WSDLToIDLTest extends ToolTestBase {
String line = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
assertTrue("Invalid Idl File Generated", line.length() > 0);
- }
-
+ }
+
+ @Test
public void testIDLGenSpecifiedFile() throws Exception {
String[] cmdArgs = {"-idl", "-b", "BaseCORBABinding",
"-o", "simple-binding_gen.idl",
@@ -196,7 +206,8 @@ public class WSDLToIDLTest extends ToolTestBase {
// tests generating corba and idl in default wsdl and idl files
// pass the temp directory to create the wsdl files.
- public void testBindAndIDLGen() throws Exception {
+ @Test
+ public void testBindAndIDLGen() throws Exception {
String[] cmdArgs = {"-i", "BasePortType",
"-b", "BaseOneCORBABinding",
"-d", output.getCanonicalPath(),
@@ -223,7 +234,8 @@ public class WSDLToIDLTest extends ToolTestBase {
String line = new String(Files.readAllBytes(path2), StandardCharsets.UTF_8);
assertTrue("Invalid Idl File Generated", line.length() > 0);
}
-
+
+ @Test
public void testNoArgs() throws Exception {
String[] cmdArgs = {};
int exc = execute(cmdArgs);
@@ -233,7 +245,8 @@ public class WSDLToIDLTest extends ToolTestBase {
strBuf.append(usage);
checkStrings(strBuf.toString().getBytes(), bout.toByteArray());
}
-
+
+ @Test
public void testMissingRequiredFlags() throws Exception {
String[] cmdArgs = {"-i", " interfaceName"};
int exc = execute(cmdArgs);
@@ -242,8 +255,9 @@ public class WSDLToIDLTest extends ToolTestBase {
expected.append("Missing argument: wsdlurl\n\n");
expected.append(usage);
checkStrings(expected.toString().getBytes(), bout.toByteArray());
- }
+ }
+ @Test
public void testBindingGenInvalidInterface() throws Exception {
String[] cmdArgs = {"-corba", "-i", "TestInterface",
@@ -254,6 +268,7 @@ public class WSDLToIDLTest extends ToolTestBase {
checkStrings(expected.getBytes(), bout.toByteArray());
}
+ @Test
public void testBindingGenDuplicate() throws Exception {
String[] cmdArgs = {"-i", "BasePortType",
@@ -265,7 +280,7 @@ public class WSDLToIDLTest extends ToolTestBase {
checkStrings(expected.getBytes(), bout.toByteArray());
}
-
+ @Test
public void testIdlGenMissingBinding() throws Exception {
String[] cmdArgs = {"-d", output.getAbsolutePath(),
"-idl",
@@ -275,7 +290,8 @@ public class WSDLToIDLTest extends ToolTestBase {
String expected = "Error : Binding Name required for generating IDL";
checkStrings(expected.getBytes(), bout.toByteArray());
}
-
+
+ @Test
public void testIdlGenInvalidBinding() throws Exception {
String[] cmdArgs = {"-d", output.getAbsolutePath(),
"-idl", "-b", "TestBinding",
@@ -285,7 +301,8 @@ public class WSDLToIDLTest extends ToolTestBase {
String expected = "Error : Binding TestBinding doesn't exist in WSDL.";
checkStrings(expected.getBytes(), bout.toByteArray());
}
-
+
+ @Test
public void testMissingBindingName() throws Exception {
String[] cmdArgs = {"-d", output.getAbsolutePath(),
"-i", "BasePortType",
@@ -295,18 +312,21 @@ public class WSDLToIDLTest extends ToolTestBase {
noError, execute(cmdArgs));
}
+ @Test
public void testDetailOutput() throws Exception {
String[] args = new String[] {"-?"};
WSDLToIDL.main(args);
assertNotNull(getStdOut());
}
+ @Test
public void testVersionOutput() throws Exception {
String[] args = new String[] {"-v"};
WSDLToIDL.main(args);
assertNotNull(getStdOut());
}
+ @Test
public void testHelpOutput() throws Exception {
String[] args = new String[] {"-help"};
WSDLToIDL.main(args);
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
index bf278cb..09d5648 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
@@ -23,12 +23,14 @@ import java.util.*;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
-
import org.apache.cxf.binding.corba.wsdl.CorbaType;
-public class CorbaPrimitiveMapTest extends TestCase {
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CorbaPrimitiveMapTest {
+ @Test
public void testMap() {
Map<QName, CorbaType> map = new HashMap<QName, CorbaType>();
@@ -42,10 +44,10 @@ public class CorbaPrimitiveMapTest extends TestCase {
map.put(typeName, corbaTypeImpl);
Object value = map.get(typeName);
- assertEquals(corbaTypeImpl.getName(), corbaName.getLocalPart());
- assertEquals(corbaTypeImpl.getQName(), corbaName);
- assertEquals(corbaTypeImpl.getType(), typeName);
- assertEquals(corbaTypeImpl, value);
+ Assert.assertEquals(corbaTypeImpl.getName(), corbaName.getLocalPart());
+ Assert.assertEquals(corbaTypeImpl.getQName(), corbaName);
+ Assert.assertEquals(corbaTypeImpl.getType(), typeName);
+ Assert.assertEquals(corbaTypeImpl, value);
}
}
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
index fa187e6..6447f27 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java
@@ -23,9 +23,11 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.net.URL;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
-public abstract class ToolTestBase extends TestCase {
+public abstract class ToolTestBase extends Assert {
protected PrintStream oldStdErr;
protected PrintStream oldStdOut;
@@ -35,9 +37,10 @@ public abstract class ToolTestBase extends TestCase {
protected ByteArrayOutputStream errOut = new ByteArrayOutputStream();
protected ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
- public void setUp() {
-
- oldStdErr = System.err;
+
+ @Before
+ public void setUp() {
+ oldStdErr = System.err;
oldStdOut = System.out;
System.setErr(new PrintStream(errOut));
@@ -46,9 +49,9 @@ public abstract class ToolTestBase extends TestCase {
wsdlLocation = ToolTestBase.class.getResource("/wsdl/hello_world.wsdl");
idlLocation = ToolTestBase.class.getResource("/idl/HelloWorld.idl");
}
-
- public void tearDown() {
-
+
+ @After
+ public void tearDown() {
System.setErr(oldStdErr);
System.setOut(oldStdOut);
}
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
index 109f0ef..763ac58 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
@@ -29,9 +29,10 @@ import java.net.URL;
import java.util.HashMap;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
-public class IdlPreprocessorReaderTest extends TestCase {
+public class IdlPreprocessorReaderTest extends Assert {
private URL findTestResource(String spec) {
String location = "/idlpreprocessor/" + spec;
@@ -48,6 +49,7 @@ public class IdlPreprocessorReaderTest extends TestCase {
}
}
+ @Test
public void testResolvedInA() throws Exception {
final String location = "A.idl";
final IdlPreprocessorReader includeReader = createPreprocessorReader(location);
@@ -55,6 +57,7 @@ public class IdlPreprocessorReaderTest extends TestCase {
assertExpectedPreprocessingResult(expectedResultLocation, includeReader);
}
+ @Test
public void testMultiFileResolve() throws Exception {
final String location = "B.idl";
final IdlPreprocessorReader includeReader = createPreprocessorReader(location);
@@ -62,6 +65,7 @@ public class IdlPreprocessorReaderTest extends TestCase {
assertExpectedPreprocessingResult(expectedResultLocation, includeReader);
}
+ @Test
public void testIfElseHandling() throws Exception {
final String location = "C.idl";
final IdlPreprocessorReader includeReader = createPreprocessorReader(location);
@@ -69,6 +73,7 @@ public class IdlPreprocessorReaderTest extends TestCase {
assertExpectedPreprocessingResult(expectedResultLocation, includeReader);
}
+ @Test
public void testMaximumIncludeDepthIsDetected() throws IOException {
final String location = "MaximumIncludeDepthExceeded.idl";
try {
@@ -81,6 +86,7 @@ public class IdlPreprocessorReaderTest extends TestCase {
}
}
+ @Test
public void testUnresolvableInclude() throws IOException {
final String location = "UnresolvableInclude.idl";
try {
@@ -93,7 +99,8 @@ public class IdlPreprocessorReaderTest extends TestCase {
assertTrue(ex.getUrl().getPath().endsWith("/UnresolvableInclude.idl"));
}
}
-
+
+ @Test
public void testDefaultIncludeResolver() throws Exception {
final String location = "B.idl";
// uses <> notation for include
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
index 719b01c..071e595 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
@@ -31,14 +31,13 @@ import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Document;
-import junit.framework.AssertionFailedError;
-
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ToolTestBase;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -140,8 +139,8 @@ public class AegisTest extends ToolTestBase {
private void assertValid(String xpathExpression, Document doc) throws XMLStreamException {
XPathUtils xpu = new XPathUtils(getNSMap());
if (!xpu.isExist(xpathExpression, doc, XPathConstants.NODE)) {
- throw new AssertionFailedError("Failed to select any nodes for expression:\n" + xpathExpression
- + " from document:\n" + StaxUtils.toString(doc));
+ Assert.fail("Failed to select any nodes for expression:\n" + xpathExpression
+ + " from document:\n" + StaxUtils.toString(doc));
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 04/04: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ddd76ffa3a4327b370cceed8bf6040c283989238
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Jan 4 16:06:58 2018 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c803d71..807ddf7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -775,6 +775,7 @@ M 3d85f3179ffae6eadd5174ace6df015494d995bc
M 3e30d8892a723adcf04268efd7d407e164607065
M 3fc5e29018ca32c14f82ced1f07678c4bf35bfea
M 408fe3384925122c4e68b7d020de5ff9d1376096
+M 4142d44c4db7c9971829d15a4aa4b7056788e9e6
M 417fb946eec38f403d915e90f405594675a7f7e0
M 428f7700de80d4d6ea09158f42d057e9f24abe48
M 42efe37cda66bf3d4b11495452261ff3f624c8b1
@@ -859,6 +860,7 @@ M 796eff3ccdb50687873f24b67659526bb13605d7
M 79939ff189c0872317594690be2d85ae05958fa8
M 7aa8ebf5450c0a399e86fe5d50865fcd22849f63
M 7ace8c84cff4696e365800fbba12cc789e97971f
+M 7b44ad9a1f63e729622cdc0378eda4c268eefa44
M 7c2fef57b7d59448308e2cebe5b77a2f561b5bd7
M 7c3a8b02a62db3bcc5c3a1895e9f30bc4fa3821a
M 7dbb31aed4bfa28bd170d6170d76ba4d7f43e7de
@@ -951,6 +953,7 @@ M a876d164c96acc9d08855e9fc6c5fd4ed281845f
M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
M a93f0d9ad891865cc635a961cb890c2031177e5b
M a9fe8470ce9522f08c298e58f76636c48d57b7a4
+M aa444e536669b8de9389a69c46e4eced747057df
M ab123c0826a168842ae6e451058551b65d470e6f
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 01/04: Start adjusting import orders to match what checkstyle
8.x requires. :(
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 23d43fd15eaa28dd55cf6b426cd03b23ae4c236f
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jan 3 17:40:44 2018 -0500
Start adjusting import orders to match what checkstyle 8.x requires. :(
(cherry picked from commit 7b44ad9a1f63e729622cdc0378eda4c268eefa44)
# Conflicts:
# core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
# core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
# core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
---
.../bus/managers/ConduitInitiatorManagerImpl.java | 1 -
.../BusApplicationContextResourceResolver.java | 1 -
.../cxf/bus/spring/BusExtensionPostProcessor.java | 1 -
.../cxf/common/injection/ResourceInjector.java | 1 +
.../common/util/ReflectionInvokationHandler.java | 1 -
.../jsse/MultiKeyPasswordKeyManager.java | 1 +
.../apache/cxf/helpers/MapNamespaceContext.java | 1 +
.../cxf/interceptor/ClientFaultConverter.java | 1 +
.../cxf/interceptor/LoggingOutInterceptor.java | 1 +
.../apache/cxf/resource/ClassLoaderResolver.java | 1 -
.../cxf/security/transport/TLSSessionInfo.java | 1 +
.../apache/cxf/staxutils/W3CDOMStreamReader.java | 1 -
.../org/apache/cxf/staxutils/WoodstoxHelper.java | 1 +
.../transport/AbstractMultiplexDestination.java | 1 +
.../java/org/apache/cxf/ws/addressing/Names.java | 1 +
.../cxf/ws/addressing/VersionTransformer.java | 5 -
.../cxf/attachment/AttachmentSerializerTest.java | 1 +
.../java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +-
.../cxf/bus/extension/ExtensionManagerTest.java | 1 +
.../managers/EndpointResolverRegistryImplTest.java | 2 +-
.../ServiceContractResolverRegistryImplTest.java | 1 +
.../apache/cxf/bus/osgi/OSGiBusListenerTest.java | 423 +++++++++++----------
.../cxf/bus/spring/BusApplicationListenerTest.java | 3 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 4 +-
.../cxf/bus/spring/SpringBusFactoryTest.java | 1 +
.../buslifecycle/CXFBusLifeCycleManagerTest.java | 1 +
.../common/annotation/AnnotatedGreeterImpl.java | 1 +
.../common/annotation/AnnotationProcessorTest.java | 2 +
.../org/apache/cxf/common/i18n/MessageTest.java | 1 +
.../cxf/common/injection/ResourceInjectorTest.java | 2 -
.../apache/cxf/common/util/PackageUtilsTest.java | 1 +
.../configuration/spring/ConfigurerImplTest.java | 2 -
.../SuspendedInvocationExceptionTest.java | 1 +
.../feature/transform/XSLTInterceptorsTest.java | 303 +++++++--------
.../org/apache/cxf/helpers/ServiceUtilsTest.java | 1 +
.../cxf/interceptor/LoggingInInterceptorTest.java | 1 -
.../cxf/interceptor/LoggingOutInterceptorTest.java | 2 +-
.../interceptor/OutgoingChainInterceptorTest.java | 1 +
.../interceptor/ServiceInvokerInterceptorTest.java | 1 +
.../security/JAASLoginInterceptorTest.java | 1 +
.../OperationInfoAuthorizingInterceptorTest.java | 2 +-
.../security/SecureAnnotationsInterceptorTest.java | 2 +-
.../security/SimpleAuthorizingInterceptorTest.java | 2 +-
.../org/apache/cxf/io/CachedStreamTestBase.java | 1 +
.../cxf/phase/PhaseInterceptorChainTest.java | 2 +-
.../org/apache/cxf/resource/URIResolverTest.java | 1 +
.../PropertiesExpandingStreamReaderTest.java | 1 +
.../validation/Stax2ValidationUtilsTest.java | 2 +
.../cxf/transport/ChainInitiationObserverTest.java | 1 +
.../common/gzip/GZIPAcceptEncodingTest.java | 2 +-
.../apache/cxf/ws/addressing/ContextUtilsTest.java | 1 +
.../corba/maven/plugins/IDLToWSDLPlugin.java | 1 -
52 files changed, 409 insertions(+), 388 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index 073d4bf..e035338 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -20,7 +20,6 @@
package org.apache.cxf.bus.managers;
import java.util.Map;
-
import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 434a851..53a7967 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.resource.ResourceResolver;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
index 3c6369d..2905842 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.extension.BusExtension;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index c83b32b..9ec5864 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -30,6 +30,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
index ed2c396..fa2fb29 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.lang.reflect.Proxy;
import java.util.Iterator;
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
index c6dcbc9..f507ffe 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
@@ -26,6 +26,7 @@ import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
+
import javax.net.ssl.X509KeyManager;
public class MultiKeyPasswordKeyManager implements X509KeyManager {
diff --git a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
index 6e1c92d..49cdb59 100644
--- a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
@@ -21,6 +21,7 @@ package org.apache.cxf.helpers;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
index a5edceb..628b073 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
@@ -39,6 +39,7 @@ import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.common.util.StringUtils;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
index 438076a..bcab20a 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -27,6 +27,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CacheAndWriteOutputStream;
diff --git a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
index 7f03fe6..ae6a215 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
@@ -20,7 +20,6 @@
package org.apache.cxf.resource;
import java.io.InputStream;
-
import java.net.URL;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
index 34918c7..d289a99 100644
--- a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
+++ b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
@@ -20,6 +20,7 @@
package org.apache.cxf.security.transport;
import java.security.cert.Certificate;
+
import javax.net.ssl.SSLSession;
/**
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index 0836379..64f006f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -26,7 +26,6 @@ import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Attr;
-
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
diff --git a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
index 8b901bc..9d711d0 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
@@ -25,6 +25,7 @@ import javax.xml.stream.XMLStreamReader;
import com.ctc.wstx.stax.WstxEventFactory;
import com.ctc.wstx.stax.WstxInputFactory;
+
import org.codehaus.stax2.XMLStreamReader2;
/**
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
index ecc690b..7488b3a 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
@@ -29,6 +29,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
+
import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
public abstract class AbstractMultiplexDestination extends AbstractDestination implements
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
index 51d2c80..c3da5d1 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
@@ -23,6 +23,7 @@ package org.apache.cxf.ws.addressing;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import javax.xml.namespace.QName;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index 345fcac..49615fc 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -31,14 +31,9 @@ import javax.xml.namespace.QName;
//import javax.xml.ws.EndpointReference;
//import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-
import org.w3c.dom.Element;
import org.apache.cxf.common.jaxb.JAXBUtils;
-// importation convention: if the same class name is used for
-// 2005/08 and 2004/08, then the former version is imported
-// and the latter is fully qualified when used
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.v200408.AttributedQName;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 661b69f..b707a51 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 1c93eb2..ee6edc7 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index 057200d..1e9e547 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.resource.DefaultResourceManager;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index 25c6163..d7a2812 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -23,9 +23,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.EndpointResolver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index 836ec65..5ef0a9a 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -25,6 +25,7 @@ import java.net.URISyntaxException;
import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.ServiceContractResolver;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index 9f901d6..e99359d 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -1,210 +1,213 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.bus.osgi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.buslifecycle.BusLifeCycleManager;
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.endpoint.ClientLifeCycleListener;
-import org.apache.cxf.endpoint.ClientLifeCycleManager;
-import org.apache.cxf.endpoint.ServerLifeCycleListener;
-import org.apache.cxf.endpoint.ServerLifeCycleManager;
-import org.apache.cxf.feature.Feature;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- *
- */
-public class OSGiBusListenerTest extends Assert {
- private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
- private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
- private static final String RESTRICTED = "me\\.my\\.app\\..*";
- private static final String BUNDLE_NAME = "me.my.app";
-
- private IMocksControl control;
- private Bus bus;
- private BundleContext bundleContext;
- private Bundle bundle;
-
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- bus = control.createMock(Bus.class);
- BusLifeCycleManager blcManager = control.createMock(BusLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(BusLifeCycleManager.class)).andReturn(blcManager).anyTimes();
-
- blcManager.registerLifeCycleListener(EasyMock.isA(OSGIBusListener.class));
- EasyMock.expectLastCall();
- bundleContext = control.createMock(BundleContext.class);
-
- BundleContext app = control.createMock(BundleContext.class);
- EasyMock.expect(bus.getExtension(BundleContext.class)).andReturn(app).anyTimes();
- bundle = control.createMock(Bundle.class);
- EasyMock.expect(app.getBundle()).andReturn(bundle).anyTimes();
- EasyMock.expect(bundle.getSymbolicName()).andReturn(BUNDLE_NAME).anyTimes();
- }
-
- @Test
- public void testRegistratioWithNoServices() throws Exception {
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServices() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
- Collection<Feature> lst = new ArrayList<Feature>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
-
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null), lst.size());
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServicesExcludes() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
- Collection<Feature> lst = new ArrayList<Feature>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
- EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES), lst.size());
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServicesExcludesAndRestricted() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
- Collection<Feature> lst = new ArrayList<Feature>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst);
- EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES), lst.size());
-
- control.verify();
- }
-
- private void setUpClientLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(ClientLifeCycleListener.class.getName(), null))
- .andReturn(svcrefs);
- ClientLifeCycleManager lcmanager = control.createMock(ClientLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(ClientLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
- for (int i = 0; i < names.length; i++) {
- ClientLifeCycleListener cl = control.createMock(ClientLifeCycleListener.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
- lcmanager.registerListener(cl);
- EasyMock.expectLastCall();
- }
- }
- }
-
- private void setUpServerLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(ServerLifeCycleListener.class.getName(), null))
- .andReturn(svcrefs);
- ServerLifeCycleManager lcmanager = control.createMock(ServerLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(ServerLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
- for (int i = 0; i < names.length; i++) {
- ServerLifeCycleListener cl = control.createMock(ServerLifeCycleListener.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
- lcmanager.registerListener(cl);
- EasyMock.expectLastCall();
- }
- }
- }
-
- private void setFeatures(String[] names, String[] restricted,
- Collection<Feature> lst) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null))
- .andReturn(svcrefs);
- for (int i = 0; i < names.length; i++) {
- Feature f = control.createMock(Feature.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(f).anyTimes();
- }
- EasyMock.expect(bus.getFeatures()).andReturn(lst).anyTimes();
-
- }
-
- // Creates test service references with the specified symbolic names and the restricted extension properties.
- private ServiceReference[] createTestServiceReferences(String[] names, String[] restricted) {
- ServiceReference[] refs = new ServiceReference[names.length];
- for (int i = 0; i < names.length; i++) {
- refs[i] = createTestServiceReference(names[i], restricted[i]);
- }
- return refs;
- }
-
-
- // Creates a test service reference with the specified symbolic name and the restricted extension property.
- private ServiceReference createTestServiceReference(String name, String rst) {
- ServiceReference ref = control.createMock(ServiceReference.class);
- Bundle b = control.createMock(Bundle.class);
- EasyMock.expect(b.getSymbolicName()).andReturn(name).anyTimes();
- EasyMock.expect(ref.getBundle()).andReturn(b).anyTimes();
- EasyMock.expect(ref.getProperty("org.apache.cxf.bus.restricted.extension")).andReturn(rst).anyTimes();
- return ref;
- }
-
- private static boolean isExcluded(String aname, String sname, String rst, String exc) {
- if (!StringUtils.isEmpty(rst) && !aname.matches(rst)) {
- return true;
- }
- return exc != null && sname.matches(exc);
- }
-
- private static int countServices(String[] names, String[] restricted, String excluded) {
- int c = 0;
- for (int i = 0; i < names.length; i++) {
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excluded)) {
- c++;
- }
- }
- return c;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.osgi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.endpoint.ClientLifeCycleListener;
+import org.apache.cxf.endpoint.ClientLifeCycleManager;
+import org.apache.cxf.endpoint.ServerLifeCycleListener;
+import org.apache.cxf.endpoint.ServerLifeCycleManager;
+import org.apache.cxf.feature.Feature;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+
+/**
+ *
+ */
+public class OSGiBusListenerTest extends Assert {
+ private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
+ private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
+ private static final String RESTRICTED = "me\\.my\\.app\\..*";
+ private static final String BUNDLE_NAME = "me.my.app";
+
+ private IMocksControl control;
+ private Bus bus;
+ private BundleContext bundleContext;
+ private Bundle bundle;
+
+
+ @Before
+ public void setUp() {
+ control = EasyMock.createNiceControl();
+ bus = control.createMock(Bus.class);
+ BusLifeCycleManager blcManager = control.createMock(BusLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(BusLifeCycleManager.class)).andReturn(blcManager).anyTimes();
+
+ blcManager.registerLifeCycleListener(EasyMock.isA(OSGIBusListener.class));
+ EasyMock.expectLastCall();
+ bundleContext = control.createMock(BundleContext.class);
+
+ BundleContext app = control.createMock(BundleContext.class);
+ EasyMock.expect(bus.getExtension(BundleContext.class)).andReturn(app).anyTimes();
+ bundle = control.createMock(Bundle.class);
+ EasyMock.expect(app.getBundle()).andReturn(bundle).anyTimes();
+ EasyMock.expect(bundle.getSymbolicName()).andReturn(BUNDLE_NAME).anyTimes();
+ }
+
+ @Test
+ public void testRegistratioWithNoServices() throws Exception {
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServices() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
+
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null), lst.size());
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServicesExcludes() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
+ EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES), lst.size());
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServicesExcludesAndRestricted() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst);
+ EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES), lst.size());
+
+ control.verify();
+ }
+
+ private void setUpClientLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
+ ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(ClientLifeCycleListener.class.getName(), null))
+ .andReturn(svcrefs);
+ ClientLifeCycleManager lcmanager = control.createMock(ClientLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(ClientLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
+ for (int i = 0; i < names.length; i++) {
+ ClientLifeCycleListener cl = control.createMock(ClientLifeCycleListener.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
+ lcmanager.registerListener(cl);
+ EasyMock.expectLastCall();
+ }
+ }
+ }
+
+ private void setUpServerLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
+ ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(ServerLifeCycleListener.class.getName(), null))
+ .andReturn(svcrefs);
+ ServerLifeCycleManager lcmanager = control.createMock(ServerLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(ServerLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
+ for (int i = 0; i < names.length; i++) {
+ ServerLifeCycleListener cl = control.createMock(ServerLifeCycleListener.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
+ lcmanager.registerListener(cl);
+ EasyMock.expectLastCall();
+ }
+ }
+ }
+
+ private void setFeatures(String[] names, String[] restricted,
+ Collection<Feature> lst) throws Exception {
+ ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null))
+ .andReturn(svcrefs);
+ for (int i = 0; i < names.length; i++) {
+ Feature f = control.createMock(Feature.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(f).anyTimes();
+ }
+ EasyMock.expect(bus.getFeatures()).andReturn(lst).anyTimes();
+
+ }
+
+ // Creates test service references with the specified symbolic names and the restricted extension properties.
+ private ServiceReference<Object>[] createTestServiceReferences(String[] names, String[] restricted) {
+ @SuppressWarnings("unchecked")
+ ServiceReference<Object>[] refs = new ServiceReference[names.length];
+ for (int i = 0; i < names.length; i++) {
+ refs[i] = createTestServiceReference(names[i], restricted[i]);
+ }
+ return refs;
+ }
+
+
+ // Creates a test service reference with the specified symbolic name and the restricted extension property.
+ private ServiceReference<Object> createTestServiceReference(String name, String rst) {
+ @SuppressWarnings("unchecked")
+ ServiceReference<Object> ref = control.createMock(ServiceReference.class);
+ Bundle b = control.createMock(Bundle.class);
+ EasyMock.expect(b.getSymbolicName()).andReturn(name).anyTimes();
+ EasyMock.expect(ref.getBundle()).andReturn(b).anyTimes();
+ EasyMock.expect(ref.getProperty("org.apache.cxf.bus.restricted.extension")).andReturn(rst).anyTimes();
+ return ref;
+ }
+
+ private static boolean isExcluded(String aname, String sname, String rst, String exc) {
+ if (!StringUtils.isEmpty(rst) && !aname.matches(rst)) {
+ return true;
+ }
+ return exc != null && sname.matches(exc);
+ }
+
+ private static int countServices(String[] names, String[] restricted, String excluded) {
+ int c = 0;
+ for (int i = 0; i < names.length; i++) {
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excluded)) {
+ c++;
+ }
+ }
+ return c;
+ }
+}
+
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index 9b0b7a3..2717154 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -21,14 +21,15 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.support.AbstractRefreshableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
public class BusApplicationListenerTest extends Assert {
@Test
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 2c63150..ea8be84 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -33,12 +33,12 @@ import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.message.Message;
-
import org.junit.Assert;
import org.junit.Test;
-
import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
public class BusDefinitionParserTest extends Assert {
@Test
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index bf4a96a..a48fb72 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -48,6 +48,7 @@ import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.WorkQueueManager;
+
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index cd68169..a9064b2 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.buslifecycle;
import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
index fca985f..6bff143 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
@@ -23,6 +23,7 @@ package org.apache.cxf.common.annotation;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
+
import javax.annotation.Resource;
import javax.jws.HandlerChain;
import javax.jws.WebMethod;
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index 28335b6..dc40ceb 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -26,10 +26,12 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
import javax.annotation.Resource;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index 1fe7428..7563415 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -27,6 +27,7 @@ import java.util.ResourceBundle;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index 4736663..567e813 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -24,7 +24,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
-
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +35,6 @@ import javax.annotation.Resources;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index ace5282..7168d71 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import org.apache.cxf.validation.BeanValidationProvider;
import org.apache.cxf.validation.ValidationConfiguration;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 5c156c4..535144f 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -38,8 +38,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
public class ConfigurerImplTest extends Assert {
static {
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index 2be4854..8d13579 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.continuations;
import org.apache.cxf.common.i18n.UncheckedException;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
index c841937..b879db3 100644
--- a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
+++ b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
@@ -1,150 +1,153 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.feature.transform;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.io.CachedWriter;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/* Provides XSLT transformation of incoming message.
- * Interceptor breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
- */
-public class XSLTInterceptorsTest {
-
- private static final String TRANSFORMATION_XSL = "transformation.xsl";
- private static final String MESSAGE_FILE = "message.xml";
-
- private InputStream messageIS;
- private Message message;
- private XSLTInInterceptor inInterceptor;
- private XSLTOutInterceptor outInterceptor;
-
- @Before
- public void setUp() throws TransformerConfigurationException {
- messageIS = ClassLoaderUtils.getResourceAsStream(MESSAGE_FILE, this.getClass());
- if (messageIS == null) {
- throw new IllegalArgumentException("Cannot load message from path: " + MESSAGE_FILE);
- }
- message = new MessageImpl();
- inInterceptor = new XSLTInInterceptor(TRANSFORMATION_XSL);
- outInterceptor = new XSLTOutInterceptor(TRANSFORMATION_XSL);
- }
-
- @Test
- public void inStreamTest() throws Exception {
- message.setContent(InputStream.class, messageIS);
- inInterceptor.handleMessage(message);
- InputStream transformedIS = message.getContent(InputStream.class);
- Document doc = StaxUtils.read(transformedIS);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void inXMLStreamTest() throws XMLStreamException {
- XMLStreamReader xReader = StaxUtils.createXMLStreamReader(messageIS);
- message.setContent(XMLStreamReader.class, xReader);
- inInterceptor.handleMessage(message);
- XMLStreamReader transformedXReader = message.getContent(XMLStreamReader.class);
- Document doc = StaxUtils.read(transformedXReader);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void inReaderTest() throws Exception {
- Reader reader = new InputStreamReader(messageIS);
- message.setContent(Reader.class, reader);
- inInterceptor.handleMessage(message);
- Reader transformedReader = message.getContent(Reader.class);
- Document doc = StaxUtils.read(transformedReader);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outStreamTest() throws Exception {
- CachedOutputStream cos = new CachedOutputStream();
- cos.holdTempFile();
- message.setContent(OutputStream.class, cos);
- outInterceptor.handleMessage(message);
- OutputStream os = message.getContent(OutputStream.class);
- IOUtils.copy(messageIS, os);
- os.close();
- cos.releaseTempFileHold();
- Document doc = StaxUtils.read(cos.getInputStream());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outXMLStreamTest() throws XMLStreamException, SAXException, IOException, ParserConfigurationException {
- CachedWriter cWriter = new CachedWriter();
- cWriter.holdTempFile();
- XMLStreamWriter xWriter = StaxUtils.createXMLStreamWriter(cWriter);
- message.setContent(XMLStreamWriter.class, xWriter);
- outInterceptor.handleMessage(message);
- XMLStreamWriter tXWriter = message.getContent(XMLStreamWriter.class);
- StaxUtils.copy(new StreamSource(messageIS), tXWriter);
- tXWriter.close();
- cWriter.releaseTempFileHold();
- Document doc = StaxUtils.read(cWriter.getReader());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outWriterStreamTest() throws Exception {
- CachedWriter cWriter = new CachedWriter();
- message.setContent(Writer.class, cWriter);
- outInterceptor.handleMessage(message);
- Writer tWriter = message.getContent(Writer.class);
- IOUtils.copy(new InputStreamReader(messageIS), tWriter, IOUtils.DEFAULT_BUFFER_SIZE);
- tWriter.close();
- Document doc = StaxUtils.read(cWriter.getReader());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- private boolean checkTransformedXML(Document doc) {
- NodeList list = doc.getDocumentElement()
- .getElementsByTagNameNS("http://customerservice.example.com/", "getCustomersByName1");
- return list.getLength() == 1;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.feature.transform;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.stream.StreamSource;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.SAXException;
+
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.io.CachedWriter;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxUtils;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/* Provides XSLT transformation of incoming message.
+ * Interceptor breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
+ */
+public class XSLTInterceptorsTest {
+
+ private static final String TRANSFORMATION_XSL = "transformation.xsl";
+ private static final String MESSAGE_FILE = "message.xml";
+
+ private InputStream messageIS;
+ private Message message;
+ private XSLTInInterceptor inInterceptor;
+ private XSLTOutInterceptor outInterceptor;
+
+ @Before
+ public void setUp() throws TransformerConfigurationException {
+ messageIS = ClassLoaderUtils.getResourceAsStream(MESSAGE_FILE, this.getClass());
+ if (messageIS == null) {
+ throw new IllegalArgumentException("Cannot load message from path: " + MESSAGE_FILE);
+ }
+ message = new MessageImpl();
+ inInterceptor = new XSLTInInterceptor(TRANSFORMATION_XSL);
+ outInterceptor = new XSLTOutInterceptor(TRANSFORMATION_XSL);
+ }
+
+ @Test
+ public void inStreamTest() throws Exception {
+ message.setContent(InputStream.class, messageIS);
+ inInterceptor.handleMessage(message);
+ InputStream transformedIS = message.getContent(InputStream.class);
+ Document doc = StaxUtils.read(transformedIS);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void inXMLStreamTest() throws XMLStreamException {
+ XMLStreamReader xReader = StaxUtils.createXMLStreamReader(messageIS);
+ message.setContent(XMLStreamReader.class, xReader);
+ inInterceptor.handleMessage(message);
+ XMLStreamReader transformedXReader = message.getContent(XMLStreamReader.class);
+ Document doc = StaxUtils.read(transformedXReader);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void inReaderTest() throws Exception {
+ Reader reader = new InputStreamReader(messageIS);
+ message.setContent(Reader.class, reader);
+ inInterceptor.handleMessage(message);
+ Reader transformedReader = message.getContent(Reader.class);
+ Document doc = StaxUtils.read(transformedReader);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outStreamTest() throws Exception {
+ CachedOutputStream cos = new CachedOutputStream();
+ cos.holdTempFile();
+ message.setContent(OutputStream.class, cos);
+ outInterceptor.handleMessage(message);
+ OutputStream os = message.getContent(OutputStream.class);
+ IOUtils.copy(messageIS, os);
+ os.close();
+ cos.releaseTempFileHold();
+ Document doc = StaxUtils.read(cos.getInputStream());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outXMLStreamTest() throws XMLStreamException, SAXException, IOException, ParserConfigurationException {
+ CachedWriter cWriter = new CachedWriter();
+ cWriter.holdTempFile();
+ XMLStreamWriter xWriter = StaxUtils.createXMLStreamWriter(cWriter);
+ message.setContent(XMLStreamWriter.class, xWriter);
+ outInterceptor.handleMessage(message);
+ XMLStreamWriter tXWriter = message.getContent(XMLStreamWriter.class);
+ StaxUtils.copy(new StreamSource(messageIS), tXWriter);
+ tXWriter.close();
+ cWriter.releaseTempFileHold();
+ Document doc = StaxUtils.read(cWriter.getReader());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outWriterStreamTest() throws Exception {
+ CachedWriter cWriter = new CachedWriter();
+ message.setContent(Writer.class, cWriter);
+ outInterceptor.handleMessage(message);
+ Writer tWriter = message.getContent(Writer.class);
+ IOUtils.copy(new InputStreamReader(messageIS), tWriter, IOUtils.DEFAULT_BUFFER_SIZE);
+ tWriter.close();
+ Document doc = StaxUtils.read(cWriter.getReader());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ private boolean checkTransformedXML(Document doc) {
+ NodeList list = doc.getDocumentElement()
+ .getElementsByTagNameNS("http://customerservice.example.com/", "getCustomersByName1");
+ return list.getLength() == 1;
+ }
+}
+
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index bb0d5ec..257d731 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -23,6 +23,7 @@ package org.apache.cxf.helpers;
import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index ccf9aee..d2e981c 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 88019e0..1b85b41 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -35,9 +35,9 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index 270b16b..75e515e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.OperationInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index cb6c604..30f37f5 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
index 462efc1..c96a1b5 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.interceptor.security.callback.CertKeyToUserNameMapper;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.transport.TLSSessionInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
index a0c5697..f4acf13 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Before;
public class OperationInfoAuthorizingInterceptorTest extends SimpleAuthorizingInterceptorTest {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index aa02d2e..178745e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -34,8 +34,8 @@ import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index ad9b5c0..455015f 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 9d69fe3..ec56639 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.IOUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index 1c8f808..c6b16f5 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -34,9 +34,9 @@ import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.logging.FaultListener;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index d5b60ff..5997abb 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.net.URL;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index c975895..4381dda 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
index e21bbf9..d6cc958 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
@@ -26,6 +26,7 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -35,6 +36,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.ws.commons.schema.XmlSchemaCollection;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index dc17467..3a3124d 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -25,6 +25,7 @@ import java.util.TreeSet;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index cd86280..0764e97 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -34,8 +34,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java b/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
index 54d5856..a905183 100644
--- a/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
@@ -24,6 +24,7 @@ import java.util.Random;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Test;
import static org.apache.cxf.ws.addressing.ContextUtils.getAttributedURI;
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index dd6e172..4509305 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cxf.tools.corba.IDLToWSDL;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 02/04: Bunch of whitespace changes to start making latest
Checkstyle happy
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 50e633bb3224f5abb611c171331cae055a036729
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Jan 4 12:13:43 2018 -0500
Bunch of whitespace changes to start making latest Checkstyle happy
(cherry picked from commit aa444e536669b8de9389a69c46e4eced747057df)
# Conflicts:
# integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
# integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
# osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
# rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
# rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
# rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
# rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java
# rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java
# rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
# rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
# rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java
# rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java
# rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java
# rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java
# rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
# rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
# rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
# rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
# rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
# rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
# rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineBeanDefinitionParser.java
# rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
# rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
# rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
# rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
# rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
# rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
# rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/InvalidExpression.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageQName.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/Resource.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/InvalidRepresentation.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/ValidAndTransformHelper.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceTypeIdentifier.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceValidator.java
# rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSLTResourceTransformer.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetXPath10Test.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutAddTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutReplaceTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java
# rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
# services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
# services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
# services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
# systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreSwagger.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerFilterServiceDescriptionTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxService.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoService.java
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
# systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
# systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
# systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
# systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
# systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
# systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
# systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
# systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
# systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ThreadPoolTest.java
# systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
# systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
# systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java
# systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
# systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/CircuitBreakerFailoverTest.java
# systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
# systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java
# systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/CreateStudentTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/CreateTeacherTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/DeleteTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/GetTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/PutTest.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/TestUtils.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/resolver/MyResourceResolver.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/validator/StudentPutResourceValidator.java
# systests/ws-transfer/src/test/java/org/apache/cxf/systest/ws/transfer/validator/TeacherResourceValidator.java
# tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
# tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java
---
.../apache/cxf/bus/osgi/OSGiBusListenerTest.java | 17 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 1 +
.../configuration/spring/ConfigurerImplTest.java | 2 +
.../java/org/apache/cxf/cdi/AbstractCXFBean.java | 1 +
.../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 1 +
.../AbstractManagedConnectionImpl.java | 1 +
.../jca/core/resourceadapter/UriHandlerInit.java | 1 +
.../cxf/jca/cxf/ManagedConnectionFactoryImpl.java | 1 -
.../apache/cxf/jca/cxf/ResourceAdapterImpl.java | 1 -
.../jca/outbound/ManagedConnectionFactoryImpl.java | 1 -
.../core/classloader/PlugInClassLoaderTest.java | 1 +
.../cxf/jca/core/logging/LoggerHelperTest.java | 1 +
.../ResourceAdapterInternalExceptionTest.java | 1 +
...AssociatedManagedConnectionFactoryImplTest.java | 6 +-
.../org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 1 +
.../jca/cxf/ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 3 +-
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 1 +
.../handlers/AbstractInvocationHandlerTest.java | 1 +
.../cxf/jca/cxf/handlers/HandlerTestBase.java | 1 +
.../cxf/handlers/InvocationHandlerFactoryTest.java | 1 +
.../handlers/InvokingInvocationHandlerTest.java | 1 +
.../ObjectMethodInvocationHandlerTest.java | 1 +
.../cxf/handlers/ProxyInvocationHandlerTest.java | 1 +
.../apache/cxf/jca/jarloader/JarLoaderTest.java | 1 +
.../jca/outbound/ManagedConnectionImplTest.java | 1 +
.../autoconfigure/CxfAutoConfigurationTests.java | 1 +
.../brave/AbstractBraveClientInterceptor.java | 1 -
.../tracing/brave/AbstractBraveClientProvider.java | 1 -
.../cxf/tracing/brave/AbstractBraveProvider.java | 1 -
.../cxf/tracing/brave/BraveClientFeature.java | 1 -
.../tracing/brave/BraveClientStartInterceptor.java | 1 -
.../tracing/brave/BraveClientStopInterceptor.java | 1 -
.../org/apache/cxf/tracing/brave/BraveFeature.java | 1 -
.../cxf/tracing/brave/BraveStartInterceptor.java | 1 -
.../cxf/tracing/brave/BraveStopInterceptor.java | 1 -
.../cxf/tracing/brave/BraveTracerContext.java | 1 -
.../cxf/tracing/brave/HttpClientSpanParser.java | 1 -
.../cxf/tracing/brave/HttpServerSpanParser.java | 1 -
.../tracing/brave/jaxrs/BraveClientProvider.java | 1 -
.../tracing/brave/jaxrs/BraveContextProvider.java | 1 -
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 1 -
.../cxf/tracing/brave/jaxrs/BraveProvider.java | 1 -
.../tracing/htrace/ext/LogbackSpanConverter.java | 1 -
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 +
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 3 +
.../cxf/osgi/itests/soap/HttpServiceTest.java | 1 -
.../cxf/osgi/itests/soap/JmsServiceTest.java | 1 +
.../karaf/commands/completers/BusCompleter.java | 1 -
.../cxf/binding/coloc/ColocInInterceptor.java | 2 -
.../cxf/binding/coloc/ColocOutInterceptor.java | 2 -
.../binding/coloc/ColocMessageObserverTest.java | 1 +
.../cxf/binding/coloc/ColocOutInterceptorTest.java | 2 +-
.../apache/cxf/binding/coloc/ColocUtilTest.java | 2 +-
.../org/apache/cxf/binding/corba/CorbaBinding.java | 1 -
.../apache/cxf/binding/corba/CorbaStreamable.java | 1 -
.../binding/corba/runtime/CorbaStreamableImpl.java | 1 -
.../types/AbstractNoStartEndEventProducer.java | 1 -
.../corba/types/AbstractStartEndEventProducer.java | 1 -
.../corba/types/CorbaAnonStructEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaAnyHandler.java | 1 -
.../corba/types/CorbaArrayEventProducer.java | 1 -
.../corba/types/CorbaExceptionEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaFixedHandler.java | 1 -
.../binding/corba/types/CorbaObjectHandler.java | 1 -
.../corba/types/CorbaObjectReferenceListener.java | 1 -
.../types/CorbaPrimitiveSequenceEventProducer.java | 1 -
.../corba/types/CorbaSequenceEventProducer.java | 1 -
.../corba/types/CorbaTypeEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaUnionHandler.java | 1 -
.../corba/types/ParameterEventProducer.java | 1 -
.../corba/types/SkipStartEndEventProducer.java | 1 -
.../WrappedParameterSequenceEventProducer.java | 1 -
.../cxf/binding/corba/CorbaBindingFactoryTest.java | 3 +-
.../apache/cxf/binding/corba/CorbaBindingTest.java | 1 +
.../apache/cxf/binding/corba/CorbaConduitTest.java | 1 +
.../cxf/binding/corba/CorbaDestinationTest.java | 4 +-
.../apache/cxf/binding/corba/CorbaMessageTest.java | 1 +
.../cxf/binding/corba/CorbaServerConduitTest.java | 1 +
.../apache/cxf/binding/corba/CorbaTypeMapTest.java | 1 +
.../org/apache/cxf/binding/corba/TestUtils.java | 2 +
.../binding/corba/runtime/CorbaDSIServantTest.java | 3 +-
.../corba/runtime/CorbaObjectReaderTest.java | 1 +
.../corba/runtime/CorbaObjectWriterTest.java | 1 +
.../corba/runtime/CorbaStreamReaderTest.java | 1 +
.../corba/runtime/CorbaStreamWriterTest.java | 1 +
.../binding/corba/runtime/CorbaStreamableTest.java | 1 +
.../binding/corba/types/CorbaAnyHandlerTest.java | 1 +
.../binding/corba/types/CorbaArrayHandlerTest.java | 1 +
.../binding/corba/types/CorbaHandlerUtilsTest.java | 1 +
.../corba/types/CorbaObjectHandlerTest.java | 1 -
.../corba/types/CorbaPrimitiveHandlerTest.java | 3 +-
.../corba/types/CorbaSequenceHandlerTest.java | 3 +-
.../cxf/binding/corba/utils/ContextUtilsTest.java | 1 +
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 1 +
.../cxf/binding/soap/wsdl11/SoapAddressPlugin.java | 1 +
.../soap/MustUnderstandInterceptorTest.java | 1 +
.../cxf/binding/soap/RPCInInterceptorTest.java | 1 +
.../cxf/binding/soap/RPCOutInterceptorTest.java | 1 +
.../cxf/binding/soap/ServiceModelUtilTest.java | 1 +
.../binding/soap/SoapActionInterceptorTest.java | 1 +
.../cxf/binding/soap/SoapBindingFactoryTest.java | 2 +-
.../apache/cxf/binding/soap/SoapBindingTest.java | 1 +
.../cxf/binding/soap/SoapOutInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/TestBase.java | 1 +
.../interceptor/SoapActionInInterceptorTest.java | 2 +-
.../SoapPreProtocolOutInterceptorTest.java | 2 +-
.../soap/jms/interceptor/SoapFaultFactoryTest.java | 2 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 1 +
.../binding/soap/saaj/SAAJInInterceptorTest.java | 1 +
.../cxf/binding/xml/wsdl11/XmlBindingPlugin.java | 1 +
.../apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java | 1 +
.../cxf/binding/xml/XMLBindingFactoryTest.java | 1 +
.../cxf/binding/xml/interceptor/TestBase.java | 1 +
.../interceptor/XMLFaultOutInterceptorTest.java | 1 +
.../interceptor/XMLMessageOutInterceptorTest.java | 1 +
.../apache/cxf/aegis/AegisElementDataWriter.java | 1 +
.../apache/cxf/aegis/AegisXMLStreamDataReader.java | 1 +
.../org/apache/cxf/aegis/AbstractAegisTest.java | 1 +
.../apache/cxf/aegis/exception/ExceptionTest.java | 1 +
.../inheritance/ExceptionInheritanceTest.java | 1 +
.../inheritance/intf/InterfaceInheritanceTest.java | 1 +
.../aegis/integration/ParameterMappingTest.java | 1 +
.../cxf/aegis/namespaces/ExplicitPrefixTest.java | 1 +
.../cxf/aegis/namespaces/impl/NameServiceImpl.java | 1 +
.../cxf/aegis/override/OverrideTypeTest.java | 1 +
.../java/org/apache/cxf/aegis/proxy/ProxyTest.java | 1 +
.../cxf/aegis/services/base64/BinaryDataTest.java | 1 +
.../cxf/aegis/standalone/StandaloneReadTest.java | 2 +
.../cxf/aegis/type/array/DuplicateArrayTest.java | 1 +
.../apache/cxf/aegis/type/basic/BadXMLTest.java | 8 +-
.../cxf/aegis/type/basic/DynamicProxyTest.java | 1 +
.../cxf/aegis/type/encoded/SoapArrayTypeTest.java | 1 +
.../cxf/aegis/type/encoded/StructTypeTest.java | 1 +
.../cxf/aegis/type/java5/map/StudentTest.java | 1 +
.../org/apache/cxf/aegis/type/map/MapsTest.java | 1 +
.../aegis/type/missing/MissingTypeWSDLTest.java | 1 +
.../org/apache/cxf/aegis/xml/stax/ReaderTest.java | 1 +
.../org/apache/cxf/aegis/xml/stax/WriterTest.java | 1 +
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 2 +
.../org/apache/cxf/jaxb/BareInInterceptorTest.java | 2 +-
.../apache/cxf/jaxb/BareOutInterceptorTest.java | 2 +-
.../cxf/jaxb/DocLiteralInInterceptorTest.java | 2 +-
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 2 +-
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 1 +
.../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 1 +
.../test/java/org/apache/cxf/jaxb/TestBase.java | 1 +
.../cxf/jaxb/io/XMLStreamDataReaderTest.java | 1 +
.../cxf/ext/logging/DefaultLogEventMapperTest.java | 1 +
.../apache/cxf/ext/logging/RESTLoggingTest.java | 1 +
.../cxf/ext/logging/TestPrettyLoggingFilter.java | 1 +
.../apache/cxf/jaxrs/provider/SourceProvider.java | 1 +
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 2 +-
.../cxf/jaxrs/ext/MessageContextImplTest.java | 2 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 2 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 2 +-
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 2 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 2 +-
.../lifecycle/PerRequestResourceProviderTest.java | 2 +-
.../cxf/jaxrs/model/OperationResourceInfoTest.java | 2 +-
.../provider/AbstractConfigurableProviderTest.java | 1 +
.../jaxrs/provider/JAXBElementProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 2 +-
.../security/JAASAuthenticationFilterTest.java | 1 +
.../springmvc/SpringViewResolverProviderTest.java | 2 +
.../cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 1 +
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 2 +-
.../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../cxf/jaxws/binding/soap/SOAPBindingImpl.java | 1 +
.../jaxws/blueprint/EndpointDefinitionParser.java | 2 +
.../JaxWsProxyFactoryBeanDefinitionParser.java | 1 -
.../JaxWsWebServicePublisherBeanPostProcessor.java | 1 -
.../org/apache/cxf/jaxws/AbstractJaxWsTest.java | 1 +
.../org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 1 +
.../apache/cxf/jaxws/ConfiguredEndpointTest.java | 1 +
.../java/org/apache/cxf/jaxws/GreeterTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/HeaderTest.java | 1 +
.../apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 2 +
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 1 +
.../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 2 +
.../apache/cxf/jaxws/MessageReplayObserver.java | 1 +
.../org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 1 +
.../java/org/apache/cxf/jaxws/SOAPBindingTest.java | 1 +
.../java/org/apache/cxf/jaxws/SchemaFirstTest.java | 1 +
.../java/org/apache/cxf/jaxws/ServiceImplTest.java | 1 +
.../apache/cxf/jaxws/ServiceModelUtilsTest.java | 1 +
.../java/org/apache/cxf/jaxws/SoapFaultTest.java | 1 +
.../cxf/jaxws/WrapperClassGeneratorTest.java | 1 +
.../jaxws/context/WebServiceContextImplTest.java | 1 +
.../apache/cxf/jaxws/dispatch/DispatchOpTest.java | 2 +
.../AbstractProtocolHandlerInterceptorTest.java | 1 +
.../handler/AnnotationHandlerChainBuilderTest.java | 1 +
.../cxf/jaxws/handler/HandlerChainBuilderTest.java | 2 +-
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 1 +
.../handler/LogicalHandlerInterceptorTest.java | 1 +
.../cxf/jaxws/handler/LogicalMessageImplTest.java | 1 +
.../handler/soap/SOAPHandlerInterceptorTest.java | 1 +
.../header/ProviderHeaderClientServerTest.java | 1 +
.../org/apache/cxf/jaxws/holder/HolderTest.java | 1 +
.../WebFaultOutInterceptorTestCase.java | 1 +
.../jaxws/provider/ProviderServiceFactoryTest.java | 1 +
.../apache/cxf/jaxws/provider/ProviderTest.java | 1 +
.../apache/cxf/jaxws/service/ArrayServiceImpl.java | 1 +
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 1 +
.../support/ContextPropertiesMappingTest.java | 1 +
.../support/JaxWsServiceConfigurationTest.java | 2 +-
.../jaxws/support/JaxWsServiceFactoryBeanTest.java | 1 +
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 4 +-
.../JAXWSHttpSpiDestinationTest.java | 1 +
.../JAXWSHttpSpiTransportFactoryTest.java | 1 +
.../org/apache/cxf/js/rhino/ProviderFactory.java | 1 -
.../java/org/apache/cxf/js/rhino/ServerApp.java | 1 -
.../cxf/js/rhino/AbstractDOMProviderTest.java | 2 +-
.../apache/cxf/js/rhino/ProviderFactoryTest.java | 2 +-
.../java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +
.../frontend/soap/SoapBindingSelectionTest.java | 1 +
.../spring/AbstractSimpleFrontendSpringTest.java | 2 +
.../cxf/frontend/spring/ClientServerTest.java | 1 +
.../cxf/frontend/spring/SpringBeansTest.java | 1 +
.../factory/AbstractSimpleFrontendTest.java | 1 +
.../cxf/service/factory/ClientFactoryBeanTest.java | 1 +
.../factory/ReflectionServiceFactoryTest.java | 1 +
.../apache/cxf/service/factory/RountripTest.java | 1 +
.../cxf/service/factory/ServerFactoryTest.java | 1 +
.../cxf/service/stax/StaxDatabindingTest.java | 1 +
.../apache/cxf/javascript/GenericAegisTest.java | 1 +
.../cxf/javascript/JavascriptTestUtilities.java | 1 +
.../management/jmx/InstrumentationManagerImpl.java | 1 -
.../export/runtime/ModelMBeanInfoSupporter.java | 2 -
.../management/counters/CounterRepositoryTest.java | 1 +
.../AbstractMessageResponseTestBase.java | 2 +-
.../ResponseTimeMessageInInterceptorTest.java | 2 +-
.../ResponseTimeMessageInvokerInterceptorTest.java | 1 +
.../ResponseTimeMessageOutInterceptorTest.java | 1 +
.../jmx/export/ModelMBeanAssemblerTest.java | 1 +
.../client/spring/JAXRSClientFactoryBeanTest.java | 2 +
.../apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 1 +
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
.../jaxrs/provider/atom/AtomEntryProviderTest.java | 1 +
.../jaxrs/provider/atom/AtomFeedProviderTest.java | 1 +
.../jaxrs/provider/dom4j/DOM4JProviderTest.java | 2 +-
.../cxf/jaxrs/resources/CollectionsResource.java | 1 +
.../jpa/AbstractJPATypedQueryVisitorTest.java | 1 +
.../search/jpa/JPATypedQueryVisitorODataTest.java | 1 +
.../lucene/AbstractLuceneQueryVisitorTest.java | 406 +++++++++++----------
.../lucene/LuceneQueryVisitorAnalyzerFiqlTest.java | 1 +
.../search/lucene/LuceneQueryVisitorFiqlTest.java | 1 +
.../search/lucene/LuceneQueryVisitorODataTest.java | 394 ++++++++++----------
.../rs/security/oauth/client/OAuthClientUtils.java | 1 -
.../security/oauth/filters/AbstractAuthFilter.java | 1 -
.../security/oauth/filters/OAuthRequestFilter.java | 1 -
.../oauth/provider/DefaultOAuthValidator.java | 1 -
.../oauth/services/AbstractOAuthService.java | 1 -
.../oauth/services/AccessTokenHandler.java | 1 -
.../services/AuthorizationRequestHandler.java | 1 -
.../oauth/services/OOBResponseProvider.java | 1 -
.../oauth/services/RequestTokenHandler.java | 1 -
.../cxf/rs/security/oauth/utils/OAuthUtils.java | 1 -
.../grants/saml/Saml2BearerGrantHandler.java | 1 +
.../code/DefaultEHCacheCodeDataProvider.java | 1 -
.../oauth2/grants/code/JCacheCodeDataProvider.java | 1 +
.../provider/DefaultEHCacheOAuthDataProvider.java | 1 -
.../cxf/rs/security/oauth2/utils/EHCacheUtil.java | 1 -
.../grants/code/JCacheCodeDataProviderTest.java | 1 +
.../grants/code/JPACMTOAuthDataProviderTest.java | 2 +
.../grants/code/JPACodeDataProviderTest.java | 2 +
.../oauth2/grants/jwt/AbstractJwtHandlerTest.java | 3 +-
.../provider/JCacheOAuthDataProviderTest.java | 1 +
.../oauth2/provider/JPAOAuthDataProviderTest.java | 2 +
.../tokens/hawk/HawkAccessTokenValidatorTest.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImplTest.java | 2 +-
.../oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java | 2 +
.../oidc/idp/JPAOidcUserSubjectCMTTest.java | 1 +
.../security/oidc/idp/JPAOidcUserSubjectTest.java | 2 +
.../AbstractRequestAssertionConsumerHandler.java | 1 +
.../saml/sso/AbstractServiceProviderFilter.java | 1 +
.../security/saml/sso/EHCacheTokenReplayCache.java | 1 -
.../cxf/rs/security/saml/sso/MetadataService.java | 1 +
.../saml/sso/SAMLProtocolResponseValidator.java | 1 +
.../rs/security/saml/sso/SSOValidatorResponse.java | 1 +
.../security/saml/sso/SamlPostBindingFilter.java | 1 +
.../saml/sso/SamlRedirectBindingFilter.java | 1 +
.../saml/sso/state/EHCacheSPStateManager.java | 1 -
.../security/saml/sso/AuthnRequestBuilderTest.java | 1 +
.../security/saml/sso/CombinedValidatorTest.java | 1 +
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 1 -
.../saml/sso/SAMLResponseValidatorTest.java | 1 +
.../saml/sso/SAMLSSOResponseValidatorTest.java | 1 +
.../cxf/rs/security/common/RSSecurityUtils.java | 1 +
.../rs/security/saml/AbstractSamlInHandler.java | 1 +
.../authorization/SecurityContextProviderImpl.java | 1 +
.../rs/security/xml/AbstractXmlEncInHandler.java | 1 +
.../rs/security/xml/AbstractXmlSecInHandler.java | 1 +
.../security/xml/AbstractXmlSecOutInterceptor.java | 1 +
.../rs/security/xml/AbstractXmlSigInHandler.java | 1 +
.../cxf/rs/security/xml/XmlEncOutInterceptor.java | 1 +
.../cxf/rs/security/xml/XmlSigOutInterceptor.java | 1 +
.../security/saml/claims/SAMLSecurityContext.java | 1 +
.../saml/interceptor/WSS4JBasicAuthValidator.java | 1 +
.../cxf/rt/security/saml/utils/SAMLUtils.java | 1 +
.../rt/security/saml/xacml/CXFMessageParser.java | 1 +
.../rt/security/saml/claims/SAMLClaimsTest.java | 2 +
.../ClaimsAuthorizingInterceptorTest.java | 1 +
.../saml/xacml2/RequestComponentBuilderTest.java | 1 +
.../xacml2/SamlRequestComponentBuilderTest.java | 1 +
.../JettyHTTPServerEngineBeanDefinitionParser.java | 1 +
...TTPServerEngineFactoryBeanDefinitionParser.java | 1 -
.../http_jetty/JettyHTTPDestinationTest.java | 3 +
.../http_jetty/JettyHTTPServerEngineTest.java | 3 +
.../netty/client/integration/NettyClientTest.java | 3 +
.../http/netty/server/NettyHttpContextHandler.java | 2 +-
.../http/netty/server/NettyHttpHandler.java | 2 +
.../http/netty/server/NettyHttpServerEngine.java | 3 +-
.../server/interceptor/ChannelInterceptor.java | 1 -
.../server/interceptor/HttpSessionInterceptor.java | 1 +
.../server/servlet/NettyHttpServletRequest.java | 1 +
.../NettyHttpServerEngineBeanDefinitionParser.java | 1 -
.../netty/server/NettyHttpDestinationTest.java | 2 +-
.../server/NettyHttpServerEngineFactoryTest.java | 1 +
.../netty/server/NettyHttpServerEngineTest.java | 1 +
.../http/netty/server/NettyHttpTestHandler.java | 1 +
.../netty/server/integration/NettyServerTest.java | 3 +
.../integration/SSLNettySpringServerTest.java | 3 +
.../HttpAuthSupplierBeanDefinitionParser.java | 1 +
.../cxf/transport/https/CertConstraints.java | 1 -
.../org/apache/cxf/transport/https/SSLUtils.java | 1 -
.../http/DestinationRegistryImplTest.java | 2 +-
.../http/HTTPConduitURLConnectionTest.java | 1 +
.../transport/http/HTTPConduitURLEasyMockTest.java | 1 +
.../org/apache/cxf/transport/http/HeadersTest.java | 2 +-
.../http/auth/DigestAuthSupplierTest.java | 2 +-
.../http/policy/ClientPolicyCalculatorTest.java | 1 +
.../policy/HTTPClientAssertionBuilderTest.java | 1 +
.../policy/HTTPServerAssertionBuilderTest.java | 1 +
.../cxf/transport/http/policy/PolicyUtilsTest.java | 1 +
.../http/policy/ServerPolicyCalculatorTest.java | 1 +
.../https/HttpsURLConnectionFactoryTest.java | 2 +
.../cxf/transport/servlet/BaseUrlHelperTest.java | 1 -
.../transport/servlet/ServletControllerTest.java | 2 +-
.../cxf/transport/jms/JMSTransportFactory.java | 1 -
.../cxf/transport/jms/AbstractJMSTester.java | 1 +
.../apache/cxf/transport/jms/JMSConduitTest.java | 1 +
.../cxf/transport/jms/JMSConfigFactoryTest.java | 1 +
.../cxf/transport/jms/JMSDestinationTest.java | 1 +
.../MessageIdAsCorrelationIdJMSConduitTest.java | 1 +
.../cxf/transport/jms/RequestResponseTest.java | 1 +
.../continuations/JMSContinuationProviderTest.java | 1 +
.../jms/continuations/JMSContinuationTest.java | 1 +
.../cxf/transport/jms/uri/JMSEndpointTest.java | 1 +
.../jms/uri/URIConfiguredConduitTest.java | 1 +
.../apache/cxf/transport/jms/util/JMSUtilTest.java | 1 +
.../transport/jms/util/MessageListenerTest.java | 1 +
.../transport/local/LocalTransportFactoryTest.java | 2 +-
.../jetty/JettyWebSocketDestinationTest.java | 2 +-
.../cxf/ws/addressing/impl/ContextUtilsTest.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 2 +-
.../addressing/soap/DecoupledFaultHandlerTest.java | 1 +
.../cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
.../ws/eventing/shared/faults/WSEventingFault.java | 1 +
.../handlers/ReferenceParametersAddingHandler.java | 1 +
.../eventing/shared/utils/DurationAndDateUtil.java | 2 +
.../base/SimpleEventingIntegrationTest.java | 1 +
.../ws/eventing/integration/NotificationTest.java | 1 +
.../eventing/integration/SubscriptionEndTest.java | 1 +
.../integration/SubscriptionGrantingTest.java | 2 +
.../integration/SubscriptionManagementTest.java | 1 +
.../eventsink/TestingEndToEndpointImpl.java | 1 +
.../external/ExternalAttachmentProvider.java | 1 +
.../attachment/external/PolicyAttachment.java | 1 +
.../policy/blueprint/PolicyBPDefinitionParser.java | 1 +
.../blueprint/PolicyFeatureBPDefinitionParser.java | 1 +
.../policy/AssertionBuilderRegistryImplTest.java | 1 +
.../apache/cxf/ws/policy/AssertionInfoMapTest.java | 1 +
.../cxf/ws/policy/EffectivePolicyImplTest.java | 2 +-
.../cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../org/apache/cxf/ws/policy/NormalizeTest.java | 1 +
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 1 +
.../org/apache/cxf/ws/policy/PolicyEngineTest.java | 2 +-
.../PolicyInterceptorProviderRegistryImplTest.java | 1 +
.../cxf/ws/policy/PolicyInterceptorsTest.java | 1 +
.../cxf/ws/policy/PolicyRegistryImplTest.java | 1 +
.../PolicyVerificationInFaultInterceptorTest.java | 1 +
.../PolicyVerificationInInterceptorTest.java | 1 +
.../PolicyVerificationOutInterceptorTest.java | 1 +
.../DomainExpressionBuilderRegistryTest.java | 1 +
.../EndpointReferenceDomainExpressionTest.java | 1 +
.../external/ExternalAttachmentProviderTest.java | 2 +
.../attachment/external/PolicyAttachmentTest.java | 1 +
.../external/URIDomainExpressionTest.java | 1 +
.../reference/ReferenceResolverTest.java | 1 +
.../wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 1 +
.../ws/policy/builder/jaxb/JaxbAssertionTest.java | 1 +
.../selector/FirstAlternativeSelectorTest.java | 2 +-
.../MinimalMaximalAlternativeSelectorTest.java | 2 +-
.../cxf/ws/policy/spring/PolicyBeansTest.java | 1 +
.../org/apache/cxf/ws/rm/AbstractEndpointTest.java | 1 +
.../cxf/ws/rm/AbstractRMInterceptorTest.java | 2 +-
.../apache/cxf/ws/rm/DestinationSequenceTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/DestinationTest.java | 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/ProxyTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMContextUtilsTest.java | 1 +
.../java/org/apache/cxf/ws/rm/RMEndpointTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMInInterceptorTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 2 +-
.../org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMUtilsTest.java | 1 +
.../java/org/apache/cxf/ws/rm/ServantTest.java | 2 +-
.../org/apache/cxf/ws/rm/SourceSequenceTest.java | 1 +
.../jdbc/RMTxStoreConfigurationTest.java | 1 +
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java | 3 +-
.../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 2 +-
.../persistence/jdbc/RMTxStoreTwoSchemasTest.java | 276 +++++++-------
.../apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 2 +-
.../ws/rm/soap/RetransmissionQueueImplTest.java | 2 +-
.../cxf/ws/rm/soap/SoapFaultFactoryTest.java | 2 +-
.../apache/cxf/ws/security/cache/EHCacheUtils.java | 1 -
.../security/policy/interceptors/STSInvoker.java | 1 +
.../SecureConversationInInterceptor.java | 1 +
.../ws/security/tokenstore/EHCacheTokenStore.java | 1 -
.../cxf/ws/security/tokenstore/SecurityToken.java | 1 +
.../cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 1 +
.../ws/security/trust/STSStaxTokenValidator.java | 1 +
.../org/apache/cxf/ws/security/trust/STSUtils.java | 1 +
.../delegation/ReceivedTokenCallbackHandler.java | 1 +
.../delegation/WSSUsernameCallbackHandler.java | 1 +
.../wss4j/BinarySecurityTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/CryptoCoverageUtil.java | 1 +
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 1 +
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 1 +
.../ws/security/wss4j/SamlTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/StaxSerializer.java | 1 +
.../security/wss4j/UsernameTokenInterceptor.java | 1 +
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 1 +
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 1 +
.../policyhandlers/AbstractBindingBuilder.java | 1 +
.../policyhandlers/AsymmetricBindingHandler.java | 1 +
.../policyhandlers/SymmetricBindingHandler.java | 1 +
.../policyhandlers/TransportBindingHandler.java | 1 +
.../AbstractBindingPolicyValidator.java | 1 +
.../AbstractSupportingTokenPolicyValidator.java | 1 +
.../PolicyValidatorParameters.java | 1 +
.../SecuredElementsPolicyValidator.java | 1 +
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 2 +-
.../apache/cxf/ws/security/sts/STSClientTest.java | 2 +
.../security/tokenstore/EHCacheTokenStoreTest.java | 1 +
.../security/tokenstore/MemoryTokenStoreTest.java | 1 +
.../security/wss4j/CryptoCoverageCheckerTest.java | 2 +
.../security/wss4j/CustomPolicyAlgorithmsTest.java | 1 +
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 +
.../wss4j/DOMToStaxSignatureIdentifierTest.java | 1 +
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 1 +
.../wss4j/PluggablePolicyValidatorTest.java | 1 +
.../ws/security/wss4j/SecurityActionTokenTest.java | 1 +
.../wss4j/SecurityVerificationOutTest.java | 1 +
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 1 +
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 1 +
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 1 +
.../ws/security/wss4j/saml/DOMToStaxSamlTest.java | 1 +
.../security/wss4j/saml/PolicyBasedSamlTest.java | 1 +
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 1 +
.../ws/security/wss4j/saml/StaxToDOMSamlTest.java | 1 +
.../org/apache/cxf/wsdl/AbstractWSDLPlugin.java | 1 +
.../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 1 +
.../apache/cxf/wsdl/WSDLExtensibilityPlugin.java | 1 +
.../main/java/org/apache/cxf/wsdl/WSDLManager.java | 2 +
.../cxf/wsdl11/AbstractWrapperWSDLLocator.java | 1 +
.../apache/cxf/wsdl11/PartialWSDLProcessor.java | 2 -
.../cxf/wsdl11/ResourceManagerWSDLLocator.java | 1 +
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 1 +
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 1 +
.../interceptors/DocLiteralInInterceptorTest.java | 2 +-
.../factory/ReflectionServiceFactorBeanTest.java | 2 +-
.../apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 1 +
.../apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
.../java/org/apache/cxf/sts/cache/CacheUtils.java | 1 +
.../apache/cxf/sts/cache/EHCacheIdentityCache.java | 1 -
.../org/apache/cxf/sts/claims/ClaimsManager.java | 1 +
.../cxf/sts/claims/IdentityClaimsParser.java | 1 +
.../java/org/apache/cxf/sts/claims/LdapUtils.java | 1 -
.../cxf/sts/event/LoggerPatternLayoutLogback.java | 1 -
.../cxf/sts/operation/AbstractOperation.java | 1 +
.../org/apache/cxf/sts/request/ReceivedToken.java | 1 +
.../org/apache/cxf/sts/request/RequestParser.java | 1 +
.../cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 1 +
.../cxf/sts/token/canceller/SCTCanceller.java | 1 +
.../token/delegation/SAMLDelegationHandler.java | 1 +
.../cxf/sts/token/provider/SAMLTokenProvider.java | 1 +
.../token/provider/SubjectProviderParameters.java | 1 +
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 1 +
.../sts/token/renewer/TokenRenewerResponse.java | 1 +
.../sts/token/validator/SAMLTokenValidator.java | 1 +
.../token/validator/UsernameTokenValidator.java | 1 +
.../cxf/sts/cache/HazelCastTokenStoreTest.java | 1 +
.../sts/claims/mapper/JexlClaimsMapperTest.java | 1 +
.../apache/cxf/sts/common/CustomClaimParser.java | 1 +
.../cxf/sts/common/PasswordCallbackHandler.java | 2 +
.../cxf/sts/common/RealmSupportClaimsHandler.java | 1 +
.../cxf/sts/operation/DummyTokenProvider.java | 1 +
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 2 +
.../sts/operation/IssueJWTOnbehalfofUnitTest.java | 1 +
.../cxf/sts/operation/IssueJWTRealmUnitTest.java | 1 +
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlRealmUnitTest.java | 1 +
.../cxf/sts/operation/IssueSamlUnitTest.java | 1 +
.../cxf/sts/operation/RenewSamlUnitTest.java | 1 +
.../operation/ValidateJWTTransformationTest.java | 1 +
.../cxf/sts/operation/ValidateJWTUnitTest.java | 1 +
.../ValidateTokenTransformationUnitTest.java | 1 +
.../cxf/sts/request/RequestParserUnitTest.java | 1 +
.../sts/token/provider/JWTProviderActAsTest.java | 1 +
.../token/provider/JWTProviderOnBehalfOfTest.java | 1 +
.../sts/token/provider/JWTTokenProviderTest.java | 1 +
.../cxf/sts/token/provider/SAMLClaimsTest.java | 1 +
.../token/provider/SAMLProviderKeyTypeTest.java | 1 +
.../cxf/sts/token/realm/RealmSupportTest.java | 1 +
.../renewer/SAMLTokenRenewerLifetimeTest.java | 1 +
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 2 +
.../token/renewer/SAMLTokenRenewerRealmTest.java | 1 +
.../sts/token/renewer/SAMLTokenRenewerTest.java | 1 +
.../SAMLTokenValidatorCachedRealmTest.java | 3 +-
.../token/validator/SAMLTokenValidatorTest.java | 2 +
.../asymmetric_encr/AsymmetricEncryptionTest.java | 1 +
.../systest/sts/basic_auth/JaxwsBasicAuthTest.java | 1 +
.../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 1 +
.../systest/sts/batch/SimpleBatchSTSClient.java | 1 +
.../BinarySecurityTokenTest.java | 1 +
.../cxf/systest/sts/caching/CachingTest.java | 1 +
.../systest/sts/caching/DoubleItPortTypeImpl.java | 1 -
.../cxf/systest/sts/caching/ServerCachingTest.java | 1 +
.../apache/cxf/systest/sts/claims/ClaimsTest.java | 1 +
.../cxf/systest/sts/claims/ClaimsValidator.java | 1 +
.../systest/sts/claims/StaxClaimsValidator.java | 1 +
.../systest/sts/common/CommonCallbackHandler.java | 2 +
.../systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../cxf/systest/sts/common/TokenTestUtils.java | 1 +
.../systest/sts/cross_domain/CrossDomainTest.java | 1 +
.../systest/sts/custom/CustomParameterTest.java | 1 +
.../custom_onbehalfof/CustomOnBehalfOfTest.java | 2 +-
.../LocalDoubleItPortTypeImpl.java | 1 +
.../SAMLDoubleItPortTypeImpl.java | 1 +
.../systest/sts/deployment/CustomClaimsParser.java | 1 +
.../DistributedCachingTest.java | 2 +-
.../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 1 +
.../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java | 1 +
.../systest/sts/kerberos/DoubleItPortTypeImpl.java | 1 +
.../sts/kerberos/IntermediaryPortTypeImpl.java | 1 +
.../sts/kerberos/KerberosDelegationTokenTest.java | 1 +
.../cxf/systest/sts/realms/DifferentRealmTest.java | 2 +-
.../cxf/systest/sts/renew/SAMLRenewTest.java | 2 +-
.../cxf/systest/sts/renew/SAMLRenewUnitTest.java | 1 +
.../sts/secure_conv/SCTSAMLTokenProvider.java | 1 +
.../sts/secure_conv/SecureConversationTest.java | 2 +-
.../secure_conv/SecurityContextTokenUnitTest.java | 1 +
.../apache/cxf/systest/sts/soap12/Soap12Test.java | 2 +
.../sts_sender_vouches/STSSenderVouchesTest.java | 1 +
.../sts/transformation/DoubleItPortTypeImpl.java | 1 +
.../sts/transformation/TransformationTest.java | 2 +-
.../sts/usernametoken/UsernameTokenTest.java | 1 +
.../sts/asymmetric/AsymmetricBindingTest.java | 1 +
.../apache/cxf/systest/sts/bearer/BearerTest.java | 1 +
.../systest/sts/common/CommonCallbackHandler.java | 2 +
.../systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../systest/sts/delegation/SAMLDelegationTest.java | 2 +
.../DoubleItPortTypeImpl.java | 1 +
.../IntermediaryCachingPortTypeImpl.java | 1 +
.../IntermediaryPortTypeImpl.java | 1 +
.../IntermediaryTransformationCachingTest.java | 1 +
.../IntermediaryTransformationTest.java | 1 +
.../apache/cxf/systest/sts/issuer/IssuerTest.java | 1 +
.../cxf/systest/sts/issueunit/IssueUnitTest.java | 2 +
.../org/apache/cxf/systest/sts/jaas/JAASTest.java | 1 +
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 1 +
.../sts/sendervouches/SenderVouchesTest.java | 1 +
.../cxf/systest/sts/stsclient/STSClientTest.java | 1 +
.../cxf/systest/sts/template/TemplateTest.java | 1 +
.../sts/transport/TransportBindingTest.java | 1 +
.../systest/sts/username_actas/ActAsValidator.java | 1 +
.../username_actas/UsernameActAsCachingTest.java | 1 +
.../sts/username_actas/UsernameActAsTest.java | 1 +
.../UsernameOnBehalfOfCachingTest.java | 1 +
.../UsernameOnBehalfOfTest.java | 1 +
.../sts/x509/X509AsymmetricBindingTest.java | 1 +
.../systest/sts/x509/X509SymmetricBindingTest.java | 1 +
.../sts/itests/BasicSTSIntegrationTest.java | 1 +
.../sts/itests/unit/CommonCallbackHandler.java | 2 +
.../cxf/systest/sts/itests/unit/STSUnitTest.java | 1 +
.../systest/sts/osgi/CommonCallbackHandler.java | 2 +
.../java/org/apache/cxf/wsn/client/PullPoint.java | 1 +
.../org/apache/cxf/wsn/AbstractSubscription.java | 1 +
.../cxf/wsn/services/JaxwsCreatePullPoint.java | 1 +
.../cxf/xkms/cache/EHCacheXKMSClientCache.java | 1 -
.../cxf/xkms/itests/BasicIntegrationTest.java | 2 +
.../handlers/validator/ValidatorCRLTest.java | 1 +
.../itests/handlers/validator/ValidatorTest.java | 1 +
.../cxf/xkms/itests/service/XKMSServiceTest.java | 1 +
.../cxf/xkms/itests/service/XKRSSDisableTest.java | 1 +
.../org/apache/cxf/xkms/service/CheckXKRSS.java | 1 +
.../cxf/xkms/x509/handlers/X509LocatorTest.java | 1 +
.../x509/repo/file/FileCertificateRepoTest.java | 1 +
.../apache/cxf/xkms/x509/utils/X509UtilsTest.java | 1 +
.../xkms/x509/validator/BasicValidationTest.java | 1 +
.../cxf/xkms/x509/validator/DateValidatorTest.java | 1 +
.../TrustedAuthorityValidatorCRLTest.java | 1 +
.../x509/repo/ldap/LDAPCertificateRepoTest.java | 1 +
.../systests/cdi/base/AbstractCdiMultiAppTest.java | 1 +
.../cdi/base/AbstractCdiSingleAppTest.java | 1 +
.../cxf/systests/cdi/base/BookStoreByIds.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../cxf/systest/grizzly/EndpointAPITest.java | 1 +
.../apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java | 1 +
.../jaxb/validators/CustomValidatorJAXBTest.java | 1 +
.../jaxrs/AbstractJAXRSContinuationsTest.java | 1 +
.../systest/jaxrs/JAXRSClientServerBookTest.java | 1 +
.../jaxrs/JAXRSClientServerNonSpringBookTest.java | 1 +
.../jaxrs/JAXRSClientServerODataSearchTest.java | 112 +++---
...ClientServerResourceCreatedOutsideBookTest.java | 1 +
...SClientServerResourceCreatedSpringBookTest.java | 1 +
.../jaxrs/JAXRSClientServerStreamingTest.java | 1 +
.../JAXRSClientServerUserResourceAsteriskTest.java | 1 +
.../JAXRSClientServerUserResourceDefaultTest.java | 1 +
.../jaxrs/JAXRSClientServerUserResourceTest.java | 1 +
.../jaxrs/JAXRSCxfContinuationsServlet3Test.java | 1 +
.../systest/jaxrs/JAXRSCxfContinuationsTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/XXETest.java | 1 +
.../AbstractSwagger2ServiceDescriptionTest.java | 2 +-
.../discovery/JAXRSServerSpringDiscoveryTest.java | 1 +
.../extraction/JAXRSClientServerTikaTest.java | 1 +
.../jaxrs/failover/FailoverWebClientTest.java | 1 +
.../failover/LoadDistributorWebClientTest.java | 1 +
.../jaxrs/provider/JsrJsonpProviderTest.java | 1 +
...patchClientServerWithMalformedResponseTest.java | 1 +
.../systest/handlers/AddNumbersServiceUnwrap.java | 1 +
.../handlers/AddNumbersServiceWithAnnotation.java | 1 +
.../handlers/DispatchHandlerInvocationTest.java | 2 +-
.../systest/handlers/HandlerInvocationTest.java | 2 +
.../HandlerInvocationUsingAddNumbersTest.java | 2 +-
.../cxf/systest/handlers/HandlerTestImpl.java | 2 +-
.../handlers/SpringConfiguredHandlerTest.java | 1 +
.../apache/cxf/systest/handlers/TestHandler.java | 1 -
.../cxf/systest/jaxws/AnyClientServerTest.java | 1 +
.../cxf/systest/jaxws/ArrayServiceServer.java | 1 +
.../org/apache/cxf/systest/jaxws/CXF5061Test.java | 1 +
.../org/apache/cxf/systest/jaxws/CXF6655Test.java | 1 +
.../jaxws/ClientServerGreeterBaseNoWsdlTest.java | 1 +
.../systest/jaxws/ClientServerGreeterBaseTest.java | 1 +
.../jaxws/ClientServerGreeterNoWsdlTest.java | 1 +
.../systest/jaxws/ClientServerMixedStyleTest.java | 1 +
.../systest/jaxws/ClientServerPartialWsdlTest.java | 2 +-
.../jaxws/ClientServerRPCLitDefatulAnnoTest.java | 1 +
.../cxf/systest/jaxws/ClientServerRPCLitTest.java | 1 +
.../apache/cxf/systest/jaxws/ClientServerTest.java | 1 +
.../systest/jaxws/DocLitBareCodeFirstService.java | 1 -
.../jaxws/DocLitWrappedCodeFirstService.java | 1 -
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 1 +
.../cxf/systest/jaxws/JaxwsExecutorTest.java | 1 +
.../apache/cxf/systest/jaxws/OASISCatalogTest.java | 1 -
.../JavaFirstSchemaValidationTest.java | 1 +
.../apache/cxf/systest/provider/CXF4130Test.java | 1 +
.../apache/cxf/systest/provider/CXF4818Test.java | 1 +
.../provider/NBProviderClientServerTest.java | 1 +
.../systest/provider/ProviderClientServerTest.java | 1 +
.../provider/ProviderRPCClientServerTest.java | 1 +
.../kerberos/common/DoubleItPortTypeImpl.java | 1 +
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 1 +
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 1 +
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 1 +
.../apache/cxf/jaxrs/servlet/AbstractSciTest.java | 1 +
.../servlet/jetty/JettyEmptyApplicationTest.java | 1 +
.../jetty/JettyEmptyPathApplicationTest.java | 1 +
.../servlet/jetty/JettyNoApplicationTest.java | 1 +
.../JettySingleApplicationOnlyClassesTest.java | 1 +
.../JettySingleApplicationOnlySingletonsTest.java | 1 +
.../servlet/jetty/JettySingleApplicationTest.java | 1 +
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 1 +
.../security/jose/jwejws/JweJwsReferenceTest.java | 1 +
.../jaxrs/security/jose/jwt/BookStoreAuthn.java | 1 +
.../jaxrs/security/jose/jwt/JWTPropertiesTest.java | 1 +
.../oauth/TemporaryCredentialServiceTest.java | 1 -
.../security/oauth2/common/OAuth2TestUtils.java | 1 +
.../security/oauth2/filters/OAuth2FiltersTest.java | 1 +
.../grants/AuthorizationGrantNegativeTest.java | 1 +
.../oauth2/grants/AuthorizationGrantTest.java | 1 +
.../oauth2/grants/IntrospectionServiceTest.java | 1 +
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 1 -
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 1 +
.../jaxrs/security/oidc/OIDCNegativeTest.java | 1 +
.../systest/jaxrs/security/oidc/UserInfoTest.java | 1 +
.../security/oidc/filters/OIDCFiltersTest.java | 1 +
.../systest/jaxrs/security/saml/JAXRSSamlTest.java | 1 +
.../security/saml/SamlRetrievalInterceptor.java | 1 -
.../jaxrs/security/samlsso/MetadataTest.java | 2 +
.../cxf/systest/jaxrs/tracing/brave/HasSpan.java | 1 -
.../tracing/brave/IsAnnotationContaining.java | 1 -
.../brave/IsBinaryAnnotationContaining.java | 1 -
.../htrace/HTraceTracingCustomHeadersTest.java | 1 +
.../jaxrs/tracing/htrace/HTraceTracingTest.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 1 -
.../jaxws/tracing/brave/BraveTracingTest.java | 1 +
.../jaxws/tracing/htrace/HTraceTracingTest.java | 1 +
.../testsuite/testcases/JavaFirstNoWsdlTest.java | 1 +
.../testsuite/testcases/SOAPJMSTestSuiteTest.java | 1 +
.../jms/testsuite/testcases/SoapJmsSpecTest.java | 1 +
.../apache/cxf/systest/jms/AbstractVmJMSTest.java | 1 +
.../cxf/systest/jms/JMSClientServerTest.java | 2 +
.../org/apache/cxf/systest/jms/JMSTestMtom.java | 1 +
.../org/apache/cxf/systest/jms/JaxWsAPITest.java | 1 +
.../HelloWorldContinuationsClientServerTest.java | 1 +
.../HelloWorldContinuationsThrottleTest.java | 1 +
.../JMSContinuationsClientServerTest.java | 1 +
.../continuations/ProviderJMSContinuationTest.java | 1 +
.../MultiTransportClientServerTest.java | 1 +
.../systest/jms/security/JMSWSSecurityTest.java | 1 +
.../cxf/systest/jms/shared/JMSSharedQueueTest.java | 1 +
.../cxf/systest/jms/swa/ClientServerSwaTest.java | 1 +
.../systest/jms/tx/GreeterImplWithTransaction.java | 1 +
.../cxf/systest/jms/tx/JMSTransactionTest.java | 1 +
.../java/org/apache/cxf/https/ssl3/SSLv3Test.java | 1 +
.../apache/cxf/systest/http/HTTPConduitTest.java | 1 +
.../cxf/systest/http/HTTPProxyConduitTest.java | 1 -
.../cxf/systest/http/PublishedEndpointUrlTest.java | 1 +
.../org/apache/cxf/systest/http/WSDLQueryTest.java | 1 +
.../cxf/systest/http/auth/DigestAuthTest.java | 1 +
.../systest/http_jetty/EngineLifecycleTest.java | 5 -
.../cxf/systest/http_jetty/JettyBasicAuthTest.java | 1 +
.../systest/http_jetty/JettyDigestAuthTest.java | 1 +
.../cxf/systest/http_jetty/ThreadPoolTest.java | 1 +
.../ClientServerWrappedContinuationTest.java | 1 +
.../https/ciphersuites/CipherSuitesTest.java | 1 +
.../systest/https/clientauth/ClientAuthTest.java | 1 +
.../cxf/systest/https/conduit/HTTPSClientTest.java | 1 +
.../systest/https/conduit/HTTPSConduitTest.java | 1 +
.../https/constraints/CertConstraintsTest.java | 1 +
.../https/hostname/HostnameVerificationTest.java | 1 +
.../cxf/systest/https/trust/TrustManagerTest.java | 1 +
.../systest/servlet/ErrorContextSerletTest.java | 1 +
.../cxf/cxf1226/MissingQualification1226Test.java | 1 +
.../RespectBindingFeatureClientServerTest.java | 1 +
.../cxf/systest/bus/BusExtensionLoadingTest.java | 1 +
.../apache/cxf/systest/bus/BusShutdownTest.java | 1 -
.../cxf/systest/bus/SpringBusFactoryTest.java | 2 +
.../systest/callback/CallbackClientServerTest.java | 1 +
.../LoadDistributorAddressOverrideTest.java | 3 +-
.../LoadDistributorSequentialStrategy.java | 1 +
.../clustering/LoadDistributorStaticStrategy.java | 1 +
.../systest/clustering/LoadDistributorTest.java | 3 +
.../coloc/AbstractHeaderServiceDocLitTest.java | 1 -
.../coloc/AbstractHeaderServiceRpcLitTest.java | 1 -
.../systest/coloc/AbstractWrappedDocLitTest.java | 2 +-
.../systest/coloc/BaseHeaderTesterDocLitImpl.java | 2 +-
.../cxf/systest/coloc/ColocHeaderDocLitTest.java | 1 +
.../cxf/systest/coloc/ColocHeaderRpcLitTest.java | 1 +
.../cxf/systest/coloc/ColocWrappedDocLitTest.java | 1 +
.../apache/cxf/systest/corba/BaseGreeterImpl.java | 1 +
.../cxf/systest/corba/BaseGreeterTimeoutImpl.java | 1 +
.../corba/CorbaBindingFactoryConfigurerTest.java | 1 +
.../org/apache/cxf/systest/corba/CorbaTest.java | 1 +
.../apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 +
.../cxf/systest/cxf6319/Cxf6319TestCase.java | 1 +
.../org/apache/cxf/systest/cxf993/Cxf993Test.java | 2 +
.../cxf/systest/jca/OutBoundConnectionTest.java | 1 +
.../apache/cxf/systest/js/JSClientServerTest.java | 1 +
.../management/CountersClientServerTest.java | 1 +
.../management/ManagedClientServerTest.java | 1 +
.../cxf/systest/mtom/ClientMtomXopWithJMSTest.java | 1 +
.../systest/mtom/TestAttachmentOutInterceptor.java | 1 +
.../mtom/TestMultipartMessageInterceptor.java | 1 +
.../cxf/systest/mtom_bindingtype/HelloImpl.java | 1 +
.../mtom_bindingtype/MTOMBindingTypeTest.java | 1 +
.../apache/cxf/systest/mtom_feature/HelloImpl.java | 1 +
.../cxf/systest/mtom_feature/ImageHelper.java | 1 +
.../mtom_feature/MtomFeatureClientServerTest.java | 1 +
.../systest/outofband/header/OOBHeaderTest.java | 4 +-
.../cxf/systest/outofband/header/Server.java | 2 -
.../cxf/systest/resolver/JarResolverTest.java | 1 +
.../systest/schemaimport/sayhi2/SayHiArray.java | 1 +
.../schemaimport/sayhi2/SayHiArrayResponse.java | 1 +
.../cxf/systest/simple/SimpleFrontendTest.java | 1 +
.../apache/cxf/systest/soap/SoapActionTest.java | 1 +
.../systest/soapheader/HeaderClientServerTest.java | 1 +
.../cxf/systest/stringarray/StringArrayTest.java | 1 +
.../AppleFindClientServerTest.java | 1 +
.../type_substitution/TypeSubClientServerTest.java | 1 +
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../systest/type_test/AbstractTypeTestClient4.java | 1 +
.../systest/type_test/AbstractTypeTestClient5.java | 1 +
.../type_test/corba/CORBADocLitClientTypeTest.java | 1 +
.../versioning/ClientServerVersioningTest.java | 1 +
.../cxf/systest/ws/rm/DecoupledBareTest.java | 1 +
.../ws/rm/DecoupledClientServerOnewayTest.java | 1 +
.../systest/ws/rm/DecoupledClientServerTest.java | 1 +
.../examples/common/DoubleItPortTypeImpl.java | 1 +
.../systest/wssec/examples/saml/SamlTokenTest.java | 1 +
.../examples/secconv/SecureConversationTest.java | 1 +
.../wssec/examples/ut/UsernameTokenTest.java | 1 +
.../systest/wssec/examples/x509/X509TokenTest.java | 1 +
.../apache/cxf/systest/ws/action/ActionTest.java | 1 +
.../systest/ws/action/SignatureWhitespaceTest.java | 1 +
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 1 -
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 1 -
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 1 +
.../systest/ws/bindings/BindingPropertiesTest.java | 1 +
.../apache/cxf/systest/ws/cache/CachingTest.java | 1 +
.../systest/ws/common/DoubleItPortTypeImpl.java | 1 +
.../CryptoCoverageCheckerTest.java | 1 +
.../org/apache/cxf/systest/ws/fault/FaultTest.java | 1 +
.../cxf/systest/ws/fault/ModifiedRequestTest.java | 2 +
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 1 +
.../systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 1 +
.../apache/cxf/systest/ws/httpget/HTTPGetTest.java | 1 +
.../cxf/systest/ws/https/HttpsTokenTest.java | 1 +
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 1 +
.../org/apache/cxf/systest/ws/parts/PartsTest.java | 1 +
.../JavaFirstURIDomainExpressionBuilder.java | 3 +
.../systest/ws/policy/PolicyAlternativeTest.java | 1 +
.../handler/PolicyHandlerFaultResponseTest.java | 1 +
.../apache/cxf/systest/ws/saml/SamlTokenTest.java | 1 +
.../ws/saml/subjectconf/SamlSubjectConfTest.java | 1 +
.../systest/ws/security/WSSecurityClientTest.java | 1 +
.../cxf/systest/ws/security/handler/WSSecTest.java | 1 +
.../apache/cxf/systest/ws/swa/SWAActionTest.java | 1 +
.../apache/cxf/systest/ws/swa/SWAPolicyTest.java | 1 +
.../systest/ws/tokens/BinarySecurityTokenTest.java | 2 +
.../cxf/systest/ws/tokens/DoubleItBSTImpl.java | 1 +
.../ws/tokens/EndorsingSupportingTokenTest.java | 1 +
.../cxf/systest/ws/tokens/SupportingTokenTest.java | 1 +
.../systest/ws/ut/UsernameTokenDerivedTest.java | 1 -
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 1 +
.../cxf/systest/ws/ut/UsernameTokenTest.java | 1 +
.../cxf/systest/ws/wssc/PingServiceImpl.java | 1 -
.../apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 1 +
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity111Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity112Test.java | 1 +
.../cxf/systest/ws/wssec11/WSSecurity11Common.java | 1 -
.../systest/ws/x509/DoubleItPropertiesImpl.java | 1 -
.../cxf/systest/ws/x509/SHA512PolicyLoader.java | 1 +
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 1 +
.../org/apache/cxf/systest/ws/xkms/XKMSTest.java | 1 +
.../ws/addr_feature/WSAClientServerTest.java | 2 +
.../systest/ws/addr_fromjava/WSAFromJavaTest.java | 1 +
.../WSAResponsesClientServerTest.java | 1 +
...SDLAddrPolicyAttachmentJaxwsMMProviderTest.java | 1 +
.../cxf/systest/ws/addressing/MAPTestBase.java | 1 +
.../ws/addressing/spring/WSAFeatureTest.java | 1 +
.../ws/addressing/spring/WSAFeatureXmlTest.java | 1 +
.../org/apache/cxf/systest/ws/mex/MEXTest.java | 1 +
.../ws/policy/AddressingAnonymousPolicyTest.java | 1 +
.../ws/policy/AddressingInlinePolicyTest.java | 1 +
...dressingPolicyExternalAttachmentWsdl11Test.java | 1 +
.../systest/ws/policy/HTTPClientPolicyTest.java | 1 +
.../systest/ws/policy/HTTPServerPolicyTest.java | 1 +
.../org/apache/cxf/test/AbstractCXFSpringTest.java | 2 +
.../main/java/org/apache/cxf/test/XPathAssert.java | 1 -
.../testutil/common/AbstractTestServerBase.java | 1 +
.../cxf/testutil/handler/TrivialSOAPHandler.java | 1 +
.../AnnotatedGreeterImpl.java | 1 +
.../AnnotatedGreeterNoOverloadImpl.java | 1 +
.../hello_world_soap_http/BaseGreeterImpl.java | 1 -
.../hello_world_soap_http/DocLitBareImpl.java | 1 +
.../header_test/rpc/TestRPCHeaderTest.java | 1 +
.../apache/cxf/tools/common/ProcessorTestBase.java | 1 +
.../main/java/org/apache/cxf/tools/common/Tag.java | 1 +
.../cxf/tools/common/model/JavaInterface.java | 1 +
.../apache/cxf/tools/common/model/JavaPort.java | 2 +
.../apache/cxf/tools/common/model/JavaType.java | 1 +
.../cxf/tools/common/toolspec/ToolContext.java | 6 +-
.../cxf/tools/common/model/JAnnotationTest.java | 1 +
.../common/toolspec/AbstractToolContainerTest.java | 1 +
.../tools/common/toolspec/ToolExceptionTest.java | 1 +
.../cxf/tools/common/toolspec/ToolSpecTest.java | 1 +
.../cxf/tools/common/toolspec/ToolSupportTest.java | 1 +
.../toolspec/parser/CommandLineParserTest.java | 1 +
.../org/apache/cxf/tools/util/StAXUtilTest.java | 1 +
.../apache/cxf/tools/util/URIParserUtilTest.java | 1 +
.../java/org/apache/cxf/tools/corba/IDLToWSDL.java | 1 -
.../apache/cxf/tools/corba/common/WSDLUtils.java | 2 -
.../processors/idl/ConstrTypeSpecVisitor.java | 2 +
.../corba/processors/idl/ParamTypeSpecVisitor.java | 2 +
.../processors/idl/SimpleTypeSpecVisitor.java | 2 +
.../processors/idl/TemplateTypeSpecVisitor.java | 2 +
.../corba/processors/WSDLToCorbaBindingTest.java | 1 +
.../processors/WSDLToCorbaBindingTypeTest.java | 1 +
.../corba/processors/WSDLToIDLGenerationTest.java | 1 +
.../tools/corba/utils/TestWSDLCorbaWriterImpl.java | 1 -
.../generator/wsdl11/FaultBeanGenerator.java | 1 +
.../internal/SpringServiceBuilderFactory.java | 1 -
.../org/apache/cxf/tools/fortest/ImageSender.java | 1 +
.../fortest/cxf523/Operation0ResponseType.java | 1 +
.../apache/cxf/tools/fortest/cxf774/ListTest.java | 1 -
.../cxf/tools/fortest/cxf774/ListTestImpl.java | 6 +-
.../cxf/tools/fortest/date/EchoCalendar.java | 1 +
.../apache/cxf/tools/fortest/date/EchoDate.java | 1 +
.../java2js/processor/JavaToJSProcessorTest.java | 1 +
.../cxf/tools/java2wsdl/JavaToWSFlagTest.java | 1 +
.../wsdl11/DateTypeCustomGeneratorTest.java | 1 +
.../generator/wsdl11/FaultBeanGeneratorTest.java | 1 +
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 1 +
.../wsdl11/annotator/WrapperBeanAnnotatorTest.java | 2 +
.../annotator/WrapperBeanFieldAnnotatorTest.java | 1 +
.../java2wsdl/processor/FrontendFactoryTest.java | 1 +
.../internal/ServiceBuilderFactoryTest.java | 1 +
.../processor/internal/jaxws/FaultBeanTest.java | 1 +
.../jaxws/JaxwsServiceBuilderNoAnnoTest.java | 1 +
.../internal/jaxws/JaxwsServiceBuilderTest.java | 1 +
.../internal/jaxws/RequestWrapperTest.java | 1 +
.../internal/jaxws/ResponseWrapperTest.java | 1 +
.../processor/internal/jaxws/WrapperTest.java | 2 +
.../test/java/org/apache/xmladapter/Greeter.java | 1 -
.../cxf/tools/validator/internal/Stax2DOM.java | 1 +
.../tools/validator/internal/ValidationResult.java | 1 +
.../tools/validator/internal/WSDL11Validator.java | 1 +
.../cxf/tools/validator/internal/model/XNode.java | 1 +
.../cxf/tools/validator/WSDLValidationTest.java | 1 +
.../validator/internal/WSDL11ValidatorTest.java | 1 +
.../cxf/tools/wsdlto/core/FrontEndProfile.java | 1 +
.../cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 1 +
.../tools/wsdlto/core/AbstractGeneratorTest.java | 1 +
.../databinding/jaxb/ClassNameAllocatorImpl.java | 1 +
.../wsdlto/javascript/WSDLToJavaScriptTest.java | 1 +
.../jaxws/customization/CustomNodeSelector.java | 1 +
.../jaxws/customization/CustomizationParser.java | 1 +
.../customization/JAXWSBindingDeserializer.java | 7 +-
.../jaxws/processor/WSDLToJavaProcessor.java | 1 +
.../jaxws/validator/UniqueBodyValidator.java | 1 +
.../WrapperStyleNameCollisionValidator.java | 1 +
.../tools/wsdlto/frontend/jaxws/CatalogTest.java | 1 +
.../processor/internal/ParameterProcessorTest.java | 1 +
.../internal/annotator/WebMethodAnnotatorTest.java | 1 +
.../internal/annotator/WebParamAnnotatorTest.java | 1 +
.../annotator/XmlSeeAlsoAnnotatorTest.java | 1 +
.../internal/mapper/InterfaceMapperTest.java | 1 +
.../internal/mapper/MethodMapperTest.java | 1 +
.../jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 +
.../cxf/tools/misc/processor/address/Address.java | 1 +
.../misc/processor/WSDLToServiceProcessorTest.java | 1 +
.../misc/processor/WSDLToXMLProcessorTest.java | 1 +
.../misc/processor/XSDToWSDLProcessorTest.java | 1 +
.../cxf/tools/wsdlto/AbstractCodeGenTest.java | 1 +
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 1 +
.../tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java | 1 +
.../apache/cxf/tools/wsdlto/jaxws/CatalogTest.java | 1 +
.../cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java | 1 +
.../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 1 +
.../cxf/tools/wsdlto/validator/ValidatorTest.java | 1 +
975 files changed, 1557 insertions(+), 845 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index e99359d..1848c96 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.endpoint.ClientLifeCycleManager;
import org.apache.cxf.endpoint.ServerLifeCycleListener;
import org.apache.cxf.endpoint.ServerLifeCycleManager;
import org.apache.cxf.feature.Feature;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
@@ -127,7 +128,7 @@ public class OSGiBusListenerTest extends Assert {
}
private void setUpClientLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
EasyMock.expect(bundleContext.getServiceReferences(ClientLifeCycleListener.class.getName(), null))
.andReturn(svcrefs);
ClientLifeCycleManager lcmanager = control.createMock(ClientLifeCycleManager.class);
@@ -143,7 +144,7 @@ public class OSGiBusListenerTest extends Assert {
}
private void setUpServerLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
EasyMock.expect(bundleContext.getServiceReferences(ServerLifeCycleListener.class.getName(), null))
.andReturn(svcrefs);
ServerLifeCycleManager lcmanager = control.createMock(ServerLifeCycleManager.class);
@@ -160,7 +161,7 @@ public class OSGiBusListenerTest extends Assert {
private void setFeatures(String[] names, String[] restricted,
Collection<Feature> lst) throws Exception {
- ServiceReference<Object>[] svcrefs = createTestServiceReferences(names, restricted);
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null))
.andReturn(svcrefs);
for (int i = 0; i < names.length; i++) {
@@ -172,9 +173,8 @@ public class OSGiBusListenerTest extends Assert {
}
// Creates test service references with the specified symbolic names and the restricted extension properties.
- private ServiceReference<Object>[] createTestServiceReferences(String[] names, String[] restricted) {
- @SuppressWarnings("unchecked")
- ServiceReference<Object>[] refs = new ServiceReference[names.length];
+ private ServiceReference[] createTestServiceReferences(String[] names, String[] restricted) {
+ ServiceReference[] refs = new ServiceReference[names.length];
for (int i = 0; i < names.length; i++) {
refs[i] = createTestServiceReference(names[i], restricted[i]);
}
@@ -183,9 +183,8 @@ public class OSGiBusListenerTest extends Assert {
// Creates a test service reference with the specified symbolic name and the restricted extension property.
- private ServiceReference<Object> createTestServiceReference(String name, String rst) {
- @SuppressWarnings("unchecked")
- ServiceReference<Object> ref = control.createMock(ServiceReference.class);
+ private ServiceReference createTestServiceReference(String name, String rst) {
+ ServiceReference ref = control.createMock(ServiceReference.class);
Bundle b = control.createMock(Bundle.class);
EasyMock.expect(b.getSymbolicName()).andReturn(name).anyTimes();
EasyMock.expect(ref.getBundle()).andReturn(b).anyTimes();
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index ea8be84..3161adf 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.message.Message;
+
import org.junit.Assert;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 535144f..7912941 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -30,8 +30,10 @@ import javax.xml.namespace.QName;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurable;
+
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
index 4c59c93..35081cc 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
diff --git a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
index de4c0a6..da6b8ca 100644
--- a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
+++ b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
@@ -26,6 +26,7 @@ import javax.enterprise.inject.spi.ProcessBean;
import javax.ws.rs.Path;
import org.apache.cxf.Bus;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
index ac662da..d0ccb16 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
@@ -30,6 +30,7 @@ import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnection;
import javax.resource.spi.ManagedConnectionMetaData;
import javax.security.auth.Subject;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
import org.apache.cxf.jca.cxf.CXFManagedConnectionMetaData;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
index 6a38260..4aa8814 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
@@ -20,6 +20,7 @@ package org.apache.cxf.jca.core.resourceadapter;
import java.util.*;
import java.util.logging.Logger;
+
import org.apache.cxf.common.logging.LogUtils;
public class UriHandlerInit {
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
index 2bcdc38..217736c 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
@@ -30,7 +30,6 @@ import javax.resource.spi.ManagedConnection;
import javax.security.auth.Subject;
import org.apache.cxf.Bus;
-//import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
index 4445627..f4be880 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
@@ -39,7 +39,6 @@ import javax.transaction.xa.XAResource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
-
import org.apache.cxf.jca.inbound.InboundEndpoint;
import org.apache.cxf.jca.inbound.MDBActivationSpec;
import org.apache.cxf.jca.inbound.MDBActivationWork;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index 19f7e8b..97f3389 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jca.outbound;
import java.io.PrintWriter;
-
import java.util.Iterator;
import java.util.Set;
import java.util.logging.Level;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 7a7c235..480cf2a 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -27,6 +27,7 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 892e31b..359847e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -24,6 +24,7 @@ import java.util.logging.Handler;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index e5fc448..4cb810d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -22,6 +22,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index 1e295d9..3308e7f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -18,17 +18,13 @@
*/
package org.apache.cxf.jca.cxf;
-//import java.lang.reflect.Method;
import java.util.Properties;
import javax.resource.ResourceException;
-
-//import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ResourceAdapter;
-
import org.apache.cxf.Bus;
-//import org.apache.cxf.jca.cxf.test.DummyBus;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index 5b5100c..05fdb59 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -28,6 +28,7 @@ import javax.resource.ResourceException;
import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
import org.apache.cxf.test.AbstractCXFTest;
+
import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 55c4ae8..e3d07af 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index 32dd1fe..03e81f9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.connector.Connection;
import org.apache.cxf.jca.cxf.handlers.ProxyInvocationHandler;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 8ab1f2e..200270c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -26,12 +26,11 @@ import javax.resource.spi.ConnectionEventListener;
import javax.security.auth.Subject;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index ca9b11f..b6782da 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -33,6 +33,7 @@ import javax.resource.spi.ResourceAdapter;
import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
index b0759e6..ecfeded 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jca.cxf.handlers;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnectionFactory;
+
import org.junit.Test;
public abstract class AbstractInvocationHandlerTest
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index e62efcb..acf84ec 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -25,6 +25,7 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnection;
import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
import org.apache.cxf.jca.cxf.ManagedConnectionImpl;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index 6b18e1f..4788e16 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -28,6 +28,7 @@ import javax.security.auth.Subject;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
index 008b500..268c15f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Proxy;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index b134f66..2f7094c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Proxy;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
index 2934f2d..eac383f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index f154cd3..cd2fa7c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
index 320e687..2c381af 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Test;
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index 6ed9fd7..c7aaaea 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -22,6 +22,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
index 2e0c6a1..d230446 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
-
import brave.http.HttpTracing;
public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index fc2ccf0..adce889 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -31,7 +31,6 @@ import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Request;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Response;
import org.apache.cxf.tracing.brave.internal.HttpClientAdapterFactory;
-
import brave.Span;
import brave.Tracer.SpanInScope;
import brave.http.HttpClientAdapter;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index aaa4bf3..fdd71d7 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -31,7 +31,6 @@ import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Request;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Response;
import org.apache.cxf.tracing.brave.internal.HttpServerAdapterFactory;
-
import brave.Span;
import brave.Tracer.SpanInScope;
import brave.http.HttpServerAdapter;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
index 7e4a7c6..33f043b 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
@@ -25,7 +25,6 @@ import org.apache.cxf.annotations.Provider.Type;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
index 34e944d..edc2da5 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
@@ -22,7 +22,6 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.tracing.brave.AbstractBraveInterceptor.ParsedMessage;
-
import brave.http.HttpTracing;
public class BraveClientStartInterceptor extends AbstractBraveClientInterceptor {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
index ebca21a..05a0111 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tracing.brave;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 5f1e010..fe54c11 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -27,7 +27,6 @@ import org.apache.cxf.annotations.Provider.Type;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
index 4df7c7e..2790418 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
@@ -22,7 +22,6 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
@NoJSR250Annotations
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
index 75d1d3a..eed79e6 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -28,7 +28,6 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
@NoJSR250Annotations
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index e4479cd..d22de43 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Callable;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
-
import brave.Span;
import brave.Tracer;
import brave.Tracer.SpanInScope;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
index a139e06..7b61207 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tracing.brave;
import org.apache.cxf.common.util.StringUtils;
-
import brave.http.HttpAdapter;
import brave.http.HttpClientParser;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
index dbd477e..1de70f3 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tracing.brave;
import org.apache.cxf.common.util.StringUtils;
-
import brave.http.HttpAdapter;
import brave.http.HttpServerParser;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
index e08553a..b42c01e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
@@ -29,7 +29,6 @@ import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.AbstractBraveClientProvider;
import org.apache.cxf.tracing.brave.HttpClientSpanParser;
import org.apache.cxf.tracing.brave.TraceScope;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
index 1f67112..ff179ee 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
@@ -22,7 +22,6 @@ import org.apache.cxf.jaxrs.ext.ContextProvider;
import org.apache.cxf.message.Message;
import org.apache.cxf.tracing.TracerContext;
import org.apache.cxf.tracing.brave.BraveTracerContext;
-
import brave.Span;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index 6652604..c2cac38 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.FeatureContext;
import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.HttpServerSpanParser;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
index 7a21626..ea5705c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
@@ -32,7 +32,6 @@ import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.AbstractBraveProvider;
import org.apache.cxf.tracing.brave.TraceScope;
-
import brave.http.HttpTracing;
@Provider
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
index d0d84fb..c95d55f 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tracing.htrace.ext;
import org.apache.htrace.core.Span;
import org.apache.htrace.core.Tracer;
-
import ch.qos.logback.classic.pattern.ClassicConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 812eb18..1348881 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -45,6 +45,7 @@ import javax.inject.Inject;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.features.FeaturesService;
+
import org.junit.Assert;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
@@ -58,6 +59,7 @@ import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
+
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index ccccdcc..4f5b80b 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,8 +38,10 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
+
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 3aa9c1a..c10e109 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 7a797e8..eb58223 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -27,6 +27,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
import org.apache.cxf.transport.jms.ConnectionFactoryFeature;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
index 51e3a34..02f044f 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.cxf.Bus;
import org.apache.cxf.karaf.commands.CXFController;
-
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
index 8eea8bd..19dbbd5 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
@@ -20,12 +20,10 @@ package org.apache.cxf.binding.coloc;
import java.util.SortedSet;
import java.util.TreeSet;
-//import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
-//import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain;
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
index 34a5b45..5dfd915 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
@@ -41,12 +41,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-//import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
-//import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.transport.MessageObserver;
public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 7cbc32d..cf54b64 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index 54082c1..d02c0ac 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index 8937e1e..65239c7 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -45,9 +45,9 @@ import org.apache.headers.coloc.types.FaultDetailT;
import org.apache.headers.coloc.types.InHeaderT;
import org.apache.headers.coloc.types.OutHeaderT;
import org.apache.headers.rpc_lit.PingMeFault;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
index 7681de1..bc8bea0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
@@ -26,7 +26,6 @@ import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-
import org.apache.cxf.service.model.BindingInfo;
public class CorbaBinding extends AbstractBasicInterceptorProvider implements Binding {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
index 4496838..4f2aef5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba;
import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
-
import org.omg.CORBA.portable.Streamable;
public interface CorbaStreamable extends Streamable {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
index b466d23..f3c45ee 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
-
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
index 3c4e4a4..4a1f7b3 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
@@ -26,7 +26,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
index 4dd3829..a9c331b 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
@@ -27,7 +27,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public abstract class AbstractStartEndEventProducer implements
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
index 8032fb6..9335d61 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaAnonStructEventProducer extends AbstractNoStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
index bf2cc59..d1026d6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaTypeMap;
-
import org.omg.CORBA.Any;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
index d75f64b..4597291 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaArrayEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
index 85ca420..d85dc75 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaExceptionEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
index 2d3e0b5..3472317 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.Anonfixed;
import org.apache.cxf.binding.corba.wsdl.Fixed;
-
import org.omg.CORBA.TypeCode;
public final class CorbaFixedHandler extends CorbaObjectHandler {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
index 3c348bb..343410a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
@@ -22,7 +22,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
-
import org.omg.CORBA.Any;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
index d236eae..80bc92d 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import org.apache.cxf.binding.corba.utils.CorbaObjectReferenceHelper;
import org.apache.cxf.binding.corba.utils.CorbaUtils;
-
import org.omg.CORBA.ORB;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
index ea5f091..f38160d 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaPrimitiveSequenceEventProducer extends AbstractNoStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
index dd7393b..e83c523 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaSequenceEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
index 41845c7..9011ab4 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
index 72fcf68..527681b 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
@@ -29,7 +29,6 @@ import org.apache.cxf.binding.corba.wsdl.Enum;
import org.apache.cxf.binding.corba.wsdl.Enumerator;
import org.apache.cxf.binding.corba.wsdl.Union;
import org.apache.cxf.binding.corba.wsdl.Unionbranch;
-
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
index a83fced..178a70c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
@@ -26,7 +26,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class ParameterEventProducer implements CorbaTypeEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
index 514d94f..fdf2f71 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-//import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
index 51bb16f..9fe15b2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class WrappedParameterSequenceEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 39d67a1..08e44d8 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -25,8 +25,6 @@ import java.util.Set;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -41,6 +39,7 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index 5e46043..40cc1f0 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index b12a902..ab44a92 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -46,6 +46,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index 6598ef6..b98916a 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -18,15 +18,13 @@
*/
package org.apache.cxf.binding.corba;
-
-
-
import org.apache.cxf.binding.corba.utils.OrbConfig;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 42c9e20..b3a7607 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index d9a329d..921ce7e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 766f42e..2246bf4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
index f209d0a..88b39fb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
@@ -19,7 +19,9 @@
package org.apache.cxf.binding.corba;
import java.net.URL;
+
import javax.xml.namespace.QName;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index ce972bd..adba3ae 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -30,7 +30,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.corba.CorbaDestination;
import org.apache.cxf.binding.corba.TestUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.MessageObserver;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index e05cee1..56d8ec0 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.binding.corba.wsdl.MemberType;
import org.apache.cxf.binding.corba.wsdl.Sequence;
import org.apache.cxf.binding.corba.wsdl.Struct;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 4fc4ab4..04bf0ad 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.binding.corba.wsdl.MemberType;
import org.apache.cxf.binding.corba.wsdl.Sequence;
import org.apache.cxf.binding.corba.wsdl.Struct;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index 5c08bc9..77ae148 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba.runtime;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index f38e5b3..cd772f9 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba.runtime;
import javax.xml.stream.XMLStreamException;
import org.apache.cxf.binding.corba.types.AbstractCorbaTypeListener;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 53ccd61..daf0c94 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index ac42dfd..a3129cf 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaTypeMap;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index db5b223..1e59d65 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -22,6 +22,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.Array;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index b002a14..6562255 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 0d761c8..14fea5d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 2ce5065..84e62e1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -20,9 +20,8 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index cf41815..b7e27d4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -20,10 +20,9 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.Sequence;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index d92d754..4552761 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index 6b0a6e9..7e08425 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaTypeMap;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
index 625c59c..7eebab2 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.soap.wsdl11;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 5cfa694..5c4dfb0 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.message.Attachment;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
index 50add7c..fba64aa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
index fc356d1..34cf647 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 7f87165..df05d35 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index 75f3c21..0547f20 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index 777f06f..c820440 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -45,8 +45,8 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index cfc3c35..32e814b 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.binding.soap;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index 16250a6..24826b2 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 3d5960c..608ae23 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -44,6 +44,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 206b752..a497d4a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -30,9 +30,9 @@ import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index ce1ff61..029b2b6 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -37,9 +37,9 @@ import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessageInfo.Type;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 4751f4e..536c335 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -25,9 +25,9 @@ import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapBinding;
import org.apache.cxf.binding.soap.SoapFault;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index afff3b9..3660ea9 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index a5a0a0f..b605894 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
import org.apache.cxf.headers.Header;
import org.apache.cxf.interceptor.StaxInInterceptor;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
index 74a9b98..44f2fea 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.xml.wsdl11;
import java.util.Map;
+
import javax.wsdl.Binding;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
index 447219b..7461133 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.xml.wsdl11;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.namespace.QName;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index 12000cd..42014c9 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index 9ef4243..e2902e2 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -51,6 +51,7 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index c1c1808..0f2477c 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.types.FaultDetail;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
index 3db2888..ec168f9 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
import org.apache.hello_world_xml_http.wrapped.types.GreetMe;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
index cb4c8bd..1148de3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
@@ -20,6 +20,7 @@
package org.apache.cxf.aegis;
import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
import org.apache.cxf.aegis.type.AegisType;
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
index 624428e..c1497c3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
+
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.type.basic.ArrayType;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
index 6066e9e..6845e95 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
@@ -74,6 +74,7 @@ import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.constants.Constants;
import org.apache.ws.commons.schema.utils.NamespaceMap;
+
import org.junit.Before;
public abstract class AbstractAegisTest extends AbstractCXFTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
index 5c5b3b1..ce7f583 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
index d0115b6..7d0575a 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.feature.LoggingFeature;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Test;
public class ExceptionInheritanceTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
index 28dec08..aeee74c 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
index b9c9276..8d00c63 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.services.AddNumbers;
import org.apache.cxf.aegis.services.ArrayService;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
index e32730f..df56b88 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.aegis.namespaces.impl.NameServiceImpl;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+
import org.junit.Test;
/**
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
index 024b06d..209c81d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.aegis.namespaces.impl;
import java.util.ArrayList;
import java.util.List;
+
import javax.jws.WebService;
import org.apache.cxf.aegis.namespaces.data.Name;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
index fb86f18..2a78166 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.inheritance.Employee;
import org.apache.cxf.databinding.DataReader;
+
import org.junit.Test;
/**
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
index 5a11185..50ddff0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
index 02c9362..d71b207 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.aegis.services.base64;
import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
+
import org.junit.Test;
public class BinaryDataTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index fbc5ee9..e4d0ec2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -32,8 +32,10 @@ import org.apache.cxf.aegis.AegisReader;
import org.apache.cxf.aegis.services.SimpleBean;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.test.TestUtilities;
+
import org.junit.Before;
import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
index dcb62a8..1e8244f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Test;
public class DuplicateArrayTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
index 7bffacb..64523f8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.cxf.aegis.type.basic;
-import junit.framework.TestCase;
-
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.TypeMapping;
+
+import org.junit.Assert;
import org.junit.Test;
-public class BadXMLTest extends TestCase {
+public class BadXMLTest {
TypeMapping mapping;
@@ -36,7 +36,7 @@ public class BadXMLTest extends TestCase {
mapping = context.getTypeMapping();
try {
mapping.getTypeCreator().createType(BadBeanDescriptor.class);
- fail("No exception was thrown");
+ Assert.fail("No exception was thrown");
} catch (DatabindingException e) {
// this is supposed to happen
}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index 81c0b6f..a41daa3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.xml.stax.ElementReader;
+
import org.junit.Test;
public class DynamicProxyTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index 55d89f5..43d6af6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
import org.apache.cxf.aegis.xml.stax.ElementReader;
+
import org.junit.Test;
public class SoapArrayTypeTest extends AbstractEncodedTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index c3aa7b2..1b40077 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.aegis.type.encoded;
import java.util.Map;
import java.util.TreeMap;
+
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
index 8b42c77..c0a0ffb 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Test;
public class StudentTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index 314912d..3310f32 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.aegis.type.map.ns2.ObjectWithAMapNs2;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
index 8aa3bd7..e136156 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Test;
public class MissingTypeWSDLTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index 8e228a4..599d57f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.AbstractCXFTest;
+
import org.junit.Test;
public class ReaderTest extends AbstractCXFTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
index e702f3b..e1cb720 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.test.AbstractCXFTest;
import org.jdom.Document;
import org.jdom.output.DOMOutputter;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 7df1191..d10ac86 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -59,7 +59,9 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.xml.sax.InputSource;
+
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.jaxb.JAXBBeanInfo;
import org.apache.cxf.common.jaxb.JAXBContextCache;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index 20eb683..9c061b4 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -54,8 +54,8 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
index 572cac1..9358b82 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
@@ -36,9 +36,9 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index b458256..f08d289 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -53,8 +53,8 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index e75ada7..7edb019 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -68,9 +68,9 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index d4cabb9..c46d7e9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -66,6 +66,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.apache.hello_world_soap_http.types.StringStruct;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index f556120..77858da 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.cxf.databinding.WrapperHelper;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index 35a1b3b..3a4a5f2 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -52,6 +52,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index f4d3405..4988e96 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -37,6 +37,7 @@ import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_rpclit.types.MyComplexStruct;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index 0d64e64..d948c5d 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java
index 0fb98df..eeea455 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
index 9cc6179..38222c4 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ext.logging;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
import org.apache.cxf.ext.logging.event.PrettyLoggingFilter;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
index 20e29d0..e671924 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
@@ -45,6 +45,7 @@ import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index c873454..cc4a1b6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -56,8 +56,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 0477192..6ee0cc2 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -47,8 +47,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index 953d3b6..bcce816 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -30,9 +30,9 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.Servlet3ContinuationProvider;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index 314b87e..6a87099 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -39,9 +39,9 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index aa77e8b..fee2d47 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 369d3e5..fdf0a73 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -59,8 +59,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 60f9df9..2598054 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -43,9 +43,9 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index 5247ba9..18f8940 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index 958d06a..d162e9e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
index 7029e85..ef9ce9c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxrs.provider;
import org.apache.cxf.Bus;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index b3b1350..dc747a1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -95,8 +95,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index f0fef24..7758210 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -70,8 +70,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index 39b5c1e..9a5c2be 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -45,8 +45,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index d92b090..b7b2db7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -24,6 +24,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
index f4941a6..0a9bb9a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
@@ -47,12 +47,14 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
+
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index c0daf3a..237a8ac 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.jaxrs.Customer;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index ad78c24..c7570bc 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -29,8 +29,8 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.message.Message;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index 2dbcace..b7626cf 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index edbcd55..a7d6660 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -44,8 +44,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 1a5a6ea..a72c3c6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -105,8 +105,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
index ccb85f3..b21fb35 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.logging.Logger;
+
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
index ae65c57..68342b5 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
@@ -21,7 +21,9 @@ package org.apache.cxf.jaxws.blueprint;
import java.util.StringTokenizer;
import java.util.UUID;
+
import javax.xml.namespace.QName;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
index bb05e8d..0df8b92 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
@@ -27,7 +27,6 @@ import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.frontend.spring.ClientProxyFactoryBeanDefinitionParser;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
index 45118a3..7744000 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
@@ -39,7 +39,6 @@ import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
index e66486b..39e7c97 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
index 34ce936..def2042 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
@@ -46,6 +46,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
+
import org.junit.Test;
public class CodeFirstWSDLTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 7644900..ca8b604 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
index de2124f..9cbcc77 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Test;
public class GreeterTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
index 1990a5e..f138508 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.header_test.TestHeaderImpl;
import org.apache.header_test.types.TestHeader5;
import org.apache.header_test.types.TestHeader5ResponseBody;
+
import org.junit.Test;
public class HeaderTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 06c5be1..2363ab9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -34,6 +34,7 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.Provider;
import org.w3c.dom.Document;
+
import org.xml.sax.SAXException;
import org.apache.cxf.binding.soap.SoapMessage;
@@ -52,6 +53,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.Factory;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
index d1c852d..e9b6878 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
@@ -51,6 +51,7 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
index 487bafb..d1c6fc0 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.jaxws;
import java.util.HashMap;
import java.util.Map;
+
import javax.wsdl.Definition;
import javax.wsdl.xml.WSDLWriter;
import javax.xml.xpath.XPathConstants;
@@ -41,6 +42,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.hello_world_doc_lit.GreeterImplDoc;
+
import org.junit.Test;
public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
index a55876a..8d75f34 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
@@ -26,6 +26,7 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Assert;
public class MessageReplayObserver implements MessageObserver {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
index e4d86da..ab6fb25 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.service.AddNumbers;
import org.apache.cxf.jaxws.service.AddNumbersImpl;
+
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
index eb474fd..926b27e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.calculator.CalculatorPortType;
+
import org.junit.Test;
public class SOAPBindingTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
index e3a3537..1b7fd16 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
@@ -26,6 +26,7 @@ import org.w3c.dom.Document;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.service.EchoFoo;
+
import org.junit.Test;
public class SchemaFirstTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
index eebe55a..94cff41 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.handler.PortInfoImpl;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.Test;
public class ServiceImplTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
index 1e2fb47..bfd1035 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
index 356c915..0feca1f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index 29a53a0..49f5da1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index dcd001a..04942c5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -30,6 +30,7 @@ import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.MessageContext.Scope;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
index 4b042b1..a242175 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
@@ -27,6 +27,7 @@ import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.soap.AddressingFeature;
import org.w3c.dom.Document;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
import org.apache.cxf.interceptor.Fault;
@@ -39,6 +40,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.Destination;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 834376c..ccb3896 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.handler.MessageContext;
import org.apache.cxf.message.AbstractWrappedMessage;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index cd9b149..6ebd56f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxws.handler;
import java.util.List;
+
import javax.jws.HandlerChain;
import javax.jws.WebService;
import javax.xml.namespace.QName;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 7ae1b60..e266a0a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -35,8 +35,8 @@ import org.apache.cxf.jaxws.handler.types.FullyQualifiedClassType;
import org.apache.cxf.jaxws.handler.types.ParamValueType;
import org.apache.cxf.jaxws.handler.types.PortComponentHandlerType;
import org.apache.cxf.jaxws.handler.types.XsdStringType;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index 99082ef..60879f6 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index da3a3f4..4df69ea 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.MessageObserver;
import org.apache.handlers.types.AddNumbersResponse;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index 6b5adf9..84cfd03 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.handlers.types.AddNumbers;
import org.apache.handlers.types.ObjectFactory;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index e40f132..5ccf9ed 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -71,6 +71,7 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.PartialXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
index 4d58918..a10e952 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.AbstractJaxWsTest;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.header_test.rpc.SOAPRPCHeaderService;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
index b2eb8d8..fbd9625 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.jaxws.MessageReplayObserver;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class HolderTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
index 63003ea..37b3c8c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
@@ -45,6 +45,7 @@ import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.message.Message;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
index 14eb422..8444edf 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.hello_world_soap_http.HWSoapMessageProvider;
+
import org.junit.Test;
public class ProviderServiceFactoryTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
index 5d74c89..d6fc237 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
@@ -23,6 +23,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.jaxws.AbstractJaxWsTest;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class ProviderTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
index 67aa8c8..c0d4b33 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.service;
import java.util.Arrays;
import java.util.List;
+
import javax.jws.WebParam;
import javax.jws.WebService;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index 0fb6352..3b24721 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -54,6 +54,7 @@ import org.apache.cxf.jaxws.service.Hello;
import org.apache.cxf.jaxws.spring.NamespaceHandler.SpringServerFactoryBean;
import org.apache.cxf.message.Message;
import org.apache.hello_world_soap_http.Greeter;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index 2ed070b..39500a0 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index fea1206..6bea1a5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.jaxws.support;
import java.lang.reflect.Method;
-
import java.util.Iterator;
import javax.jws.WebMethod;
@@ -40,6 +39,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.CatalogWSDLLocator;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
index 3a892e2..c6b12f5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
@@ -56,6 +56,7 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.junit.Test;
public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index 5566ded..03a6901 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -24,14 +24,15 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.jws.WebMethod;
+import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.wsdl.Definition;
import javax.wsdl.xml.WSDLWriter;
import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.annotations.Policies;
@@ -46,6 +47,7 @@ import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.neethi.Constants;
+
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index d17940d..1b9fcf7 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.DestinationRegistryImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index cd825b8..e424e51 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -24,6 +24,7 @@ import javax.xml.ws.spi.http.HttpHandler;
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
index cdf3c2c..f0e6279 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
@@ -22,7 +22,6 @@ package org.apache.cxf.js.rhino;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
diff --git a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
index d22416c..ddef1dc 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
@@ -21,7 +21,6 @@ package org.apache.cxf.js.rhino;
import java.io.File;
import java.io.FileFilter;
-
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index 7e0ec69..a9997be 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -22,10 +22,10 @@ package org.apache.cxf.js.rhino;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.mozilla.javascript.Scriptable;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index d9f8a6d..47973f6 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -25,10 +25,10 @@ import javax.xml.ws.Service;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Scriptable;
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index fe1fa5b..ba38bdb 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -53,7 +53,9 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.xml.sax.InputSource;
+
import org.apache.cxf.Bus;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
index 13277e5..74de1e7 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultipleEndpointObserver;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
index ac167fd..93cffc5 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
@@ -19,8 +19,10 @@
package org.apache.cxf.frontend.spring;
import org.apache.cxf.BusFactory;
+
import org.junit.After;
import org.junit.Assert;
+
import org.springframework.context.support.AbstractApplicationContext;
public class AbstractSimpleFrontendSpringTest extends Assert {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
index 4691ff4..0197f06 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.factory.HelloService;
+
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
index 40c1493..6b1dc93 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.factory.HelloService;
import org.apache.cxf.service.factory.HelloServiceImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
index 1a5c009..1cceee1 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Before;
public abstract class AbstractSimpleFrontendTest extends AbstractCXFTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
index 8893056..5065cb3 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.hello_world.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.junit.Test;
public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
index e95deb8..71162ba 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.junit.Test;
public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
index 45d6634..aebae2f 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.hello_world_doc_lit.Greeter;
import org.apache.hello_world_doc_lit.GreeterImplDoc;
+
import org.junit.Test;
public class RountripTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
index 7989f00..e3a0cfb 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.hello_world.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.junit.Test;
public class ServerFactoryTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
index 850976a..304db11 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.staxutils.FragmentStreamReader;
import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class StaxDatabindingTest extends AbstractCXFTest {
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
index 91f3fb5..aec67b5 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Test;
+
import static org.junit.Assert.assertNotNull;
/**
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
index 1192e5f..1cde761 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
@@ -36,6 +36,7 @@ import org.apache.cxf.javascript.types.SchemaJavascriptBuilder;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.TestUtilities;
+
import org.junit.Assert;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
index 8e391b2..f4dbea0 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
@@ -36,7 +36,6 @@ import javax.management.MBeanServer;
import javax.management.MBeanServerDelegate;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
-
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
index e11be14..0a0f1c6 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
@@ -20,11 +20,9 @@
package org.apache.cxf.management.jmx.export.runtime;
import java.lang.reflect.Constructor;
-
import java.util.HashMap;
import java.util.Map;
-
import javax.management.Descriptor;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index a9467c0..b78a251 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 59f0c46..4cd285c 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -33,8 +33,8 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.OperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
index 70a577c..6703128 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
@@ -23,8 +23,8 @@ import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Test;
public class ResponseTimeMessageInInterceptorTest extends AbstractMessageResponseTestBase {
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
index 9eda209..28c6b6d 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.management.interceptor;
import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
index bc55710..9545b69 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
index 84ccedf..f92bbc7 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
@@ -34,6 +34,7 @@ import javax.management.modelmbean.RequiredModelMBean;
import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index 1d0d80d..2bdb107 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -22,9 +22,11 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JAXRSClientFactoryBeanTest extends Assert {
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
index 57437c5..71ab54b 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Max;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index de7c6a5..6fdcf87 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -47,9 +47,9 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 8cf5057..74b758d 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -58,9 +58,9 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.servlet.ServletDestination;
import org.apache.ws.commons.schema.constants.Constants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index 683ba74..dd1544c 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMEntry;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index 06c479a..ee65991 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.Produces;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMFeed;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index 98c3845..e6261cf 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -40,8 +40,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
index 79ad0d2..13a65a4 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.resources;
import java.util.List;
+
import javax.ws.rs.GET;
import javax.ws.rs.POST;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index a53db1b..519eeb1 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.SearchConditionVisitor;
import org.apache.cxf.jaxrs.ext.search.SearchUtils;
import org.apache.cxf.jaxrs.ext.search.jpa.BookReview.Review;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
index 5cdc986..5debd6f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
@@ -28,6 +28,7 @@ import javax.persistence.Tuple;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
+
import org.junit.Test;
public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorTest {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
index 70a4952..9f5a21c 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
@@ -1,202 +1,204 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.ext.search.lucene;
-
-import java.util.Collections;
-
-import org.apache.cxf.jaxrs.ext.search.SearchBean;
-import org.apache.cxf.jaxrs.ext.search.SearchCondition;
-import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
-import org.apache.cxf.jaxrs.ext.search.SearchConditionVisitor;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-
-public abstract class AbstractLuceneQueryVisitorTest extends Assert {
-
- private DirectoryReader ireader;
- private IndexSearcher isearcher;
- private Directory directory;
- private Analyzer analyzer;
-
- @Before
- public void setUp() throws Exception {
- analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
- directory = new RAMDirectory();
- IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_4_9, analyzer);
- IndexWriter iwriter = new IndexWriter(directory, config);
-
- Document doc = new Document();
- doc.add(new Field("contents", "name=text", TextField.TYPE_STORED));
-
- IntField intField = new IntField("intfield", 4, Field.Store.YES);
- doc.add(intField);
- iwriter.addDocument(doc);
-
- iwriter.close();
- ireader = DirectoryReader.open(directory);
- isearcher = new IndexSearcher(ireader);
- }
-
- @After
- public void tearDown() throws Exception {
- ireader.close();
- directory.close();
- }
-
- protected abstract SearchConditionParser<SearchBean> getParser();
-
- protected void doTestTextContentMatch(String expression) throws Exception {
- doTestTextContentMatch(expression, false);
- }
-
- protected void doTestTextContentMatchWithAnalyzer(String expression) throws Exception {
- doTestTextContentMatch(expression, true);
- }
-
- protected void doTestTextContentMatch(String expression, boolean useAnalyzer) throws Exception {
- Query query = createTermQuery("contents", expression, useAnalyzer);
- doTestTextContentMatchWithQuery(query);
-
- }
-
- protected void doTestNoMatch(Query query) throws Exception {
- ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
- assertEquals(0, hits.length);
- }
-
- protected void doTestTextContentMatchWithQuery(Query query) throws Exception {
- ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
- assertEquals(1, hits.length);
- // Iterate through the results:
- for (int i = 0; i < hits.length; i++) {
- Document hitDoc = isearcher.doc(hits[i].doc);
- assertEquals("name=text", hitDoc.get("contents"));
- }
-
- }
-
- protected void doTestIntContentMatch(String expression) throws Exception {
-
- Query query = createTermQuery("intfield", expression);
- doTestIntContentMatchWithQuery(query);
-
- }
-
- protected void doTestIntContentMatchWithQuery(Query query) throws Exception {
-
- ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
- assertEquals(1, hits.length);
- // Iterate through the results:
- for (int i = 0; i < hits.length; i++) {
- Document hitDoc = isearcher.doc(hits[i].doc);
- IndexableField field = hitDoc.getField("intfield");
- assertEquals(4, field.numericValue().intValue());
- }
-
- }
-
- protected Query createTermQuery(String expression) throws Exception {
- return createTermQuery(expression, false);
- }
-
- protected Query createTermQueryWithAnalyzer(String expression) throws Exception {
- return createTermQuery(expression, true);
- }
-
- protected Query createTermQuery(String expression, boolean useAnalyzer) throws Exception {
- SearchCondition<SearchBean> filter = getParser().parse(expression);
- SearchConditionVisitor<SearchBean, Query> lucene =
- new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
- lucene.visit(filter);
- return lucene.getQuery();
- }
-
- protected Query createTermQueryWithFieldClassWithAnalyzer(String expression, Class<?> cls) throws Exception {
- return createTermQueryWithFieldClass(expression, cls, true);
- }
-
- protected Query createTermQueryWithFieldClass(String expression, Class<?> cls) throws Exception {
- return createTermQueryWithFieldClass(expression, cls, false);
- }
-
- protected Query createTermQueryWithFieldClass(String expression, Class<?> cls,
- boolean useAnalyzer) throws Exception {
- SearchCondition<SearchBean> filter = getParser().parse(expression);
- LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
- lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap("intfield", cls));
- lucene.visit(filter);
- return lucene.getQuery();
- }
-
- protected Query createTermQuery(String fieldName, String expression) throws Exception {
- return createTermQuery(fieldName, expression, false);
- }
-
- protected Query createTermQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
- SearchCondition<SearchBean> filter = getParser().parse(expression);
- LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>("ct", fieldName, useAnalyzer ? analyzer : null);
- lucene.visit(filter);
- return lucene.getQuery();
- }
-
- protected Query createTermQueryWithFieldClass(String fieldName, String expression, Class<?> cls)
- throws Exception {
- SearchCondition<SearchBean> filter = getParser().parse(expression);
- LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>("ct", fieldName);
- lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap(fieldName, cls));
- lucene.visit(filter);
- return lucene.getQuery();
- }
-
- protected Query createPhraseQuery(String fieldName, String expression) throws Exception {
- return createPhraseQuery(fieldName, expression, false);
- }
-
- protected Query createPhraseQueryWithAnalyzer(String fieldName, String expression) throws Exception {
- return createPhraseQuery(fieldName, expression, true);
- }
-
- protected Query createPhraseQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
- SearchCondition<SearchBean> filter = getParser().parse(expression);
- LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>(fieldName, useAnalyzer ? analyzer : null);
- lucene.visit(filter);
- return lucene.getQuery();
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.ext.search.lucene;
+
+import java.util.Collections;
+
+import org.apache.cxf.jaxrs.ext.search.SearchBean;
+import org.apache.cxf.jaxrs.ext.search.SearchCondition;
+import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
+import org.apache.cxf.jaxrs.ext.search.SearchConditionVisitor;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+
+public abstract class AbstractLuceneQueryVisitorTest extends Assert {
+
+ private DirectoryReader ireader;
+ private IndexSearcher isearcher;
+ private Directory directory;
+ private Analyzer analyzer;
+
+ @Before
+ public void setUp() throws Exception {
+ analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
+ directory = new RAMDirectory();
+ IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_4_9, analyzer);
+ IndexWriter iwriter = new IndexWriter(directory, config);
+
+ Document doc = new Document();
+ doc.add(new Field("contents", "name=text", TextField.TYPE_STORED));
+
+ IntField intField = new IntField("intfield", 4, Field.Store.YES);
+ doc.add(intField);
+ iwriter.addDocument(doc);
+
+ iwriter.close();
+ ireader = DirectoryReader.open(directory);
+ isearcher = new IndexSearcher(ireader);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ ireader.close();
+ directory.close();
+ }
+
+ protected abstract SearchConditionParser<SearchBean> getParser();
+
+ protected void doTestTextContentMatch(String expression) throws Exception {
+ doTestTextContentMatch(expression, false);
+ }
+
+ protected void doTestTextContentMatchWithAnalyzer(String expression) throws Exception {
+ doTestTextContentMatch(expression, true);
+ }
+
+ protected void doTestTextContentMatch(String expression, boolean useAnalyzer) throws Exception {
+ Query query = createTermQuery("contents", expression, useAnalyzer);
+ doTestTextContentMatchWithQuery(query);
+
+ }
+
+ protected void doTestNoMatch(Query query) throws Exception {
+ ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
+ assertEquals(0, hits.length);
+ }
+
+ protected void doTestTextContentMatchWithQuery(Query query) throws Exception {
+ ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
+ assertEquals(1, hits.length);
+ // Iterate through the results:
+ for (int i = 0; i < hits.length; i++) {
+ Document hitDoc = isearcher.doc(hits[i].doc);
+ assertEquals("name=text", hitDoc.get("contents"));
+ }
+
+ }
+
+ protected void doTestIntContentMatch(String expression) throws Exception {
+
+ Query query = createTermQuery("intfield", expression);
+ doTestIntContentMatchWithQuery(query);
+
+ }
+
+ protected void doTestIntContentMatchWithQuery(Query query) throws Exception {
+
+ ScoreDoc[] hits = isearcher.search(query, null, 1000).scoreDocs;
+ assertEquals(1, hits.length);
+ // Iterate through the results:
+ for (int i = 0; i < hits.length; i++) {
+ Document hitDoc = isearcher.doc(hits[i].doc);
+ IndexableField field = hitDoc.getField("intfield");
+ assertEquals(4, field.numericValue().intValue());
+ }
+
+ }
+
+ protected Query createTermQuery(String expression) throws Exception {
+ return createTermQuery(expression, false);
+ }
+
+ protected Query createTermQueryWithAnalyzer(String expression) throws Exception {
+ return createTermQuery(expression, true);
+ }
+
+ protected Query createTermQuery(String expression, boolean useAnalyzer) throws Exception {
+ SearchCondition<SearchBean> filter = getParser().parse(expression);
+ SearchConditionVisitor<SearchBean, Query> lucene =
+ new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
+ lucene.visit(filter);
+ return lucene.getQuery();
+ }
+
+ protected Query createTermQueryWithFieldClassWithAnalyzer(String expression, Class<?> cls) throws Exception {
+ return createTermQueryWithFieldClass(expression, cls, true);
+ }
+
+ protected Query createTermQueryWithFieldClass(String expression, Class<?> cls) throws Exception {
+ return createTermQueryWithFieldClass(expression, cls, false);
+ }
+
+ protected Query createTermQueryWithFieldClass(String expression, Class<?> cls,
+ boolean useAnalyzer) throws Exception {
+ SearchCondition<SearchBean> filter = getParser().parse(expression);
+ LuceneQueryVisitor<SearchBean> lucene =
+ new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
+ lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap("intfield", cls));
+ lucene.visit(filter);
+ return lucene.getQuery();
+ }
+
+ protected Query createTermQuery(String fieldName, String expression) throws Exception {
+ return createTermQuery(fieldName, expression, false);
+ }
+
+ protected Query createTermQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
+ SearchCondition<SearchBean> filter = getParser().parse(expression);
+ LuceneQueryVisitor<SearchBean> lucene =
+ new LuceneQueryVisitor<SearchBean>("ct", fieldName, useAnalyzer ? analyzer : null);
+ lucene.visit(filter);
+ return lucene.getQuery();
+ }
+
+ protected Query createTermQueryWithFieldClass(String fieldName, String expression, Class<?> cls)
+ throws Exception {
+ SearchCondition<SearchBean> filter = getParser().parse(expression);
+ LuceneQueryVisitor<SearchBean> lucene =
+ new LuceneQueryVisitor<SearchBean>("ct", fieldName);
+ lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap(fieldName, cls));
+ lucene.visit(filter);
+ return lucene.getQuery();
+ }
+
+ protected Query createPhraseQuery(String fieldName, String expression) throws Exception {
+ return createPhraseQuery(fieldName, expression, false);
+ }
+
+ protected Query createPhraseQueryWithAnalyzer(String fieldName, String expression) throws Exception {
+ return createPhraseQuery(fieldName, expression, true);
+ }
+
+ protected Query createPhraseQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
+ SearchCondition<SearchBean> filter = getParser().parse(expression);
+ LuceneQueryVisitor<SearchBean> lucene =
+ new LuceneQueryVisitor<SearchBean>(fieldName, useAnalyzer ? analyzer : null);
+ lucene.visit(filter);
+ return lucene.getQuery();
+ }
+}
+
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
index f6b336e..e59fe17 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchBean;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.lucene.search.Query;
+
import org.junit.Test;
public class LuceneQueryVisitorAnalyzerFiqlTest extends AbstractLuceneQueryVisitorTest {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
index 8938489..346ed39 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.lucene.search.Query;
+
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
index 3d580a3..e6f0790 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
@@ -1,196 +1,198 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.ext.search.lucene;
-
-import org.apache.cxf.jaxrs.ext.search.SearchBean;
-import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
-import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
-import org.apache.lucene.search.Query;
-import org.junit.Test;
-
-public class LuceneQueryVisitorODataTest extends AbstractLuceneQueryVisitorTest {
- @Test
- public void testTextContentMatchEqual() throws Exception {
-
- doTestTextContentMatch("ct eq 'text'");
- }
-
- @Test
- public void testTextContentMatchNotEqual() throws Exception {
-
- Query query = createTermQuery("contents", "ct ne 'text'");
- doTestNoMatch(query);
-
- }
-
- @Test
- public void testTextContentMatchNotEqualPositive() throws Exception {
-
- Query query = createTermQuery("contents", "ct ne 'bar'");
- doTestNoMatch(query);
-
- }
-
- @Test
- public void testTextContentMatchWildcardEnd() throws Exception {
- doTestTextContentMatch("ct eq 'tex*'");
- }
-
- @Test
- public void testTextContentMatchWildcardStart() throws Exception {
- doTestTextContentMatch("ct eq '*ext'");
- }
-
- @Test
- public void testIntContentMatchGreater() throws Exception {
- doTestIntContentMatch("ct gt 3");
- }
-
- @Test
- public void testIntContentMatchGreaterWithClassFiled() throws Exception {
- Query query = createTermQueryWithFieldClass("intfield", "ct gt 3", Integer.class);
- doTestIntContentMatchWithQuery(query);
- }
-
- @Test
- public void testIntContentMatchGreaterNoMatch() throws Exception {
- Query query = createTermQuery("intfield", "ct gt 5");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntContentMatchGreaterOrEqual() throws Exception {
- doTestIntContentMatch("ct ge 4");
- doTestIntContentMatch("ct ge 3");
- }
-
- @Test
- public void testIntContentMatchGreaterOrEqualNoMatch() throws Exception {
- Query query = createTermQuery("intfield", "ct ge 5");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntContentMatchLess() throws Exception {
- doTestIntContentMatch("ct lt 5");
- }
-
- @Test
- public void testIntContentMatchLessNoMatch() throws Exception {
- Query query = createTermQuery("intfield", "ct lt 3");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntContentMatchLessOrEqual() throws Exception {
- doTestIntContentMatch("ct le 4");
- doTestIntContentMatch("ct le 5");
- }
-
- @Test
- public void testIntContentMatchLessOrEqualNoMatch() throws Exception {
- Query query = createTermQuery("intfield", "ct le 3");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntContentMatchEquals() throws Exception {
- Query query = createTermQueryWithFieldClass("intfield", "ct eq 4", Integer.class);
- doTestIntContentMatchWithQuery(query);
- }
-
- @Test
- public void testTextAndContentMatch() throws Exception {
- Query query = createTermQuery("contents eq 'name' and contents eq 'text'");
- doTestTextContentMatchWithQuery(query);
-
- }
-
- @Test
- public void testTextAndContentNoMatch() throws Exception {
- Query query = createTermQuery("contents eq 'bar' and contents eq 'text'");
- doTestNoMatch(query);
- }
-
- @Test
- public void testTextOrContentMatch() throws Exception {
- Query query = createTermQuery("contents eq 'bar' or contents eq 'text'");
- doTestTextContentMatchWithQuery(query);
-
- }
-
- @Test
- public void testTextOrContentNoMatch() throws Exception {
- Query query = createTermQuery("contents eq 'bar' or contents eq 'foo'");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntAndTextContentMatch() throws Exception {
-
- Query query = createTermQueryWithFieldClass("intfield eq 4 and contents eq 'text'", Integer.class);
- doTestIntContentMatchWithQuery(query);
- doTestTextContentMatchWithQuery(query);
-
- }
-
- @Test
- public void testIntAndTextContentNoMatch() throws Exception {
- Query query = createTermQuery("intfield eq 3 and contents eq 'text'");
- doTestNoMatch(query);
- }
-
- @Test
- public void testIntOrTextContentMatch() throws Exception {
- Query query = createTermQuery("intfield eq 3 or contents eq 'text'");
- doTestTextContentMatchWithQuery(query);
- doTestIntContentMatchWithQuery(query);
-
- }
-
- @Test
- public void testIntOrTextContentNoMatch() throws Exception {
- Query query = createTermQuery("intfield eq 3 or contents eq 'bar'");
- doTestNoMatch(query);
- }
-
- @Test
- public void testTextContentMatchEqualPhrase() throws Exception {
- Query query = createPhraseQuery("contents", "name eq 'text'");
- doTestTextContentMatchWithQuery(query);
- }
-
- @Test
- public void testTextContentMatchNotEqualPhrase() throws Exception {
-
- Query query = createPhraseQuery("contents", "name ne 'text'");
- doTestNoMatch(query);
- }
-
- @Test
- public void testTextContentMatchEqualPhraseWildcard() throws Exception {
- Query query = createPhraseQuery("contents", "name eq 'tex*'");
- doTestTextContentMatchWithQuery(query);
- }
-
- @Override
- protected SearchConditionParser<SearchBean> getParser() {
- return new ODataParser<SearchBean>(SearchBean.class);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.ext.search.lucene;
+
+import org.apache.cxf.jaxrs.ext.search.SearchBean;
+import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
+import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
+import org.apache.lucene.search.Query;
+
+import org.junit.Test;
+
+public class LuceneQueryVisitorODataTest extends AbstractLuceneQueryVisitorTest {
+ @Test
+ public void testTextContentMatchEqual() throws Exception {
+
+ doTestTextContentMatch("ct eq 'text'");
+ }
+
+ @Test
+ public void testTextContentMatchNotEqual() throws Exception {
+
+ Query query = createTermQuery("contents", "ct ne 'text'");
+ doTestNoMatch(query);
+
+ }
+
+ @Test
+ public void testTextContentMatchNotEqualPositive() throws Exception {
+
+ Query query = createTermQuery("contents", "ct ne 'bar'");
+ doTestNoMatch(query);
+
+ }
+
+ @Test
+ public void testTextContentMatchWildcardEnd() throws Exception {
+ doTestTextContentMatch("ct eq 'tex*'");
+ }
+
+ @Test
+ public void testTextContentMatchWildcardStart() throws Exception {
+ doTestTextContentMatch("ct eq '*ext'");
+ }
+
+ @Test
+ public void testIntContentMatchGreater() throws Exception {
+ doTestIntContentMatch("ct gt 3");
+ }
+
+ @Test
+ public void testIntContentMatchGreaterWithClassFiled() throws Exception {
+ Query query = createTermQueryWithFieldClass("intfield", "ct gt 3", Integer.class);
+ doTestIntContentMatchWithQuery(query);
+ }
+
+ @Test
+ public void testIntContentMatchGreaterNoMatch() throws Exception {
+ Query query = createTermQuery("intfield", "ct gt 5");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntContentMatchGreaterOrEqual() throws Exception {
+ doTestIntContentMatch("ct ge 4");
+ doTestIntContentMatch("ct ge 3");
+ }
+
+ @Test
+ public void testIntContentMatchGreaterOrEqualNoMatch() throws Exception {
+ Query query = createTermQuery("intfield", "ct ge 5");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntContentMatchLess() throws Exception {
+ doTestIntContentMatch("ct lt 5");
+ }
+
+ @Test
+ public void testIntContentMatchLessNoMatch() throws Exception {
+ Query query = createTermQuery("intfield", "ct lt 3");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntContentMatchLessOrEqual() throws Exception {
+ doTestIntContentMatch("ct le 4");
+ doTestIntContentMatch("ct le 5");
+ }
+
+ @Test
+ public void testIntContentMatchLessOrEqualNoMatch() throws Exception {
+ Query query = createTermQuery("intfield", "ct le 3");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntContentMatchEquals() throws Exception {
+ Query query = createTermQueryWithFieldClass("intfield", "ct eq 4", Integer.class);
+ doTestIntContentMatchWithQuery(query);
+ }
+
+ @Test
+ public void testTextAndContentMatch() throws Exception {
+ Query query = createTermQuery("contents eq 'name' and contents eq 'text'");
+ doTestTextContentMatchWithQuery(query);
+
+ }
+
+ @Test
+ public void testTextAndContentNoMatch() throws Exception {
+ Query query = createTermQuery("contents eq 'bar' and contents eq 'text'");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testTextOrContentMatch() throws Exception {
+ Query query = createTermQuery("contents eq 'bar' or contents eq 'text'");
+ doTestTextContentMatchWithQuery(query);
+
+ }
+
+ @Test
+ public void testTextOrContentNoMatch() throws Exception {
+ Query query = createTermQuery("contents eq 'bar' or contents eq 'foo'");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntAndTextContentMatch() throws Exception {
+
+ Query query = createTermQueryWithFieldClass("intfield eq 4 and contents eq 'text'", Integer.class);
+ doTestIntContentMatchWithQuery(query);
+ doTestTextContentMatchWithQuery(query);
+
+ }
+
+ @Test
+ public void testIntAndTextContentNoMatch() throws Exception {
+ Query query = createTermQuery("intfield eq 3 and contents eq 'text'");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testIntOrTextContentMatch() throws Exception {
+ Query query = createTermQuery("intfield eq 3 or contents eq 'text'");
+ doTestTextContentMatchWithQuery(query);
+ doTestIntContentMatchWithQuery(query);
+
+ }
+
+ @Test
+ public void testIntOrTextContentNoMatch() throws Exception {
+ Query query = createTermQuery("intfield eq 3 or contents eq 'bar'");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testTextContentMatchEqualPhrase() throws Exception {
+ Query query = createPhraseQuery("contents", "name eq 'text'");
+ doTestTextContentMatchWithQuery(query);
+ }
+
+ @Test
+ public void testTextContentMatchNotEqualPhrase() throws Exception {
+
+ Query query = createPhraseQuery("contents", "name ne 'text'");
+ doTestNoMatch(query);
+ }
+
+ @Test
+ public void testTextContentMatchEqualPhraseWildcard() throws Exception {
+ Query query = createPhraseQuery("contents", "name eq 'tex*'");
+ doTestTextContentMatchWithQuery(query);
+ }
+
+ @Override
+ protected SearchConditionParser<SearchBean> getParser() {
+ return new ODataParser<SearchBean>(SearchBean.class);
+ }
+}
+
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
index cdf3806..31198e3 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
@@ -34,7 +34,6 @@ import net.oauth.OAuthAccessor;
import net.oauth.OAuthConsumer;
import net.oauth.OAuthMessage;
import net.oauth.signature.RSA_SHA1;
-
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.rs.security.oauth.provider.OAuthServiceException;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
index c2f79cc..1d0572b 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
@@ -37,7 +37,6 @@ import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
import net.oauth.server.OAuthServlet;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
index 605c051..c09e3ab 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
import net.oauth.OAuthProblemException;
-
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
index 28a678e..b0fbdc9 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
@@ -27,7 +27,6 @@ import net.oauth.OAuthException;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.SimpleOAuthValidator;
-
import org.apache.cxf.rs.security.oauth.data.Token;
/**
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
index 044fd06..7b36df4 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.oauth.services;
import javax.ws.rs.core.Context;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.rs.security.oauth.provider.DefaultOAuthValidator;
import org.apache.cxf.rs.security.oauth.provider.OAuthDataProvider;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
index 1af6fc2..0ccb1ce 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
@@ -30,7 +30,6 @@ import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
index e63cf7b..577bc35 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
@@ -42,7 +42,6 @@ import javax.ws.rs.core.UriBuilder;
import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
index 5e4bd44..63c2db3 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
@@ -36,7 +36,6 @@ import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import net.oauth.OAuth;
-
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.provider.FormEncodingProvider;
import org.apache.cxf.rs.security.oauth.utils.OAuthConstants;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
index ccbc920..e57462a 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
@@ -31,7 +31,6 @@ import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
index aa8f820..58daf5d 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
@@ -44,7 +44,6 @@ import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
import net.oauth.server.OAuthServlet;
-
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
index 6d97d72..9fecf1c 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.MultivaluedMap;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.jaxrs.utils.HttpUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 4d0155d..9ec1de9 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import net.sf.ehcache.Ehcache;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
index 0b9e2f3..8b1e06e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import javax.cache.Cache;
import org.apache.cxf.Bus;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index ebb53f8..c551e03 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -26,7 +26,6 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
index 7555c6a..f01c0c4 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
@@ -29,7 +29,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index eb698b7..bc2351e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
index 86c0fe9..c35bcf7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
@@ -28,10 +28,12 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProviderTest;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 27ee049..a4f69af 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -22,11 +22,13 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.util.Collections;
import java.util.List;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
index 47eb9fe..e294118 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
@@ -27,9 +27,9 @@ import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
+
import org.easymock.EasyMockRule;
import org.easymock.Mock;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -37,7 +37,6 @@ import org.junit.Test;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-
import static org.junit.Assert.fail;
public class AbstractJwtHandlerTest {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
index 2ed60ad..6d413f3 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index a49fc4c..5952c6e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.provider;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -31,6 +32,7 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index ebb213a..32a2e52 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -29,8 +29,8 @@ import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index 2f99b6b..10be48e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -19,8 +19,8 @@
package org.apache.cxf.rs.security.oauth2.tokens.hawk;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
index 50d0ddd..9aa68bc 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
@@ -19,9 +19,11 @@
package org.apache.cxf.rs.security.oidc.idp;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
+
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
index 00495e1..fa210f4 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.idp;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
+
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index b6280d4..100574e 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.idp;
import java.util.Collections;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -27,6 +28,7 @@ import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
import org.apache.cxf.rs.security.oidc.common.IdToken;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index 6039a1e..241c470 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index edb2a9a..801568f 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -42,6 +42,7 @@ import javax.ws.rs.core.UriBuilder;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.security.SimplePrincipal;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
index ce89d31..b3e29fc 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
@@ -31,7 +31,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
index 63619c3..408f48b 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index 65f24cd..40e5e8b 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -34,6 +34,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
index f3f6557..e8da129 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.saml.sso;
import java.util.Date;
import org.w3c.dom.Element;
+
import org.opensaml.saml.saml2.core.Assertion;
/**
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
index ee38ba6..3e9353d 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index 04956fa..fd7d13d 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
index 920a06d..4357185 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
@@ -30,7 +30,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
index b9033cd..254d0f8 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
index 3210d42..7e86320 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index bc5730d..feefa25 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.saml.sso;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Status;
-
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
index caeb35a..81b995d 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
index 6cd6789..6a8f695 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
@@ -29,6 +29,7 @@ import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
index 34f6bea..e61a296 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
@@ -28,6 +28,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
index 2145dde..f2efa55 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Response;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
index 9c71bfa..58db909 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
@@ -22,6 +22,7 @@ import java.security.Principal;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.rs.security.saml.assertion.Subject;
import org.apache.cxf.rt.security.SecurityConstants;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
index 5cd7603..6da5197 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.message.Message;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
index f204468..87aaa94 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
index 5d5ae7c..b39afc3 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
index 48161f9..d096255 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.rs.security.common.CryptoLoader;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
index ad181ef..519b7d2 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
@@ -33,6 +33,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
index e37fd14..d8a4b5c 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
index 97fee53..decdb05 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.claims.ClaimCollection;
import org.apache.cxf.rt.security.claims.ClaimsSecurityContext;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
index 46188cc..ef76a77 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
@@ -25,6 +25,7 @@ import java.util.logging.Logger;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
index 1079ff7..caaf815 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.security.SimpleGroup;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.SecurityConstants;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
index 1af0f5e..5da2eb9 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rt.security.saml.xacml;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.saml.claims.SAMLSecurityContext;
import org.apache.cxf.security.SecurityContext;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index 3b66e12..7ae41b5 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import org.w3c.dom.Document;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.rt.security.claims.ClaimCollection;
@@ -35,6 +36,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.bean.AttributeBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+
import org.junit.Assert;
public class SAMLClaimsTest extends Assert {
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
index 775f1fc..e36a49a 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -43,6 +43,7 @@ import org.apache.cxf.security.claims.authorization.Claim;
import org.apache.cxf.security.claims.authorization.ClaimMode;
import org.apache.cxf.security.claims.authorization.Claims;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
index 3a2bc3c..7a6ddc3 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.joda.time.DateTime;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
index 7d594dc..1222a55 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.opensaml.xacml.ctx.ActionType;
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
index bcafe89..8f04eb8 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
@@ -31,6 +31,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
index 384970a..f5955c5 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
@@ -37,7 +37,6 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.http_jetty.ThreadingParameters;
import org.apache.cxf.transports.http_jetty.configuration.TLSServerParametersIdentifiedType;
import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersIdentifiedType;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index e10fb2a..67dc692 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -70,10 +70,13 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+
import org.easymock.EasyMock;
+
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index 257bc24..0fe4799 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -43,8 +43,10 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
@@ -55,6 +57,7 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
index 93031ab..f4a79ff 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
@@ -20,9 +20,11 @@ package org.apache.cxf.transport.http.netty.client.integration;
import java.net.URL;
import java.util.concurrent.ExecutionException;
+
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Endpoint;
import javax.xml.ws.Response;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -31,6 +33,7 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
index a7a6da0..eede062 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
@@ -23,9 +23,9 @@ package org.apache.cxf.transport.http.netty.server;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
index 95fbdaa..b4e9e2c 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
@@ -20,10 +20,12 @@
package org.apache.cxf.transport.http.netty.server;
import java.io.IOException;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.cxf.transport.http.HttpUrlUtil;
public class NettyHttpHandler {
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
index ce29034..44c84df 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
@@ -24,9 +24,9 @@ import java.net.URL;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
+
import javax.annotation.PostConstruct;
import org.apache.cxf.common.i18n.Message;
@@ -34,6 +34,7 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.HttpUriMapper;
+
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
index 8a503aa..a4ee2e6 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.http.netty.server.interceptor;
import org.apache.cxf.transport.http.netty.server.servlet.ChannelThreadLocal;
import io.netty.channel.ChannelHandlerContext;
-
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
index 414514b..0ae01c1 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
@@ -25,6 +25,7 @@ import org.apache.cxf.transport.http.netty.server.servlet.HttpSessionThreadLocal
import org.apache.cxf.transport.http.netty.server.servlet.NettyHttpSession;
import org.apache.cxf.transport.http.netty.server.session.HttpSessionStore;
import org.apache.cxf.transport.http.netty.server.util.Utils;
+
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.ClientCookieEncoder;
import io.netty.handler.codec.http.Cookie;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index 05ccc77..afb8d07 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.cxf.transport.http.netty.server.util.Utils;
+
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.CookieDecoder;
import io.netty.handler.codec.http.HttpContent;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
index 92bc3b4..e0fdedd 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
@@ -51,7 +51,6 @@ import org.apache.cxf.transport.http.netty.server.ThreadingParameters;
import org.apache.cxf.transports.http_netty_server.configuration.TLSServerParametersIdentifiedType;
import org.apache.cxf.transports.http_netty_server.configuration.ThreadingParametersIdentifiedType;
import org.apache.cxf.transports.http_netty_server.configuration.ThreadingParametersType;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index f08bd2a..ba36d8c 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -72,8 +72,8 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index a78382f..49c9c45 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.HTTPTransportFactory;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index b8eab84..110776c 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
index 1fb6e8b..8f64bb9 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.cxf.transport.http.HttpUrlUtil;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
index ab6151f..c99d904 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
@@ -22,13 +22,16 @@ package org.apache.cxf.transport.http.netty.server.integration;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URL;
+
import javax.xml.ws.Endpoint;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
index a1405b7..b70bd97 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
@@ -19,8 +19,11 @@
package org.apache.cxf.transport.http.netty.server.integration;
import java.net.URL;
+
import javax.xml.ws.Endpoint;
+
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.springframework.context.ConfigurableApplicationContext;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
index 8dc44f9..95e2d3f 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.http.spring;
import org.w3c.dom.Element;
+
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.transport.http.auth.HttpAuthSupplier;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
index 421c73b..e8506fa 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.https;
import java.util.ArrayList;
import java.util.Collection;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
index 11d8ddd..dd5ba77 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
@@ -32,7 +32,6 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.configuration.jsse.TLSParameterBase;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
-
import org.apache.cxf.transport.https.httpclient.DefaultHostnameVerifier;
import org.apache.cxf.transport.https.httpclient.PublicSuffixMatcherLoader;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 420edd0..0e6ffbd 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -25,9 +25,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 2541b32..da3e3eb 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index f120e42..cdfe79c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -48,6 +48,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.https.HttpsURLConnectionFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index 27e1f1c..6a62bcf 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
index 0c3abb8..a65f1f3 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
@@ -26,9 +26,9 @@ import java.util.Map;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index b8ae818..6902a63 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.http.policy;
import org.apache.cxf.transport.http.policy.impl.ClientPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index 68874df..7884957 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.transport.http.policy.impl.ClientPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index c4806a0..4d483b0 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.transport.http.policy.impl.ServerPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index c8e9d56..d743e46 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyDataEngineImpl;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index e0bcdc5..c80a39c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.http.policy;
import org.apache.cxf.transport.http.policy.impl.ServerPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
index 0a7a17c..ebed529 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
@@ -19,11 +19,13 @@
package org.apache.cxf.transport.https;
import java.lang.reflect.Field;
+
import javax.net.ssl.HttpsURLConnection;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
index a135d76..0585336 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.servlet;
import javax.servlet.http.HttpServletRequest;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index 0361315..52a8633 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -30,8 +30,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
index c176051..d7842bc 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
@@ -20,7 +20,6 @@
package org.apache.cxf.transport.jms;
import java.io.IOException;
-
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index c7c6219..4bfb05d 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -46,6 +46,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
index e942db5..83d53fb 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
@@ -25,6 +25,7 @@ import java.io.Writer;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.Test;
public class JMSConduitTest extends AbstractJMSTester {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
index dee65ef..04fe35473 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint;
import org.apache.cxf.transport.jms.uri.MyBeanLocator;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 90bdd5d..c9a830a 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultiplexDestination;
import org.apache.cxf.transport.jms.util.ResourceCloser;
+
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
index d542dd1..e8772db 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.jms.util.TestReceiver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
index c44179c..47256c9 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Test;
public class RequestResponseTest extends AbstractJMSTester {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index ee247a4..0733e6b 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
index aeb3086..da3d31e 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.MessageObserver;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index 53b1492..4786ebc 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint.DeliveryModeType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
index ec66edf..7d2884b 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSMessageHeadersType;
import org.apache.cxf.transport.jms.util.TestReceiver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
index 3dbdab4..6e53b0c 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
@@ -33,6 +33,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.cxf.transport.jms.JMSConfiguration;
import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
index de503ed..1312fa5 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
@@ -36,6 +36,7 @@ import org.apache.activemq.ActiveMQXAConnectionFactory;
import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.pool.XaPooledConnectionFactory;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
index a4678d6..6c79c39 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
-
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index 7db0d3f..d9e7320 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -30,9 +30,9 @@ import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index 5814bd1..7e102ec 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -41,9 +41,9 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index bdc4b69..a2ed8c8 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -73,9 +73,9 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.WSAContextUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
index 88330b8..81f31ea 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 7330a9d..56f23fe 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.RelatesToType;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import org.apache.cxf.ws.addressing.v200408.Relationship;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
index 0082ee7..5c0b712 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.eventing.shared.faults;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.ws.addressing.FaultAction;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
index 4093f0b..6b33efa 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.eventing.shared.handlers;
import java.util.Set;
+
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
index b90581e..8521fd0 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
@@ -20,10 +20,12 @@
package org.apache.cxf.ws.eventing.shared.utils;
import java.util.GregorianCalendar;
+
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
+
import org.apache.cxf.ws.eventing.ExpirationType;
public final class DurationAndDateUtil {
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
index d027ec2..06497b6 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.ws.eventing.integration.notificationapi.assertions.WSAActi
import org.apache.cxf.ws.eventing.manager.SubscriptionManagerEndpoint;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
import org.apache.cxf.ws.eventing.shared.handlers.ReferenceParametersAddingHandler;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
index e603702..6831229 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.ws.eventing.integration.notificationapi.EarthquakeEvent;
import org.apache.cxf.ws.eventing.integration.notificationapi.FireEvent;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
index 0cf7ff6..2dc6e26 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.base.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.base.TestUtil;
import org.apache.cxf.ws.eventing.integration.eventsink.TestingEndToEndpointImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
index db2d6ae..f1e5a15 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.eventing.integration;
import java.io.IOException;
+
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.ws.soap.SOAPFaultException;
@@ -32,6 +33,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.shared.faults.CannotProcessFilter;
import org.apache.cxf.ws.eventing.shared.faults.NoDeliveryMechanismEstablished;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
index c6fdf2b..838659f 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.manager.SubscriptionManagerEndpoint;
import org.apache.cxf.ws.eventing.shared.faults.UnknownSubscription;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
index 8cf1faa..31f2487 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.eventing.integration.eventsink;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
+
import javax.jws.WebParam;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
index 5167ce0..44390a3 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
@@ -29,6 +29,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
index b4710ff..1896081 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy.attachment.external;
import java.util.Collection;
+
import org.w3c.dom.Element;
import org.apache.cxf.service.model.BindingFaultInfo;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
index 11181d0..5703c65 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.policy.blueprint;
import java.util.UUID;
import java.util.concurrent.Callable;
+
import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
index adb84de..ecd03e4 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy.blueprint;
import java.util.List;
+
import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
index f91ee11..24cf2be 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.neethi.Assertion;
import org.apache.neethi.builders.PrimitiveAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index deebdf7..4acb147 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -33,6 +33,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.PolicyContainingPrimitiveAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index ddacb3a..1f1ad1b 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -39,9 +39,9 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.Destination;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index cc863d1..e309287 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -42,9 +42,9 @@ import org.apache.neethi.Constants;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyOperator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
index e880c5f..db65db2 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.util.PolicyComparator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index e7ada1d..77f66f8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.policy.PolicyCalculator;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 0d123c7..b0b9140 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -51,9 +51,9 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
import org.apache.neethi.PolicyRegistry;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 75f23da..bf3d778 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index 9db0743..675415a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.Destination;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
index 8ef69cb..5535ca9 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
index 7006e31..2830788 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
index c4e9939..4382445 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
index 95153a5..af7a76a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.policy;
import java.lang.reflect.Method;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
index 1f9636d..394cb52 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.ws.policy.PolicyException;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
index 5b3eea6..e2da492 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
index 1e1dd56..d8c92e4 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
@@ -40,11 +40,13 @@ import org.apache.cxf.ws.policy.PolicyException;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
index 37de436..621237e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
index 5395de3..86993d3 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessageInfo.Type;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index 07238d7..95907dc 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index f8dc7f5..f5ee83a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -49,6 +49,7 @@ import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.util.PolicyComparator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
index 11c2edf..92bceda 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
@@ -32,6 +32,7 @@ import org.apache.neethi.Constants;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
index 4829283..d36d79a 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
@@ -33,9 +33,9 @@ import org.apache.neethi.All;
import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
index 0af9666..6c4ed07 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
@@ -33,9 +33,9 @@ import org.apache.neethi.All;
import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
index bff13e0..3a989d5 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.ws.policy.PolicyEngineImpl;
import org.apache.cxf.ws.policy.PolicyProvider;
import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
index 2346933..18df8e7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
index 1822135..e13e6f5 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
@@ -32,9 +32,9 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.ws.policy.AssertionInfo;
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index 72666b8..e05f7ce 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -38,9 +38,9 @@ import org.apache.cxf.ws.rm.v200702.ObjectFactory;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
index 2288247..6f5dba4 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
@@ -28,9 +28,9 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index e70963b..da9326d 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.wsdl.WSDLConstants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index 74fd6e2..3af556a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -52,9 +52,9 @@ import org.apache.cxf.ws.addressing.WSAddressingFeature.WSAddressingFeatureAppli
import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.OfferType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index e8c8777..67d2599 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
index acd179c..7243dd7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
@@ -47,9 +47,9 @@ import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.PolicyEngineImpl;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index c9411d8..953533a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -45,9 +45,9 @@ import org.apache.cxf.ws.rm.manager.RetryPolicyType;
import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index b144bee..8446d7c 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -63,10 +63,10 @@ import org.apache.cxf.ws.rm.persistence.RMMessage;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index d83a57e..da64acd 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -32,9 +32,9 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
index 4323903..912ad7b 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index 8ce959b..592161c 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -45,9 +45,9 @@ import org.apache.cxf.ws.rm.v200502.OfferType;
import org.apache.cxf.ws.rm.v200502.TerminateSequenceType;
import org.apache.cxf.ws.rm.v200702.CloseSequenceType;
import org.apache.cxf.ws.rm.v200702.TerminateSequenceResponseType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index cc74219..053bef8 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.rm.v200702.Expires;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.ObjectFactory;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 6fa941d..043f0d0 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -24,6 +24,7 @@ import java.sql.SQLException;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ws.rm.RMManager;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
index 967fa0a..14a67bb 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
@@ -21,13 +21,14 @@ package org.apache.cxf.ws.rm.persistence.jdbc;
import java.sql.Connection;
import java.sql.SQLException;
+
import org.apache.cxf.ws.rm.ProtocolVariation;
import org.apache.cxf.ws.rm.RMUtils;
import org.apache.cxf.ws.rm.SourceSequence;
import org.apache.cxf.ws.rm.persistence.RMStoreException;
import org.apache.cxf.ws.rm.v200702.Identifier;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
index 87d8e6e..21d41a8 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
@@ -41,9 +41,9 @@ import org.apache.cxf.ws.rm.persistence.RMMessage;
import org.apache.cxf.ws.rm.persistence.RMStoreException;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
index 524ee07..f12158d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
@@ -1,138 +1,138 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.ws.rm.persistence.jdbc;
-
-import java.text.MessageFormat;
-
-import org.apache.cxf.ws.rm.ProtocolVariation;
-import org.apache.cxf.ws.rm.SourceSequence;
-import org.apache.cxf.ws.rm.v200702.Identifier;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- */
-public class RMTxStoreTwoSchemasTest extends Assert {
- private static final String TEST_DB_NAME = "rmdbts";
-
- private static final String CLIENT_ENDPOINT_ID =
- "{http://apache.org/greeter_control}GreeterService/GreeterPort";
-
- private static RMTxStore store1;
- private static RMTxStore store2;
-
- private IMocksControl control;
-
- @BeforeClass
- public static void setUpOnce() {
- RMTxStore.deleteDatabaseFiles(TEST_DB_NAME, true);
-
- store1 = createStore("ONE");
- store2 = createStore("TWO");
- }
-
- @AfterClass
- public static void tearDownOnce() {
- RMTxStore.deleteDatabaseFiles(TEST_DB_NAME, false);
- }
-
- private static RMTxStore createStore(String sn) {
- RMTxStore store = new RMTxStore();
- store.setDriverClassName("org.apache.derby.jdbc.EmbeddedDriver");
-
- // workaround for the db file deletion problem during the tests
- store.setUrl(MessageFormat.format("jdbc:derby:{0};create=true", TEST_DB_NAME));
-
- // use the specified schema
- store.setSchemaName(sn);
- store.init();
-
- return store;
- }
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- }
-
- @Test
- public void testSetCurrentSchema() throws Exception {
- // schema should have been set during initialisation
- // but verify the operation is idempotent
- store1.setCurrentSchema();
- }
-
- @Test
- public void testStoreIsolation() throws Exception {
- SourceSequence seq = control.createMock(SourceSequence.class);
- Identifier sid1 = new Identifier();
- sid1.setValue("sequence1");
- EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
- EasyMock.expect(seq.getExpires()).andReturn(null);
- EasyMock.expect(seq.getOfferingSequenceIdentifier()).andReturn(null);
- EasyMock.expect(seq.getEndpointIdentifier()).andReturn(CLIENT_ENDPOINT_ID);
- EasyMock.expect(seq.getProtocol()).andReturn(ProtocolVariation.RM10WSA200408);
-
- control.replay();
- store1.createSourceSequence(seq);
- control.verify();
-
- SourceSequence rseq = store1.getSourceSequence(sid1);
- assertNotNull(rseq);
-
- rseq = store2.getSourceSequence(sid1);
- assertNull(rseq);
-
- control.reset();
- EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
- EasyMock.expect(seq.getExpires()).andReturn(null);
- EasyMock.expect(seq.getOfferingSequenceIdentifier()).andReturn(null);
- EasyMock.expect(seq.getEndpointIdentifier()).andReturn(CLIENT_ENDPOINT_ID);
- EasyMock.expect(seq.getProtocol()).andReturn(ProtocolVariation.RM10WSA200408);
-
- control.replay();
- store2.createSourceSequence(seq);
- control.verify();
-
- rseq = store2.getSourceSequence(sid1);
- assertNotNull(rseq);
-
- // create another store
- RMTxStore store3 = createStore(null);
- store3.init();
-
- rseq = store3.getSourceSequence(sid1);
- assertNull(rseq);
-
- // switch to the store1's schema
- store3.setSchemaName(store1.getSchemaName());
- store3.init();
-
- rseq = store3.getSourceSequence(sid1);
- assertNotNull(rseq);
- }
-}
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.ws.rm.persistence.jdbc;
+
+import java.text.MessageFormat;
+
+import org.apache.cxf.ws.rm.ProtocolVariation;
+import org.apache.cxf.ws.rm.SourceSequence;
+import org.apache.cxf.ws.rm.v200702.Identifier;
+
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class RMTxStoreTwoSchemasTest extends Assert {
+ private static final String TEST_DB_NAME = "rmdbts";
+
+ private static final String CLIENT_ENDPOINT_ID =
+ "{http://apache.org/greeter_control}GreeterService/GreeterPort";
+
+ private static RMTxStore store1;
+ private static RMTxStore store2;
+
+ private IMocksControl control;
+
+ @BeforeClass
+ public static void setUpOnce() {
+ RMTxStore.deleteDatabaseFiles(TEST_DB_NAME, true);
+
+ store1 = createStore("ONE");
+ store2 = createStore("TWO");
+ }
+
+ @AfterClass
+ public static void tearDownOnce() {
+ RMTxStore.deleteDatabaseFiles(TEST_DB_NAME, false);
+ }
+
+ private static RMTxStore createStore(String sn) {
+ RMTxStore store = new RMTxStore();
+ store.setDriverClassName("org.apache.derby.jdbc.EmbeddedDriver");
+
+ // workaround for the db file deletion problem during the tests
+ store.setUrl(MessageFormat.format("jdbc:derby:{0};create=true", TEST_DB_NAME));
+
+ // use the specified schema
+ store.setSchemaName(sn);
+ store.init();
+
+ return store;
+ }
+
+ @Before
+ public void setUp() {
+ control = EasyMock.createNiceControl();
+ }
+
+ @Test
+ public void testSetCurrentSchema() throws Exception {
+ // schema should have been set during initialisation
+ // but verify the operation is idempotent
+ store1.setCurrentSchema();
+ }
+
+ @Test
+ public void testStoreIsolation() throws Exception {
+ SourceSequence seq = control.createMock(SourceSequence.class);
+ Identifier sid1 = new Identifier();
+ sid1.setValue("sequence1");
+ EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
+ EasyMock.expect(seq.getExpires()).andReturn(null);
+ EasyMock.expect(seq.getOfferingSequenceIdentifier()).andReturn(null);
+ EasyMock.expect(seq.getEndpointIdentifier()).andReturn(CLIENT_ENDPOINT_ID);
+ EasyMock.expect(seq.getProtocol()).andReturn(ProtocolVariation.RM10WSA200408);
+
+ control.replay();
+ store1.createSourceSequence(seq);
+ control.verify();
+
+ SourceSequence rseq = store1.getSourceSequence(sid1);
+ assertNotNull(rseq);
+
+ rseq = store2.getSourceSequence(sid1);
+ assertNull(rseq);
+
+ control.reset();
+ EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
+ EasyMock.expect(seq.getExpires()).andReturn(null);
+ EasyMock.expect(seq.getOfferingSequenceIdentifier()).andReturn(null);
+ EasyMock.expect(seq.getEndpointIdentifier()).andReturn(CLIENT_ENDPOINT_ID);
+ EasyMock.expect(seq.getProtocol()).andReturn(ProtocolVariation.RM10WSA200408);
+
+ control.replay();
+ store2.createSourceSequence(seq);
+ control.verify();
+
+ rseq = store2.getSourceSequence(sid1);
+ assertNotNull(rseq);
+
+ // create another store
+ RMTxStore store3 = createStore(null);
+ store3.init();
+
+ rseq = store3.getSourceSequence(sid1);
+ assertNull(rseq);
+
+ // switch to the store1's schema
+ store3.setSchemaName(store1.getSchemaName());
+ store3.init();
+
+ rseq = store3.getSourceSequence(sid1);
+ assertNotNull(rseq);
+ }
+}
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
index 960786c..5385c62 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.ws.rmp.v200502.RMAssertion.AcknowledgementInterval;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.BaseRetransmissionInterval;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.ExponentialBackoff;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.InactivityTimeout;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index e1f2501..9a17328 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -40,9 +40,9 @@ import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
index bb26144..5cdde05 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
@@ -37,9 +37,9 @@ import org.apache.cxf.ws.rm.SequenceFault;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceFaultType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
index 22f9cde..53264b9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.security.cache;
import java.net.URL;
import net.sf.ehcache.CacheManager;
-
import org.apache.cxf.Bus;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
index 89422ed..22c70e2 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
@@ -29,6 +29,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
index 4125bbd..2fb969a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
@@ -29,6 +29,7 @@ import java.util.Map;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.SoapActionInInterceptor;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index b4ddb8a..03b755d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -30,7 +30,6 @@ import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.Status;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
index 522c596..96fd57e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
@@ -35,6 +35,7 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.staxutils.StaxUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index d6e9806..6ac5a8b 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -51,11 +51,11 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
-//import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
index b23e124..948e13b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
@@ -41,6 +41,7 @@ import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
index 121789e..c2e138b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
@@ -20,6 +20,7 @@ package org.apache.cxf.ws.security.trust;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 3cb4f3a..995ca18 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -23,6 +23,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
index 7c32240..1cf7c11 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
@@ -28,6 +28,7 @@ import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.w3c.dom.Element;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
index 698b2b0..2baafa5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
@@ -27,6 +27,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.utils.SecurityUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
index deefa6a..4d4ac6b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
index 2db5998..c7adb2f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
@@ -33,6 +33,7 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 0370c75..ae3012a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index 2c881fb..bb96227 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -28,6 +28,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Element;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
index f6ff3f5..e40be10 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
@@ -32,6 +32,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
index 7d5d881..30e840c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
@@ -44,6 +44,7 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.xml.sax.InputSource;
import org.apache.cxf.binding.soap.saaj.SAAJStreamWriter;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index 80b38e2..1f52ff6 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -29,6 +29,7 @@ import java.util.Set;
import javax.security.auth.Subject;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.headers.Header;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 07aed93..f35320e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -38,6 +38,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index 3ec5fd3..0b9a2b2 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -30,6 +30,7 @@ import java.util.logging.Logger;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 313f8cf..759482b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -54,6 +54,7 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 93d849c..946885b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -34,6 +34,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
index dca4456..9baea4e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
@@ -31,6 +31,7 @@ import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
index 4e092d7..5f3922f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
@@ -31,6 +31,7 @@ import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.rt.security.utils.SecurityUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
index 44bd438..c85ed23 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
@@ -26,6 +26,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
index fcc5c8f..4a7c096 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
@@ -39,6 +39,7 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
index 82c8a85..fe09f62 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.wss4j.dom.WSDataRef;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
index d1c086a..7a167ec 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
@@ -29,6 +29,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.ws.policy.AssertionInfo;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index 92bcf0b..65d0c2b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -23,10 +23,10 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Status;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index 96363dd..300a9ec 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.jaxb.JAXBContextCache;
@@ -48,6 +49,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
index ced0d98..2c84ccb 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.security.SecurityConstants;
+
import org.junit.BeforeClass;
public class EHCacheTokenStoreTest extends org.junit.Assert {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
index 9a12f63..4b761b8 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.security.SecurityConstants;
+
import org.junit.BeforeClass;
public class MemoryTokenStoreTest extends org.junit.Assert {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 71e7bb3..66e6066 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -28,6 +28,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.w3c.dom.Document;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
@@ -41,6 +42,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
index 59c3404..e47acd8 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.AsymmetricBinding;
+
import org.junit.Test;
public class CustomPolicyAlgorithmsTest extends AbstractPolicySecurityTest {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
index 0cc38d4..fcc9aaf 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
index ff15e06..6f25251 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
@@ -35,6 +35,7 @@ import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
index 5ac0f24..9ad3396 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
index 26cd7c5..f2647b4 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParamete
import org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SP12Constants;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
index 549e8bf..ccabaa1 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
@@ -38,6 +38,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
index fc77d91..cdc32f9 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyException;
import org.apache.cxf.ws.security.policy.interceptors.SecurityVerificationOutInterceptor;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index 51824fe..5f70523 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 31debf3..471a901 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -57,6 +57,7 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
index bcb0d95..549bfc8 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
@@ -35,6 +35,7 @@ import org.apache.wss4j.dom.action.UsernameTokenAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+
import org.junit.Test;
public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
index 50b85dc..3707a19 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
@@ -42,6 +42,7 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
index 34a5aaa..18a4b6a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
import org.apache.wss4j.dom.validate.SamlAssertionValidator;
import org.apache.wss4j.policy.SP12Constants;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index 15a782b..e18fdc4 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -56,6 +56,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 07d4f4f..85f095b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -50,6 +50,7 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+
import org.junit.Test;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
index dcea885..b3977c9 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.wsdl;
import java.util.Map;
+
import javax.wsdl.extensions.ExtensionRegistry;
public abstract class AbstractWSDLPlugin implements WSDLExtensibilityPlugin {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index 5548bbc..c48527f 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -62,6 +62,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.util.StreamReaderDelegate;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
index 5742c29..9bbd8b4 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.wsdl;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionRegistry;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
index d6f3390..96f718b 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
@@ -25,7 +25,9 @@ import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
+
import org.w3c.dom.Element;
+
import org.apache.cxf.service.model.ServiceSchemaInfo;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
index f6b88b4..00e3093 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.wsdl11;
import java.io.IOException;
import javax.wsdl.xml.WSDLLocator;
+
import org.xml.sax.InputSource;
public abstract class AbstractWrapperWSDLLocator implements WSDLLocator {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
index 0b2432e..e984a63 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
@@ -41,10 +41,8 @@ import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPFault;
import javax.wsdl.extensions.soap.SOAPOperation;
-
import javax.xml.namespace.QName;
-
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
index 8921d8d..542c143 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.net.URL;
import javax.wsdl.xml.WSDLLocator;
+
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 175b877..3843afd 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -26,6 +26,7 @@ import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.Types;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index 94c0ec8..443ab27 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -46,6 +46,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
index 0362a26..9e8884b 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.PartialXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
index 99d4a62..157fa61 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
@@ -26,9 +26,9 @@ import org.apache.cxf.Bus;
import org.apache.cxf.service.factory.FactoryBeanListenerManager;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.wsdl.WSDLManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index 6e2b3e4..46b5c79 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -61,9 +61,9 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index 6559a3d..afe828f 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -34,6 +34,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.staxutils.PropertiesExpandingStreamReader;
import org.apache.cxf.staxutils.XMLStreamReaderWrapper;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index 5f4a498..192ccc8 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -66,9 +66,9 @@ import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
index a774c7f..e700ff4 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.Map;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.STSConstants;
import org.apache.cxf.sts.request.Renewing;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
index f0591e0..f944b02 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
@@ -34,7 +34,6 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index 0bb2900..77da838 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -29,6 +29,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.rt.security.claims.ClaimCollection;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
index 71d7d7a..01a32d8 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
index d3134d4..438b2ca 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
@@ -32,7 +32,6 @@ import javax.naming.directory.SearchControls;
import javax.security.auth.x500.X500Principal;
import org.apache.cxf.helpers.CastUtils;
-
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
index 4acbc82..df9cccf 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
@@ -20,7 +20,6 @@
package org.apache.cxf.sts.event;
import org.apache.cxf.sts.event.map.MapEventLogger;
-
import ch.qos.logback.classic.PatternLayout;
public class LoggerPatternLayoutLogback extends PatternLayout {
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index e72e526..ef667f6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.rt.security.claims.ClaimCollection;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
index d220670..17e87ee 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
@@ -27,6 +27,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.QNameConstants;
import org.apache.cxf.ws.security.sts.provider.STSException;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index b3d6b62..1be31c0 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -44,6 +44,7 @@ import javax.xml.crypto.dsig.keyinfo.X509Data;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.CastUtils;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
index f3d0719..a93c194 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
@@ -35,6 +35,7 @@ import javax.xml.bind.JAXBElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
index 795c0a9..770c76d 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import javax.crypto.SecretKey;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.sts.request.ReceivedToken;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
index 675e6ab..5688080 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.request.ReceivedToken;
import org.apache.cxf.sts.request.ReceivedToken.STATE;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
index 960ca2f..bf9cec0 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
index d0476a0..94cab73 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
@@ -19,6 +19,7 @@
package org.apache.cxf.sts.token.provider;
import java.util.List;
+
import org.w3c.dom.Document;
import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index 0fe906d..ecd7ea0 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -34,6 +34,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
index 94c5845..2dda438 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.token.renewer;
import java.util.Date;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.token.provider.TokenReference;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
index 59edca2..c72db3b 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.STSConstants;
import org.apache.cxf.sts.STSPropertiesMBean;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
index cbbd573..9d559da 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
@@ -33,6 +33,7 @@ import javax.xml.bind.Marshaller;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
index 64ab7a3..dd028aa 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
@@ -22,6 +22,7 @@ import java.util.Date;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
+
import org.junit.BeforeClass;
public class HazelCastTokenStoreTest extends org.junit.Assert {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
index e4cd5ae..4dca077 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.sts.StaticSTSProperties;
import org.apache.cxf.sts.claims.ClaimsParameters;
import org.apache.cxf.sts.claims.ProcessedClaim;
import org.apache.cxf.sts.claims.ProcessedClaimCollection;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
index f460245..a0f550c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.common;
import java.net.URI;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.sts.claims.ClaimsParser;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
index 6567825..e0c76d9 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class PasswordCallbackHandler implements CallbackHandler {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
index 0ddd090..eeb45f1 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
@@ -28,6 +28,7 @@ import org.apache.cxf.sts.claims.ClaimsParameters;
import org.apache.cxf.sts.claims.ProcessedClaim;
import org.apache.cxf.sts.claims.ProcessedClaimCollection;
import org.apache.cxf.sts.token.realm.RealmSupport;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
index 98a09a4..ca9a69c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.operation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.token.provider.TokenProvider;
import org.apache.cxf.sts.token.provider.TokenProviderParameters;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index 753318d..d8a54c0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
@@ -84,6 +85,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index 86848dd..d6e662e 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -77,6 +77,7 @@ import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
index d59ecd8..669a510 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
@@ -61,6 +61,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
index edd2290..1a05913 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
@@ -59,6 +59,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index 1519abf..7ad9283 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
index a7aca83..15fc870 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
@@ -31,6 +31,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
index 96fe5c8..425ffe8 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index 1725440..30667a0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -67,6 +67,7 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index e4b8a11..cb22b3b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -79,6 +79,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index f89725f..86b0816 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -28,6 +28,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index 177f216..1ea293d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
index a804754..5ff9cf3 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
@@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.xml.sax.InputSource;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
index f2a2018..e5cffc6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
index eb8a7f5..c83f7b5 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
index 0776bc4..26d725d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
@@ -52,6 +52,7 @@ import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.crypto.Merlin;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index 5cba585..d7abb49 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Properties;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index aaa4636..dfb47b6 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Properties;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
index 2bf239b..ba11b75 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.sts.claims.ProcessedClaimCollection;
import org.apache.cxf.sts.common.RealmSupportClaimsHandler;
import org.apache.cxf.sts.operation.CustomIdentityMapper;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
public class RealmSupportTest extends org.junit.Assert {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
index c56d61e..3e4c0c7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
@@ -50,6 +50,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index 140d342..22e681d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -29,6 +29,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -62,6 +63,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index dd3f5b3..35eac35 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -60,6 +60,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index 27643be..af74d0f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -56,6 +56,7 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index 604954e..76ce132 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -51,6 +51,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.BeforeClass;
@@ -246,4 +247,4 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert {
}
-}
\ No newline at end of file
+}
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index c3aa337..f39595b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -34,6 +34,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -66,6 +67,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
+
import org.junit.BeforeClass;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
index fbf0db5..13307be 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
index bdccfaa..6a683cf 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index 0838611..4f017da 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSUtils;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index 5d06446..8394074 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -42,6 +42,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.soap.SoapBindingConstants;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
index 8738334..fed3f44 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
index 09231af..ccd7059 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
@@ -41,6 +41,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
index b387f63..5fc2cdf 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
@@ -28,7 +28,6 @@ import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
-
import org.example.contract.doubleit.DoubleItPortType;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
index 8aba66d..8ff99db 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
@@ -41,6 +41,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
index e6e1e69..0b8c6f1 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
index 83f4698..ff9c468 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.claims;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.claims.ClaimTypes;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
index c5e4d5f..c18b4d8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.claims;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.claims.ClaimTypes;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
index 6e7735f..a91406c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index 35cba09..26fe1ff 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
index 1685509..74dc0ea 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.xml.ws.BindingProvider;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
index a5bd8fe..d237277 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
index a604507..20c8467 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
@@ -55,6 +55,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index 3fccdae..cd2106a 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -29,8 +29,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.rt.security.SecurityConstants;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
index 295ea75..bd6ae3d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
index d9fca2a..3f87910 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
index ef8314a..2ee9dd8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.sts.claims.ClaimsParser;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
index 5b6d481..bff0327 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
@@ -27,8 +27,8 @@ import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
index 00ed2b1..7ade797 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
index 76fcb6e..e338467 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
@@ -43,6 +43,7 @@ import org.apache.cxf.ws.security.policy.interceptors.STSTokenOutInterceptor;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.ws.security.trust.STSTokenRetriever.TokenRequestParams;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
index 11e187a..769fcfe 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
index 1d4bcc0..2847a43 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
@@ -36,6 +36,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
import org.ietf.jgss.GSSCredential;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
index b5392bb..34612ce 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.auth.SpnegoAuthSupplier;
import org.example.contract.doubleit.DoubleItPortType;
import org.ietf.jgss.GSSName;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
index 97c0b3b..7c7f2ad 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
@@ -27,8 +27,8 @@ import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
index 004c25c..a711fb3 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
@@ -30,8 +30,8 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index 6dba847..e795592 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
index b1e4abb..d71fcb0 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
index 921998b..6c990d4 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
@@ -27,8 +27,8 @@ import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
index 6050beb..df72ac8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
index beaf0ce..a1c245c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
@@ -29,6 +29,7 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -42,6 +43,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
index a0f133c..0a9da4d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.common.TestParam;
import org.apache.cxf.systest.sts.common.TokenTestUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
index 4c3e44f..5daca27 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
@@ -33,6 +33,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
index 1410e77..542443c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
index d7de4eb..f4ca4fc 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index 614361f..77bf8b5 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -41,6 +41,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
index 369e4ea..9a9b6ae 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
index 6e7735f..a91406c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index 423ad72..ecb2898 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index fa66846..fbcffd8 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -26,6 +26,7 @@ import java.util.Properties;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
@@ -49,6 +50,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.dom.WSConstants;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
index 42c02f5..9b98024 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
@@ -28,6 +28,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
index e764864..b8fff86 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
@@ -35,6 +35,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
index 32b4799..1f28cca 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
@@ -34,6 +34,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
index 53bda69..7992c86 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
index 4e7bd78..33191b6 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
index e1edf69..e642956 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 7a6ff22..9afef7c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -29,6 +29,7 @@ import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -69,6 +70,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
index 944e3fc..3393acb 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index fbe4b2a..a0ef5bc 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -70,6 +70,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
index 61595c2..089904c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
index 5ac75a5..01697fb 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index f8c6d8d..bce2961 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 7e14507..682c593 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.wss4j.dom.WSConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
index 610fb45..21228ee 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.username_actas;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.handler.RequestData;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
index 9cef3f7..e659ac2 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index 7857b4f..e58c386 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
index 4ae1568..a4c1876 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
index b72a830..4a43084 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
index 86cf52f..1acde63 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.systest.sts.common.TokenTestUtils;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
index ea9fb89..2e4e8dd 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index 8330f58..cd24b12 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.itests;
import java.io.File;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
index 1ba65db..1747528 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.itests.unit;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index 24a400a..730f41b 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -40,6 +40,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java b/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
index 306c520..58e0aeb 100644
--- a/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
+++ b/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.osgi;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
... 4857 lines suppressed ...
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.