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/05 15:42:05 UTC
[cxf] 02/02: Update to latest checkstyle to match what eclipse
installs now
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1b61831baa6c866a04ce7cd95b46f3041ec4f83e
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Jan 5 10:34:54 2018 -0500
Update to latest checkstyle to match what eclipse installs now
---
.../apache/cxf/bus/osgi/OSGiBusListenerTest.java | 6 ++---
.../cxf/bus/spring/BusApplicationContextTest.java | 2 +-
.../cxf/bus/spring/BusApplicationListenerTest.java | 4 ++--
.../cxf/bus/spring/BusDefinitionParserTest.java | 2 +-
.../configuration/spring/ConfigurerImplTest.java | 6 ++---
.../autoconfigure/CxfAutoConfigurationTests.java | 11 ++++-----
.../boot/autoconfigure/CxfPropertiesTest.java | 8 +++----
.../brave/AbstractBraveClientInterceptor.java | 2 +-
.../tracing/brave/AbstractBraveClientProvider.java | 12 +++++-----
.../tracing/brave/AbstractBraveInterceptor.java | 2 +-
.../cxf/tracing/brave/AbstractBraveProvider.java | 10 ++++----
.../cxf/tracing/brave/BraveClientFeature.java | 4 ++--
.../tracing/brave/BraveClientStartInterceptor.java | 2 +-
.../tracing/brave/BraveClientStopInterceptor.java | 2 +-
.../org/apache/cxf/tracing/brave/BraveFeature.java | 4 ++--
.../cxf/tracing/brave/BraveStartInterceptor.java | 2 +-
.../cxf/tracing/brave/BraveStopInterceptor.java | 2 +-
.../cxf/tracing/brave/BraveTracerContext.java | 4 ++--
.../cxf/tracing/brave/HttpClientSpanParser.java | 2 +-
.../cxf/tracing/brave/HttpServerSpanParser.java | 2 +-
.../tracing/brave/jaxrs/BraveClientProvider.java | 4 ++--
.../tracing/brave/jaxrs/BraveContextProvider.java | 4 ++--
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 2 +-
.../cxf/tracing/brave/jaxrs/BraveProvider.java | 2 +-
.../apache/cxf/tracing/brave/BraveTraceTest.java | 6 ++---
.../tracing/htrace/ext/LogbackSpanConverter.java | 4 ++--
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 8 +++----
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 4 ++--
.../cxf/osgi/itests/soap/HttpServiceTest.java | 2 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 2 +-
parent/pom.xml | 2 +-
pom.xml | 2 +-
.../apache/cxf/binding/corba/CorbaBindingTest.java | 2 +-
.../apache/cxf/binding/corba/CorbaConduitTest.java | 14 +++++------
.../apache/cxf/binding/corba/CorbaMessageTest.java | 10 ++++----
.../cxf/binding/corba/CorbaServerConduitTest.java | 12 +++++-----
.../binding/corba/runtime/CorbaDSIServantTest.java | 6 ++---
.../corba/runtime/CorbaObjectReaderTest.java | 10 ++++----
.../corba/runtime/CorbaObjectWriterTest.java | 10 ++++----
.../binding/corba/runtime/CorbaStreamableTest.java | 10 ++++----
.../binding/corba/types/CorbaAnyHandlerTest.java | 8 +++----
.../binding/corba/types/CorbaArrayHandlerTest.java | 6 ++---
.../binding/corba/types/CorbaEnumHandlerTest.java | 4 ++--
.../binding/corba/types/CorbaFixedHandlerTest.java | 4 ++--
.../binding/corba/types/CorbaHandlerUtilsTest.java | 4 ++--
.../corba/types/CorbaObjectHandlerTest.java | 6 ++---
.../corba/types/CorbaPrimitiveHandlerTest.java | 4 ++--
.../corba/types/CorbaSequenceHandlerTest.java | 6 ++---
.../corba/types/CorbaStructHandlerTest.java | 8 +++----
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 6 ++---
.../jaxrs/spring/JAXRSServerFactoryBeanTest.java | 2 +-
.../jaxrs/spring/SpringResourceFactoryTest.java | 4 ++--
.../springmvc/SpringViewResolverProviderTest.java | 10 ++++----
.../apache/cxf/jaxws/SchemaFirstXmlConfigTest.java | 2 +-
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 7 +++---
.../cxf/js/rhino/AbstractDOMProviderTest.java | 2 +-
.../apache/cxf/js/rhino/ProviderFactoryTest.java | 4 ++--
.../spring/AbstractSimpleFrontendSpringTest.java | 2 +-
.../cxf/frontend/spring/ClientServerTest.java | 2 +-
.../cxf/frontend/spring/SpringBeansTest.java | 2 +-
.../java/org/apache/cxf/javascript/AegisTest.java | 4 ++--
.../java/org/apache/cxf/javascript/AnyTest.java | 6 ++---
.../cxf/javascript/DocLitBareClientTest.java | 6 ++---
.../cxf/javascript/DocLitWrappedClientTest.java | 6 ++---
.../apache/cxf/javascript/GreeterClientTest.java | 4 ++--
.../cxf/javascript/JavascriptTestUtilities.java | 4 ++--
.../apache/cxf/javascript/JsHttpRequestTest.java | 4 ++--
.../java/org/apache/cxf/javascript/MtoMTest.java | 4 ++--
.../apache/cxf/javascript/QueryHandlerTest.java | 2 +-
.../org/apache/cxf/javascript/RPCClientTest.java | 6 ++---
.../apache/cxf/javascript/types/AttributeTest.java | 2 +-
.../cxf/javascript/types/SerializationTest.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 2 +-
.../client/spring/JAXRSClientFactoryBeanTest.java | 2 +-
.../jaxrs/provider/atom/AtomPojoProviderTest.java | 2 +-
.../jaxrs/reactor/client/ReactorInvokerImpl.java | 4 ++--
rt/rs/microprofile-client/pom.xml | 28 ++++++++++++++++++++++
.../microprofile/client/ContractComparator.java | 1 +
.../client/CxfTypeSafeClientBuilder.java | 2 ++
.../client/DefaultResponseExceptionMapper.java | 1 +
.../client/MicroProfileClientProviderFactory.java | 3 ++-
.../microprofile/client/cdi/RestClientBean.java | 4 +++-
.../client/cdi/RestClientExtension.java | 2 ++
.../client/proxy/MicroProfileClientProxyImpl.java | 4 +++-
.../client/spi/CxfRestClientBuilderResolver.java | 1 +
.../client/CxfTypeSafeClientBuilderTest.java | 2 ++
.../code/JPACMTCodeDataProviderOpenJPATest.java | 3 ++-
.../grants/code/JPACMTCodeDataProviderTest.java | 7 +++---
.../code/JPACMTOAuthDataProviderOpenJPATest.java | 5 ++--
.../grants/code/JPACMTOAuthDataProviderTest.java | 12 +++++-----
.../oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java | 9 ++++---
.../oidc/idp/JPAOidcUserSubjectCMTTest.java | 8 +++----
.../http_jetty/JettyHTTPDestinationTest.java | 4 +---
.../http_jetty/JettyHTTPServerEngineTest.java | 6 ++---
.../http_jetty/spring/ApplicationContextTest.java | 2 +-
.../netty/client/NettyHttpConduitFactoryTest.java | 3 ++-
.../integration/SSLNettySpringServerTest.java | 4 ++--
.../server/spring/ApplicationContextTest.java | 2 +-
.../http_undertow/UndertowHTTPDestinationTest.java | 5 ++--
.../spring/ApplicationContextTest.java | 2 +-
.../IgnorablePolicyInterceptorProviderTest.java | 2 +-
.../cxf/ws/policy/PolicyEngineImplInitTest.java | 4 ++--
.../external/ExternalAttachmentProviderTest.java | 4 ++--
.../cxf/sts/event/LoggerPatternLayoutLogback.java | 2 +-
.../sts/token/provider/SAMLProviderActAsTest.java | 2 +-
.../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 2 +-
.../java/org/apache/cxf/wsn/WsnBrokerTest.java | 4 ++--
.../cxf/xkms/itests/BasicIntegrationTest.java | 3 +--
.../handlers/validator/ValidatorCRLTest.java | 4 ++--
.../itests/handlers/validator/ValidatorTest.java | 4 ++--
.../cxf/systest/grizzly/EndpointAPITest.java | 2 +-
.../apache/cxf/systest/aegis/AegisJaxWsTest.java | 4 ++--
.../apache/cxf/systest/aegis/AegisWSDLNSTest.java | 4 ++--
.../cxf/systest/aegis/CharacterSchemaTest.java | 4 ++--
.../apache/cxf/systest/aegis/mtom/MtomTest.java | 4 ++--
.../apache/cxf/systest/jaxb/TestServiceTest.java | 4 ++--
.../jaxb/validators/CustomValidatorJAXBTest.java | 4 ++--
.../AbstractSwagger2ServiceDescriptionTest.java | 2 +-
.../AbstractOpenApiServiceDescriptionTest.java | 6 ++---
.../openapi/OpenApiCustomPropertiesTest.java | 5 ++--
.../jaxrs/reactive/JAXRSRxJava2FlowableTest.java | 3 ++-
.../jaxrs/reactive/JAXRSRxJava2ObservableTest.java | 3 ++-
.../systest/jaxrs/security/JAXRSHttpsBookTest.java | 2 +-
...lientServerWebSocketSpringNoAtmosphereTest.java | 5 ++--
.../JAXRSClientServerWebSocketSpringTest.java | 3 +--
.../org/apache/cxf/systest/jaxws/CXF6655Test.java | 4 ++--
.../cxf/systest/kerberos/ldap/LDAPClaimsTest.java | 2 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 8 +++----
.../opentracing/OpenTracingTracingTest.java | 10 ++++----
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 6 ++---
.../jaxws/tracing/brave/BraveTracingTest.java | 6 ++---
.../opentracing/OpenTracingTracingTest.java | 10 ++++----
.../cxf/systest/jms/JMSClientServerTest.java | 2 +-
...lientServerWebSocketSpringNoAtmosphereTest.java | 5 ++--
.../JAXRSClientServerWebSocketSpringTest.java | 5 ++--
.../cxf/systest/http/HTTPProxyAuthConduitTest.java | 12 +++++-----
.../cxf/systest/http/HTTPProxyConduitTest.java | 11 ++++-----
.../systest/http_jetty/EngineLifecycleTest.java | 8 +++----
.../systest/https/conduit/HTTPSConduitTest.java | 2 +-
.../https/conduit/HTTPSProxyAuthConduitTest.java | 12 +++++-----
.../https/conduit/HTTPSProxyConduitTest.java | 12 +++++-----
.../cxf/cxf1226/MissingQualification1226Test.java | 2 +-
.../cxf/systest/bus/SpringBusFactoryTest.java | 2 +-
.../apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 +-
.../org/apache/cxf/systest/cxf993/Cxf993Test.java | 6 ++---
.../soapfault/SOAPFaultRequestTestCase.java | 2 +-
.../cxf/systest/wsdl/CrossSchemaImportsTests.java | 6 ++---
.../cxf/systest/ws/rm/WSRMPolicyResolveTest.java | 2 +-
.../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java | 2 +-
.../ws/policy/JavaFirstPolicyServiceTest.java | 2 +-
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 4 ++--
...SSecurity10UsernameAuthorizationLegacyTest.java | 4 ++--
.../WSSecurity10UsernameAuthorizationTest.java | 4 ++--
...SDLAddrPolicyAttachmentJaxwsMMProviderTest.java | 4 ++--
.../org/apache/cxf/test/AbstractCXFSpringTest.java | 8 +++----
155 files changed, 385 insertions(+), 344 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 a9b1ac6..71c520a 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,9 @@ 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.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -37,9 +40,6 @@ 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;
/**
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index 7d69da9..c8bfd91 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.cxf.bus.spring;
+import org.springframework.beans.BeansException;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.beans.BeansException;
public class BusApplicationContextTest extends Assert {
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 4005303..e35e8f3 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,13 +21,13 @@ 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.springframework.context.support.AbstractRefreshableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
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 {
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 9103612..73eba3c 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
@@ -32,10 +32,10 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
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 bdbbd8e..0bbe4e4 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,13 +30,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurable;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
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/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 5c139a8..34d1283 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
@@ -19,12 +19,6 @@
package org.apache.cxf.spring.boot.autoconfigure;
import org.hamcrest.Matcher;
-
-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.util.EnvironmentTestUtils;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -32,6 +26,11 @@ import org.springframework.mock.web.MockServletContext;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasItem;
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfPropertiesTest.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfPropertiesTest.java
index b38b819..b554472 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfPropertiesTest.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfPropertiesTest.java
@@ -21,10 +21,6 @@ package org.apache.cxf.spring.boot.autoconfigure;
import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -32,6 +28,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
@ContextConfiguration(classes = {CxfPropertiesTest.Config.class})
@RunWith(SpringJUnit4ClassRunner.class)
public class CxfPropertiesTest extends Assert {
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 d230446..f785c72 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
@@ -22,9 +22,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
+import brave.http.HttpTracing;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
-import brave.http.HttpTracing;
public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
implements PhaseInterceptor<Message> {
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 b16edb5..bd208f2 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
@@ -24,6 +24,12 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import brave.Span;
+import brave.Tracer.SpanInScope;
+import brave.http.HttpClientAdapter;
+import brave.http.HttpClientHandler;
+import brave.http.HttpTracing;
+import brave.propagation.Propagation.Setter;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.tracing.AbstractTracingProvider;
@@ -31,12 +37,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;
-import brave.http.HttpClientHandler;
-import brave.http.HttpTracing;
-import brave.propagation.Propagation.Setter;
public abstract class AbstractBraveClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveClientProvider.class);
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index a001d1b..dbb24f8 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -27,12 +27,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import brave.http.HttpTracing;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.tracing.AbstractTracingProvider;
-import brave.http.HttpTracing;
public abstract class AbstractBraveInterceptor extends AbstractBraveProvider implements PhaseInterceptor<Message> {
private final String phase;
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 ac6f020..46d9862 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
@@ -23,6 +23,11 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import brave.Span;
+import brave.Tracer.SpanInScope;
+import brave.http.HttpServerAdapter;
+import brave.http.HttpServerHandler;
+import brave.http.HttpTracing;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -31,11 +36,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;
-import brave.http.HttpServerHandler;
-import brave.http.HttpTracing;
public abstract class AbstractBraveProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveProvider.class);
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 33f043b..3d2cb92 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
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.tracing.brave;
+import brave.Tracing;
+import brave.http.HttpTracing;
import org.apache.cxf.Bus;
import org.apache.cxf.annotations.Provider;
import org.apache.cxf.annotations.Provider.Scope;
@@ -25,8 +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;
@NoJSR250Annotations
@Provider(value = Type.Feature, scope = Scope.Client)
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 edc2da5..2916c41 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
@@ -18,11 +18,11 @@
*/
package org.apache.cxf.tracing.brave;
+import brave.http.HttpTracing;
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 {
public BraveClientStartInterceptor(final HttpTracing brave) {
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 05a0111..016e108 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
@@ -18,10 +18,10 @@
*/
package org.apache.cxf.tracing.brave;
+import brave.http.HttpTracing;
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 {
public BraveClientStopInterceptor(final HttpTracing brave) {
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 fe54c11..07b8cd9 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
@@ -20,6 +20,8 @@ package org.apache.cxf.tracing.brave;
import java.util.UUID;
+import brave.Tracing;
+import brave.http.HttpTracing;
import org.apache.cxf.Bus;
import org.apache.cxf.annotations.Provider;
import org.apache.cxf.annotations.Provider.Scope;
@@ -27,8 +29,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;
@NoJSR250Annotations
@Provider(value = Type.Feature, scope = Scope.Server)
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 2790418..26973cb 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
@@ -18,11 +18,11 @@
*/
package org.apache.cxf.tracing.brave;
+import brave.http.HttpTracing;
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
public class BraveStartInterceptor extends AbstractBraveInterceptor {
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 eed79e6..44d072a 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
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import brave.http.HttpTracing;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.helpers.CastUtils;
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
public class BraveStopInterceptor extends AbstractBraveInterceptor {
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 9bb628c..2c6f07e 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
@@ -20,12 +20,12 @@ package org.apache.cxf.tracing.brave;
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;
import brave.http.HttpTracing;
+import org.apache.cxf.tracing.Traceable;
+import org.apache.cxf.tracing.TracerContext;
public class BraveTracerContext implements TracerContext {
private final HttpTracing brave;
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 b615c4f..7fc9597 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
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.tracing.brave;
-import org.apache.cxf.common.util.StringUtils;
import brave.http.HttpAdapter;
import brave.http.HttpClientParser;
+import org.apache.cxf.common.util.StringUtils;
public class HttpClientSpanParser extends HttpClientParser {
@Override
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 7200e61..fd60963 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
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.tracing.brave;
-import org.apache.cxf.common.util.StringUtils;
import brave.http.HttpAdapter;
import brave.http.HttpServerParser;
+import org.apache.cxf.common.util.StringUtils;
public class HttpServerSpanParser extends HttpServerParser {
@Override
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 b42c01e..3ce1cff 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
@@ -26,11 +26,11 @@ import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.ext.Provider;
+import brave.Tracing;
+import brave.http.HttpTracing;
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;
@Provider
public class BraveClientProvider extends AbstractBraveClientProvider
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 ff179ee..b4835c6 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
@@ -18,12 +18,12 @@
*/
package org.apache.cxf.tracing.brave.jaxrs;
+import brave.Span;
+import brave.http.HttpTracing;
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;
public class BraveContextProvider implements ContextProvider< TracerContext > {
private final HttpTracing brave;
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 c2cac38..2b4e9cf 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
@@ -24,9 +24,9 @@ import javax.ws.rs.core.Feature;
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;
+import org.apache.cxf.tracing.brave.HttpServerSpanParser;
@Provider
public class BraveFeature implements Feature {
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 ea5705c..6bee695 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
@@ -30,9 +30,9 @@ import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;
+import brave.http.HttpTracing;
import org.apache.cxf.tracing.brave.AbstractBraveProvider;
import org.apache.cxf.tracing.brave.TraceScope;
-import brave.http.HttpTracing;
@Provider
public class BraveProvider extends AbstractBraveProvider
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
index b36fc47..d575cda 100644
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
@@ -22,19 +22,19 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import brave.Tracing;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import zipkin.Span;
+import zipkin.reporter.Reporter;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import brave.Tracing;
-import zipkin.Span;
-import zipkin.reporter.Reporter;
public class BraveTraceTest {
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 c95d55f..ff44b8d 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
@@ -19,10 +19,10 @@
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;
+import org.apache.htrace.core.Span;
+import org.apache.htrace.core.Tracer;
/**
* Logback conversion rule implementation to enrich log records with tracing details like spanId and tracerId.
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 a9636ce..72a6a41 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
@@ -31,15 +31,15 @@ import java.util.concurrent.Executors;
import javax.inject.Inject;
import org.apache.karaf.features.FeaturesService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.util.tracker.ServiceTracker;
import org.junit.Assert;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.util.tracker.ServiceTracker;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
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 7b2df2c..05a1847 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.osgi.framework.Constants;
import org.junit.Assert;
import org.junit.Test;
@@ -38,9 +39,8 @@ 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;
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 68dc371..c2894d0 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
@@ -22,6 +22,7 @@ import java.io.InputStream;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
+import org.osgi.framework.Constants;
import org.junit.Assert;
import org.junit.Test;
@@ -33,7 +34,6 @@ 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;
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 e5f6b80..ee2594e 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.osgi.framework.Constants;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +38,6 @@ import org.ops4j.pax.exam.junit.PaxExam;
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;
diff --git a/parent/pom.xml b/parent/pom.xml
index b785ae7..1491c10 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -359,7 +359,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>7.8.2</version>
+ <version>8.7</version>
<exclusions>
<!-- MCHECKSTYLE-156 -->
<exclusion>
diff --git a/pom.xml b/pom.xml
index 291ba6f..03401de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
</issueManagement>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
- <cxf.build-utils.version>3.3.0</cxf.build-utils.version>
+ <cxf.build-utils.version>3.3.1-SNAPSHOT</cxf.build-utils.version>
<cxf.xjc-utils.version>3.2.1-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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 b07bc6d..48a865b 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,12 +25,12 @@ import java.util.List;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+import org.omg.CORBA.ORB;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
public class CorbaBindingTest extends Assert {
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 29bc6f7..5addab3 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,13 +46,6 @@ 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;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
import org.omg.CORBA.Context;
import org.omg.CORBA.ContextList;
import org.omg.CORBA.ExceptionList;
@@ -63,6 +56,13 @@ import org.omg.CORBA.Request;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
public class CorbaConduitTest extends Assert {
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 9374337..8e87b8f 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,17 +23,17 @@ 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.omg.CORBA.Any;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.Any;
-import org.omg.CORBA.NVList;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaMessageTest extends 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 687e05e..bca1ab3 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,12 @@ 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.omg.CORBA.Any;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -45,12 +51,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.Any;
-import org.omg.CORBA.NVList;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.ServerRequest;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaServerConduitTest extends Assert {
protected EndpointInfo endpointInfo;
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 50670cb..58c94f3 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
@@ -31,14 +31,14 @@ 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.omg.CORBA.Context;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.Context;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.ServerRequest;
public class CorbaDSIServantTest extends Assert {
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 2c204c8..821288d 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,11 +44,6 @@ 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;
-import org.junit.Test;
import org.omg.CORBA.ORB;
import org.omg.CORBA.StructMember;
import org.omg.CORBA.TCKind;
@@ -56,6 +51,11 @@ import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
public class CorbaObjectReaderTest extends Assert {
private static ORB orb;
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 d2f6542..6977c95 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,11 +37,6 @@ 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;
-import org.junit.Test;
import org.omg.CORBA.ORB;
import org.omg.CORBA.StructMember;
import org.omg.CORBA.TCKind;
@@ -49,6 +44,11 @@ import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
public class CorbaObjectWriterTest extends Assert {
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 151e92a..4d54538 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,17 +23,17 @@ 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;
-import org.junit.Test;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
public class CorbaStreamableTest extends Assert {
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 e503c3d..84055b5 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,15 +23,15 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaTypeMap;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaAnyHandlerTest extends Assert {
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 3c987ce..e929c10 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,14 +22,14 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.Array;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaArrayHandlerTest extends Assert {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index abd776e..23785ed 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -23,13 +23,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.Enum;
import org.apache.cxf.binding.corba.wsdl.Enumerator;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
public class CorbaEnumHandlerTest extends Assert {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index a74a80b..69f77b3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -23,13 +23,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.Fixed;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
public class CorbaFixedHandlerTest extends Assert {
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 2b84f44..8c4517a 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,13 +34,13 @@ 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.omg.CORBA.ORB;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-
public class CorbaHandlerUtilsTest extends Assert {
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 bf4d763..10f9753 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
@@ -22,14 +22,14 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaObjectHandlerTest extends Assert {
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 276c0f0..5f0991b 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
@@ -21,13 +21,13 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
public class CorbaPrimitiveHandlerTest extends Assert {
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 46c62b6..693f94d 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
@@ -22,14 +22,14 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaSequenceHandlerTest extends Assert {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index abaaa34..632b0a1 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -25,15 +25,15 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.MemberType;
import org.apache.cxf.binding.corba.wsdl.Struct;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.StructMember;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
// Since the exception handler is essentially the same as the struct handler (just included in case
// structs and exceptions diverge at a later date), this test should cover both.
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 66532ce..d4c29d5 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,14 +26,14 @@ 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.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
public class CorbaUtilsTest extends Assert {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
index c0d2ebe..c9e78b5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
@@ -31,12 +31,12 @@ import org.apache.cxf.jaxrs.resources.BookStore;
import org.apache.cxf.jaxrs.resources.BookStoreNoAnnotations;
import org.apache.cxf.jaxrs.resources.BookStoreSubresourcesOnly;
import org.apache.cxf.jaxrs.resources.SuperBook;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JAXRSServerFactoryBeanTest extends Assert {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
index 6163bb1..6912aa6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
@@ -27,13 +27,13 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.resources.BookStore;
import org.apache.cxf.jaxrs.resources.BookStoreConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringResourceFactoryTest extends Assert {
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 0a9bb9a..c6fdbdc 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,6 +47,11 @@ 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.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
+import org.springframework.web.servlet.view.BeanNameViewResolver;
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
@@ -55,11 +60,6 @@ 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;
-import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
-import org.springframework.web.servlet.view.BeanNameViewResolver;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java
index 8ca949a..37b2607 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstXmlConfigTest.java
@@ -23,10 +23,10 @@ import org.w3c.dom.Document;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SchemaFirstXmlConfigTest extends AbstractJaxWsTest {
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 9f57373..1f0d2c2 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
@@ -22,7 +22,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
-
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
@@ -54,14 +53,14 @@ 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.springframework.beans.factory.BeanCreationException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringBeansTest extends Assert {
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 a9997be..bef70cc 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
@@ -20,13 +20,13 @@
package org.apache.cxf.js.rhino;
+import org.mozilla.javascript.Scriptable;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mozilla.javascript.Scriptable;
public class AbstractDOMProviderTest extends Assert {
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 47973f6..fd539d4 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
@@ -23,14 +23,14 @@ import java.io.File;
import javax.xml.ws.Service;
+import org.mozilla.javascript.EvaluatorException;
+import org.mozilla.javascript.Scriptable;
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;
public class ProviderFactoryTest extends Assert {
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 93cffc5..b504843 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,11 +19,11 @@
package org.apache.cxf.frontend.spring;
import org.apache.cxf.BusFactory;
+import org.springframework.context.support.AbstractApplicationContext;
import org.junit.After;
import org.junit.Assert;
-import org.springframework.context.support.AbstractApplicationContext;
public class AbstractSimpleFrontendSpringTest extends Assert {
protected AbstractApplicationContext ctx;
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 fd97e66..87d6fc7 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,9 +28,9 @@ 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.springframework.context.support.ClassPathXmlApplicationContext;
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 dfdd1f0..adc8ff0 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,9 +39,9 @@ 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.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringBeansTest extends AbstractSimpleFrontendSpringTest {
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
index 1fc0227..3273e28 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
@@ -30,12 +30,12 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.AegisServiceImpl;
import org.apache.cxf.testutil.common.TestUtil;
+import org.mozilla.javascript.Context;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
-import org.mozilla.javascript.Context;
-import org.springframework.context.support.GenericApplicationContext;
/*
* We end up here with a part with isElement == true, a non-array element,
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
index 767cdd2..741fbf4 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
@@ -28,13 +28,13 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.AnyImpl;
import org.apache.cxf.testutil.common.TestUtil;
-
-import org.junit.Before;
-import org.junit.Test;
import org.mozilla.javascript.Context;
import org.springframework.context.support.GenericApplicationContext;
import uri.cxf_apache_org.jstest.types.any.alts.Alternative1;
+import org.junit.Before;
+import org.junit.Test;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
index 0c99c28..96e740f 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
@@ -29,13 +29,13 @@ import org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl;
import org.apache.cxf.javascript.fortest.TestBean1;
import org.apache.cxf.javascript.fortest.TestBean2;
import org.apache.cxf.testutil.common.TestUtil;
-
-import org.junit.Before;
-import org.junit.Test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import org.springframework.context.support.GenericApplicationContext;
+import org.junit.Before;
+import org.junit.Test;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
index 35d39bc..0e3e754 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
@@ -30,13 +30,13 @@ import org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl;
import org.apache.cxf.javascript.fortest.TestBean1;
import org.apache.cxf.javascript.fortest.TestBean2;
import org.apache.cxf.testutil.common.TestUtil;
-
-import org.junit.Before;
-import org.junit.Test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import org.springframework.context.support.GenericApplicationContext;
+import org.junit.Before;
+import org.junit.Test;
+
public class DocLitWrappedClientTest extends JavascriptRhinoTest {
private static final Logger LOG = LogUtils.getL7dLogger(DocLitWrappedClientTest.class);
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
index fb80ba6..0587496 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
@@ -27,11 +27,11 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.CountDownNotifier;
import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.testutil.common.TestUtil;
+import org.mozilla.javascript.Context;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
-import org.mozilla.javascript.Context;
-import org.springframework.context.support.GenericApplicationContext;
/**
* Test the same schema used in the samples.
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 8f4d49e..590b062 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,8 +36,6 @@ 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;
import org.mozilla.javascript.Function;
@@ -46,6 +44,8 @@ import org.mozilla.javascript.RhinoException;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
+import org.junit.Assert;
+
/**
* Test utilities class with some Javascript capability included.
*/
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
index 3247f1a..703764f 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
@@ -36,11 +36,11 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.test.AbstractCXFSpringTest;
import org.apache.cxf.test.XPathAssert;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.context.support.GenericApplicationContext;
/**
* This test is ignored by default as it is continually failing on Jenkins.
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
index cde728c..e7cc2a1 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
@@ -28,11 +28,11 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.MtoMImpl;
import org.apache.cxf.testutil.common.TestUtil;
+import org.mozilla.javascript.Context;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
-import org.mozilla.javascript.Context;
-import org.springframework.context.support.GenericApplicationContext;
/*
* We end up here with a part with isElement == true, a non-array element,
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
index 5cb10aa..874a4cb 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
@@ -33,10 +33,10 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.test.AbstractCXFSpringTest;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
/**
*
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
index afde94a..aa6a1d6 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
@@ -28,13 +28,13 @@ import org.apache.cxf.javascript.fortest.SimpleRPCImpl;
import org.apache.cxf.javascript.fortest.TestBean1;
import org.apache.cxf.javascript.fortest.TestBean2;
import org.apache.cxf.testutil.common.TestUtil;
-
-import org.junit.Before;
-import org.junit.Test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import org.springframework.context.support.GenericApplicationContext;
+import org.junit.Before;
+import org.junit.Test;
+
/*
* We end up here with a part with isElement == true, a non-array element,
* but a complex type for an array of the element.
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
index c15b2ee..a2ace7e 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/AttributeTest.java
@@ -42,9 +42,9 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.AbstractCXFSpringTest;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
public class AttributeTest extends AbstractCXFSpringTest {
private JavascriptTestUtilities testUtilities;
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
index dc51ac3..0ba8092 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/types/SerializationTest.java
@@ -49,9 +49,9 @@ import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.AbstractCXFSpringTest;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
public class SerializationTest extends AbstractCXFSpringTest {
private JavascriptTestUtilities testUtilities;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index e6c937e..f902bd9 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -29,13 +29,13 @@ import org.apache.cxf.bus.managers.WorkQueueManagerImpl;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.management.counters.CounterRepository;
import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class InstrumentationManagerTest extends Assert {
InstrumentationManager im;
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 0406f92..c32f135 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,12 +22,12 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
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/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
index 0619ffd..5ed1875 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
@@ -34,12 +34,12 @@ import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class AtomPojoProviderTest extends Assert {
diff --git a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
index 2908afe..8fd7b86 100644
--- a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
+++ b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
@@ -32,12 +32,12 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
import static org.apache.cxf.jaxrs.reactor.client.ReactorUtils.TRACE;
import static org.apache.cxf.jaxrs.reactor.client.ReactorUtils.toCompletableFuture;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
public class ReactorInvokerImpl implements ReactorInvoker {
private final WebClient webClient;
diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index beb8514..d791da2 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -193,5 +193,33 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>setup.eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>setup.eclipse.project.mp.client</id>
+ <phase>process-test-sources</phase>
+ <configuration>
+ <target>
+ <propertyfile file="${basedir}/.settings/org.eclipse.jdt.core.prefs">
+ <entry key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface" value="ignore" />
+ </propertyfile>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/ContractComparator.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/ContractComparator.java
index 02bab65..03596b6 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/ContractComparator.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/ContractComparator.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.cxf.jaxrs.model.ProviderInfo;
import org.apache.cxf.jaxrs.utils.AnnotationUtils;
+
import static org.apache.cxf.microprofile.client.MicroProfileClientConfigurableImpl.CONTRACTS;
class ContractComparator implements Comparator<ProviderInfo<?>> {
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java
index 2daf944..5f62a56 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java
@@ -21,8 +21,10 @@ package org.apache.cxf.microprofile.client;
import java.net.URL;
import java.util.Map;
import java.util.Objects;
+
import javax.ws.rs.core.Configurable;
import javax.ws.rs.core.Configuration;
+
import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/DefaultResponseExceptionMapper.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/DefaultResponseExceptionMapper.java
index 691de11..81d7713 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/DefaultResponseExceptionMapper.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/DefaultResponseExceptionMapper.java
@@ -22,6 +22,7 @@ import javax.annotation.Priority;
import javax.enterprise.inject.Vetoed;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+
import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
@Priority(Integer.MAX_VALUE)
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
index 05a0457..a60a208 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
@@ -23,7 +23,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+
import javax.ws.rs.core.Configuration;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.util.ClassHelper;
@@ -87,7 +89,6 @@ public final class MicroProfileClientProviderFactory extends ProviderFactory {
injectContextProxies(responseExceptionMappers);
}
- @SuppressWarnings("unchecked")
public List<ResponseExceptionMapper<?>> createResponseExceptionMapper(Message m, Class<?> paramType) {
List<ResponseExceptionMapper<?>> candidates = new LinkedList<>();
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
index 7524f0c..b828ddf 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
@@ -38,6 +38,7 @@ import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
import javax.enterprise.util.AnnotationLiteral;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.microprofile.client.CxfTypeSafeClientBuilder;
import org.apache.cxf.microprofile.client.config.ConfigFacade;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@@ -136,7 +137,7 @@ public class RestClientBean implements Bean<Object>, PassivationCapable {
String configuredScope = ConfigFacade.getOptionalValue(property, String.class).orElse(null);
if (configuredScope != null) {
try {
- return (Class<? extends Annotation>) Class.forName(configuredScope);
+ return ClassLoaderUtils.loadClass(configuredScope, getClass(), Annotation.class);
} catch (Exception e) {
throw new IllegalArgumentException("The scope " + configuredScope + " is invalid", e);
}
@@ -160,6 +161,7 @@ public class RestClientBean implements Bean<Object>, PassivationCapable {
}
private static final class DefaultLiteral extends AnnotationLiteral<Default> implements Default {
+ private static final long serialVersionUID = 1L;
}
}
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientExtension.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientExtension.java
index 1d8f677..6be123e 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientExtension.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientExtension.java
@@ -20,6 +20,7 @@ package org.apache.cxf.microprofile.client.cdi;
import java.util.LinkedHashSet;
import java.util.Set;
+
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
@@ -27,6 +28,7 @@ import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
import javax.enterprise.inject.spi.WithAnnotations;
+
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
public class RestClientExtension implements Extension {
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
index 17da4e1..617efec 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
@@ -21,7 +21,9 @@ package org.apache.cxf.microprofile.client.proxy;
import java.lang.reflect.Method;
import java.net.URI;
import java.util.List;
+
import javax.ws.rs.core.Response;
+
import org.apache.cxf.jaxrs.client.ClientProxyImpl;
import org.apache.cxf.jaxrs.client.ClientState;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
@@ -52,7 +54,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl {
throw t;
} else if (t != null && m.getExceptionTypes() != null) {
// its a checked exception, make sure its declared
- for (Class c : m.getExceptionTypes()) {
+ for (Class<?> c : m.getExceptionTypes()) {
if (t.getClass().isAssignableFrom(c)) {
throw t;
}
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/spi/CxfRestClientBuilderResolver.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/spi/CxfRestClientBuilderResolver.java
index cf7f612..0a0dbce 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/spi/CxfRestClientBuilderResolver.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/spi/CxfRestClientBuilderResolver.java
@@ -19,6 +19,7 @@
package org.apache.cxf.microprofile.client.spi;
import javax.enterprise.inject.Vetoed;
+
import org.apache.cxf.microprofile.client.CxfTypeSafeClientBuilder;
import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
index aafd1a2..a5431a5 100644
--- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
+++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.microprofile.client;
import java.net.URL;
+
import javax.ws.rs.core.Response;
import org.apache.cxf.microprofile.client.mock.EchoClientReqFilter;
@@ -35,6 +36,7 @@ import org.eclipse.microprofile.rest.client.tck.providers.TestMessageBodyWriter;
import org.eclipse.microprofile.rest.client.tck.providers.TestParamConverterProvider;
import org.eclipse.microprofile.rest.client.tck.providers.TestReaderInterceptor;
import org.eclipse.microprofile.rest.client.tck.providers.TestWriterInterceptor;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderOpenJPATest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderOpenJPATest.java
index d9d3d9b..4fa1acc 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderOpenJPATest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderOpenJPATest.java
@@ -18,12 +18,13 @@
*/
package org.apache.cxf.rs.security.oauth2.grants.code;
-import org.junit.runner.RunWith;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.runner.RunWith;
+
/**
* Runs the same tests as JPACodeDataProviderTest but within a Spring Managed Transaction.
*
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderTest.java
index 8894706..fa5f055 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProviderTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.cxf.rs.security.oauth2.grants.code;
-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;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
/**
* Runs the same tests as JPACodeDataProviderTest but within a Spring Managed Transaction.
*
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderOpenJPATest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderOpenJPATest.java
index 6e509b1..89c1250 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderOpenJPATest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderOpenJPATest.java
@@ -18,13 +18,14 @@
*/
package org.apache.cxf.rs.security.oauth2.grants.code;
-import org.junit.runner.RunWith;
-
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.runner.RunWith;
+
+
/**
* Runs the same tests as JPAOAuthDataProviderTest but within a Spring Managed Transaction.
*
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 1786aaf..c29d227 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,12 +28,6 @@ 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;
@@ -41,6 +35,12 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
/**
* Runs the same tests as JPAOAuthDataProviderTest but within a Spring Managed Transaction.
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 9aa68bc..acafef4 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,17 +19,16 @@
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;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("JPAOidcUserSubjectCMTTest.xml")
@DirtiesContext
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 fa210f4..dbc6278 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,16 +19,16 @@
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;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("JPAOidcUserSubjectCMTTest.xml")
@DirtiesContext
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 7ecb54b..0eac3ab 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,13 +70,11 @@ 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.easymock.EasyMock;
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 8a071e9..22f06cc 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,10 +43,6 @@ 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;
@@ -58,6 +54,8 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
index 1ab785a..6e809dc 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
@@ -37,12 +37,12 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
public class ApplicationContextTest extends Assert {
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
index d2a1100..c566f1a 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactoryTest.java
@@ -26,13 +26,14 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.http.HTTPConduitFactory;
+import io.netty.channel.EventLoopGroup;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import io.netty.channel.EventLoopGroup;
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 b70bd97..6d4a305 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
@@ -23,11 +23,11 @@ import java.net.URL;
import javax.xml.ws.Endpoint;
import org.apache.hello_world_soap_http.SOAPService;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* publish the service with SSL configuraiton with Spring
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
index fbe480d..703c130 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java
@@ -37,12 +37,12 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.netty.server.NettyHttpDestination;
import org.apache.cxf.transport.http.netty.server.NettyHttpServerEngine;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
public class ApplicationContextTest extends Assert {
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index a2a6b38..5139373 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -72,13 +72,14 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import io.undertow.util.HeaderMap;
+import io.undertow.util.HttpString;
+
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import io.undertow.util.HeaderMap;
-import io.undertow.util.HttpString;
public class UndertowHTTPDestinationTest extends Assert {
protected static final String AUTH_HEADER = "Authorization";
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
index 09ac240..538babb 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/ApplicationContextTest.java
@@ -37,12 +37,12 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http_undertow.UndertowHTTPDestination;
import org.apache.cxf.transport.http_undertow.UndertowHTTPServerEngine;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
public class ApplicationContextTest extends Assert {
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
index 3f53c12..f91455e 100755
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java
@@ -34,11 +34,11 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
*
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
index b63b970..110c459e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
@@ -23,14 +23,14 @@ import javax.annotation.Resource;
import org.apache.cxf.Bus;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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 4b32456..0a1b1e1 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,6 +40,8 @@ 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.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -47,8 +49,6 @@ 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/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 b789f4c..a21dcf4 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
@@ -19,8 +19,8 @@
package org.apache.cxf.sts.event;
-import org.apache.cxf.sts.event.map.MapEventLogger;
import ch.qos.logback.classic.PatternLayout;
+import org.apache.cxf.sts.event.map.MapEventLogger;
public class LoggerPatternLayoutLogback extends PatternLayout {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index 19c571b..2534489 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -54,9 +54,9 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.DOM2Writer;
+import org.opensaml.core.xml.XMLObject;
import org.junit.Assert;
-import org.opensaml.core.xml.XMLObject;
/**
* Some unit tests for creating SAML Tokens with an ActAs element.
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 7d6ef2b..f6d9852 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
@@ -35,11 +35,11 @@ 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.opensaml.saml.common.xml.SAMLConstants;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
-import org.opensaml.saml.common.xml.SAMLConstants;
/**
* In this test case, a CXF client requests a number of SAML Tokens from an STS using batch processing.
diff --git a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
index f828aa1..ff715c6 100644
--- a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
+++ b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
@@ -47,14 +47,14 @@ import org.apache.cxf.wsn.services.JaxwsCreatePullPoint;
import org.apache.cxf.wsn.services.JaxwsNotificationBroker;
import org.apache.cxf.wsn.types.CustomType;
import org.apache.cxf.wsn.util.WSNHelper;
+import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
+import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
-import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
public abstract class WsnBrokerTest extends Assert {
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index f5d0b0a..2f27d6d 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.xkms.model.extensions.ResultDetails;
import org.apache.cxf.xkms.model.xkms.LocateResultType;
import org.apache.cxf.xkms.model.xkms.MessageExtensionAbstractType;
import org.apache.cxf.xkms.model.xkms.ResultMajorEnum;
+import org.w3._2002._03.xkms_wsdl.XKMSPortType;
import org.junit.Assert;
import org.ops4j.pax.exam.Configuration;
@@ -36,8 +37,6 @@ import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.w3._2002._03.xkms_wsdl.XKMSPortType;
-
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
index 502eafc..3e181f9 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
@@ -37,6 +37,8 @@ import org.apache.cxf.xkms.model.xkms.StatusType;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
import org.apache.cxf.xkms.model.xmldsig.KeyInfoType;
import org.apache.cxf.xkms.model.xmldsig.X509DataType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Test;
@@ -45,8 +47,6 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
index 6c68088..d8bc37c 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
@@ -39,13 +39,13 @@ import org.apache.cxf.xkms.model.xkms.StatusType;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
import org.apache.cxf.xkms.model.xmldsig.KeyInfoType;
import org.apache.cxf.xkms.model.xmldsig.X509DataType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@RunWith(PaxExam.class)
public class ValidatorTest extends BasicIntegrationTest {
diff --git a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
index 5b10229..f50a7df 100644
--- a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
+++ b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
@@ -33,12 +33,12 @@ import javax.xml.ws.soap.MTOMFeature;
import javax.xml.ws.spi.http.HttpContext;
import org.apache.cxf.testutil.common.TestUtil;
+import org.jvnet.jax_ws_commons.transport.grizzly_httpspi.GrizzlyHttpContextFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.jvnet.jax_ws_commons.transport.grizzly_httpspi.GrizzlyHttpContextFactory;
public class EndpointAPITest extends Assert {
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
index 02fcc91..c89bcd0 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
@@ -32,12 +32,12 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.systest.aegis.bean.Item;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
*
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
index f34d6a0..ee19ce1 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
@@ -30,12 +30,12 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
*
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
index bcd1231..1c88f4c 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
@@ -31,12 +31,12 @@ import org.apache.cxf.aegis.type.basic.CharacterAsStringType;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
index 5d13af7..6b9eea2 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
@@ -44,12 +44,12 @@ import org.apache.cxf.systest.aegis.mtom.fortest.MtomTestService;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.ws.commons.schema.constants.Constants;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
*
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
index ff3c770..a78ca34 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
@@ -34,12 +34,12 @@ import org.apache.cxf.systest.jaxb.model.Widget;
import org.apache.cxf.systest.jaxb.service.TestService;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration(locations = { "classpath:extrajaxbclass.xml" })
public class TestServiceTest extends AbstractJUnit4SpringContextTests {
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
index efe8290..5f176a4 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
@@ -20,12 +20,12 @@
package org.apache.cxf.systest.jaxb.validators;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
*
*/
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
index d264792..dbee11a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
@@ -49,11 +49,11 @@ import org.apache.cxf.jaxrs.swagger.parse.SwaggerParseUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.hamcrest.CoreMatchers;
+import org.yaml.snakeyaml.Yaml;
import org.junit.Ignore;
import org.junit.Test;
-import org.yaml.snakeyaml.Yaml;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
index f522f7f..b60f243 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
@@ -45,15 +45,15 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.hamcrest.CoreMatchers;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.security.SecurityScheme.Type;
+
import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.security.SecurityScheme.Type;
-
public abstract class AbstractOpenApiServiceDescriptionTest extends AbstractBusClientServerTestBase {
static final String SECURITY_DEFINITION_NAME = "basicAuth";
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomPropertiesTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomPropertiesTest.java
index 98e9592..84f47eb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomPropertiesTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomPropertiesTest.java
@@ -22,11 +22,12 @@ import java.util.Collections;
import org.apache.cxf.jaxrs.openapi.OpenApiFeature;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.security.SecurityScheme.Type;
+
import org.junit.BeforeClass;
import org.junit.Test;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.security.SecurityScheme.Type;
public class OpenApiCustomPropertiesTest extends AbstractOpenApiServiceDescriptionTest {
private static final String PORT = allocatePort(OpenApiCustomPropertiesTest.class);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
index ddfa9f4..ce051b1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java
@@ -38,10 +38,11 @@ import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker;
import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import io.reactivex.Flowable;
+
import org.junit.BeforeClass;
import org.junit.Test;
-import io.reactivex.Flowable;
public class JAXRSRxJava2FlowableTest extends AbstractBusClientServerTestBase {
public static final String PORT = RxJava2FlowableServer.PORT;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java
index b9fa5ee..724a0ff 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java
@@ -32,10 +32,11 @@ import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvoker;
import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvokerProvider;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import io.reactivex.Observable;
+
import org.junit.BeforeClass;
import org.junit.Test;
-import io.reactivex.Observable;
public class JAXRSRxJava2ObservableTest extends AbstractBusClientServerTestBase {
public static final String PORT = RxJava2ObservableServer.PORT;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
index b992ba9..fdfb11e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
@@ -33,12 +33,12 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.systest.jaxrs.Book;
import org.apache.cxf.systest.jaxrs.BookStore;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JAXRSHttpsBookTest extends AbstractBusClientServerTestBase {
public static final String PORT = BookHttpsServer.PORT;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
index ebead5b..3d99b3a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
@@ -19,11 +19,12 @@
package org.apache.cxf.systest.jaxrs.websocket;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* JAXRSClientServerWebSocketSpringTest without atmosphere
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
index 0b37343..588dfd9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
@@ -19,11 +19,10 @@
package org.apache.cxf.systest.jaxrs.websocket;
-import org.junit.BeforeClass;
-
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.junit.BeforeClass;
/**
* JAXRSClientServerWebSocket test with jaxrs:server using the embedded jetty server.
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index 3018cff..60985f7 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -32,13 +32,13 @@ import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.transports.http.configuration.ProxyServerType;
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.littleshoot.proxy.HttpProxyServer;
-import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
public class CXF6655Test extends AbstractClientServerTestBase {
static final String PORT = allocatePort(Server.class);
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 0c0a37e..dd18c25f 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -55,12 +55,12 @@ import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
@RunWith(FrameworkRunner.class)
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
index 90cdbe1..5bdf9bb 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
@@ -35,6 +35,10 @@ import javax.ws.rs.core.Response.Status;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import brave.Span;
+import brave.Tracer.SpanInScope;
+import brave.Tracing;
+import brave.sampler.Sampler;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -64,10 +68,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
-import brave.Span;
-import brave.Tracer.SpanInScope;
-import brave.Tracing;
-import brave.sampler.Sampler;
public class BraveTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(BraveTracingTest.class);
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
index a798a1d..d2cab4b 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
@@ -52,6 +52,11 @@ import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingClientProvider;
import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingFeature;
import org.awaitility.Duration;
+import io.opentracing.ActiveSpan;
+import io.opentracing.Tracer;
+import io.opentracing.propagation.Format.Builtin;
+import io.opentracing.propagation.TextMap;
+
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -65,11 +70,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.empty;
-import io.opentracing.ActiveSpan;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format.Builtin;
-import io.opentracing.propagation.TextMap;
-
public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(OpenTracingTracingTest.class);
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
index 6aa4f5c..46624c5 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
@@ -25,12 +25,12 @@ import java.util.UUID;
import javax.jws.WebMethod;
import javax.jws.WebService;
-import org.apache.cxf.systest.Book;
-import org.apache.cxf.systest.brave.TestSpanReporter;
-import org.apache.cxf.systest.jaxws.tracing.BookStoreService;
import brave.Span;
import brave.Tracer.SpanInScope;
import brave.Tracing;
+import org.apache.cxf.systest.Book;
+import org.apache.cxf.systest.brave.TestSpanReporter;
+import org.apache.cxf.systest.jaxws.tracing.BookStoreService;
@WebService(endpointInterface = "org.apache.cxf.systest.jaxws.tracing.BookStoreService", serviceName = "BookStore")
public class BookStore implements BookStoreService {
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
index 6118402..6f000c7 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
@@ -27,6 +27,9 @@ import java.util.Random;
import javax.xml.ws.soap.SOAPFaultException;
+import brave.Span;
+import brave.Tracer.SpanInScope;
+import brave.Tracing;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
@@ -57,9 +60,6 @@ import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
-import brave.Span;
-import brave.Tracer.SpanInScope;
-import brave.Tracing;
public class BraveTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(BraveTracingTest.class);
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
index 0722e84..1c6f20a 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
@@ -46,6 +46,11 @@ import org.apache.cxf.tracing.opentracing.OpenTracingFeature;
import org.apache.cxf.tracing.opentracing.internal.TextMapInjectAdapter;
import org.awaitility.Duration;
+import io.opentracing.ActiveSpan;
+import io.opentracing.Tracer;
+import io.opentracing.propagation.Format.Builtin;
+import io.opentracing.util.GlobalTracer;
+
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -57,11 +62,6 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.empty;
-import io.opentracing.ActiveSpan;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format.Builtin;
-import io.opentracing.util.GlobalTracer;
-
public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(OpenTracingTracingTest.class);
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index 2b1d3aa..d63f7c3 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -66,6 +66,7 @@ import org.apache.hello_world_doc_lit.Greeter;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.SOAPService2;
import org.apache.hello_world_doc_lit.SOAPService7;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
import org.junit.Assert;
@@ -74,7 +75,6 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JMSClientServerTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(JMSClientServerTest.class);
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
index 4f64875..cb85671 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringNoAtmosphereTest.java
@@ -19,11 +19,12 @@
package org.apache.cxf.systest.http_undertow.websocket;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* JAXRSClientServerWebSocketSpringTest without atmosphere
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringTest.java
index 6689060..0eadefa 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketSpringTest.java
@@ -19,11 +19,12 @@
package org.apache.cxf.systest.http_undertow.websocket;
-import org.junit.BeforeClass;
-
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.junit.BeforeClass;
+
+
/**
* JAXRSClientServerWebSocket test with jaxrs:server using the embedded undertow server.
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
index f9e2fd7..197639c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
@@ -25,12 +25,6 @@ import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-
import org.littleshoot.proxy.ActivityTrackerAdapter;
import org.littleshoot.proxy.FlowContext;
import org.littleshoot.proxy.HttpProxyServer;
@@ -39,6 +33,12 @@ import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import io.netty.handler.codec.http.HttpRequest;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+
+
/**
*
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
index 6de8b43..0ee7375 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
@@ -24,13 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-
import org.littleshoot.proxy.ActivityTrackerAdapter;
import org.littleshoot.proxy.FlowContext;
import org.littleshoot.proxy.HttpProxyServer;
@@ -38,6 +31,10 @@ import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import io.netty.handler.codec.http.HttpRequest;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
/**
*
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index d5ff217..576fd94 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -40,16 +40,16 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.webapp.WebAppContext;
-
-import org.junit.Assert;
-import org.junit.Test;
-
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
+import org.junit.Assert;
+import org.junit.Test;
+
+
/**
* This class tests starting up and shutting down the embedded server when there
* is extra jetty configuration.
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 47c52a7..68dd8e6 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -60,11 +60,11 @@ import org.apache.cxf.transport.https.HttpsURLConnectionInfo;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.hello_world.Greeter;
import org.apache.hello_world.services.SOAPService;
+import org.springframework.context.ApplicationContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
/**
* This class tests several issues and Conduit policies based
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
index e837dbc..fefadee 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
@@ -25,12 +25,6 @@ import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-
import org.littleshoot.proxy.ActivityTrackerAdapter;
import org.littleshoot.proxy.FlowContext;
import org.littleshoot.proxy.HttpProxyServer;
@@ -40,6 +34,12 @@ import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpRequest;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+
+
/**
*
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
index 42cd8ec..fbcf2fa 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
@@ -24,12 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-
import org.littleshoot.proxy.ActivityTrackerAdapter;
import org.littleshoot.proxy.FlowContext;
import org.littleshoot.proxy.HttpProxyServer;
@@ -38,6 +32,12 @@ import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpRequest;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+
+
/**
*
*/
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
index c6e879c..dc08734 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/MissingQualification1226Test.java
@@ -25,9 +25,9 @@ import org.w3c.dom.NodeList;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.test.AbstractCXFSpringTest;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
/**
*
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
index 0ef36fa..60f6ec6 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
@@ -32,11 +32,11 @@ import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.cxf.wsdl.WSDLManager;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringBusFactoryTest extends Assert {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index 448290c..afad03f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -31,11 +31,11 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.GreeterCORBAService;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.omg.CORBA.TIMEOUT;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.omg.CORBA.TIMEOUT;
/**
* This test uses Jacorb implementation, but cleans after itself.
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
index 772460d..8891b28 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
@@ -25,13 +25,13 @@ import java.net.URL;
import javax.xml.namespace.QName;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
import testnotification.NotificationService;
import testnotification.NotificationServicePort;
import testnotification.SendNotification;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
public class Cxf993Test extends AbstractBusClientServerTestBase {
public static final String PORT = Server.PORT;
private final QName serviceName = new QName("urn://testnotification", "NotificationService");
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
index bd5703b..84c2a69 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
@@ -23,11 +23,11 @@ import javax.xml.namespace.QName;
import org.apache.cxf.soapfault.SoapFaultPortType;
import org.apache.cxf.soapfault.SoapFaultService;
import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.xmlsoap.schemas.soap.envelope.Fault;
public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase {
private static final String PORT = Server.PORT;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
index 9f5819a..337d1a5 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.test.TestUtilities;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration(locations = { "classpath:crossSchemaBeans.xml" })
public class CrossSchemaImportsTests extends AbstractJUnit4SpringContextTests {
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java
index 6907c67..b10b53b 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRMPolicyResolveTest.java
@@ -21,10 +21,10 @@ package org.apache.cxf.systest.ws.rm;
import org.apache.cxf.test.AbstractCXFSpringTest;
import org.apache.cxf.testutil.common.TestUtil;
+import org.springframework.context.support.GenericApplicationContext;
import org.junit.Test;
-import org.springframework.context.support.GenericApplicationContext;
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
index dfd48f7..059032a 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
@@ -38,12 +38,12 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.rm.RMManager;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* Tests the correct interaction of ws-rm calls with security.when policy validator verifies the calls.
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
index 2756b71..ca8145a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
@@ -48,11 +48,11 @@ import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.neethi.Constants;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.WSS4JConstants;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase {
static final String PORT = JavaFirstPolicyServer.PORT;
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
index d65385a..276f8b6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
@@ -38,14 +38,14 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.ws.security.SecurityConstants;
+import wssec.wssec10.IPingService;
+import wssec.wssec10.PingService;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
-import wssec.wssec10.IPingService;
-import wssec.wssec10.PingService;
/**
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
index d0df548..112912a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
@@ -31,12 +31,12 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.wssec10.server.AuthorizedServer2;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import wssec.wssec10.IPingService;
+import wssec.wssec10.PingService;
import org.junit.BeforeClass;
import org.junit.Test;
-import wssec.wssec10.IPingService;
-import wssec.wssec10.PingService;
/**
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
index e8e5767..26a6662 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
@@ -32,12 +32,12 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.wssec10.server.AuthorizedServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import wssec.wssec10.IPingService;
+import wssec.wssec10.PingService;
import org.junit.BeforeClass;
import org.junit.Test;
-import wssec.wssec10.IPingService;
-import wssec.wssec10.PingService;
/**
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java
index 689a03a..622c53d 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java
@@ -25,6 +25,8 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import messaging.AsyncMessaging;
+import messaging.AsyncMessagingService;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -42,8 +44,6 @@ import org.apache.cxf.ws.policy.PolicyOutInterceptor;
import org.junit.BeforeClass;
import org.junit.Test;
-import messaging.AsyncMessaging;
-import messaging.AsyncMessagingService;
public class WSDLAddrPolicyAttachmentJaxwsMMProviderTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(Server.class);
diff --git a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
index 15eecd8..b5641b3 100644
--- a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
+++ b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
@@ -21,16 +21,16 @@ package org.apache.cxf.test;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-
-import org.junit.After;
-import org.junit.Before;
-
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
+import org.junit.After;
+import org.junit.Before;
+
+
/**
* Base class for tests that use a Spring bean specification to load up components for testing.
* Unlike the classes that come with Spring, it doesn't drag in the JUnit 3 hierarchy, and it
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.