cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1221902 [1/3] - in /cxf/branches/2.4.x-fixes: ./ api/ api/src/test/java/org/apache/cxf/phase/ api/src/test/java/org/apache/cxf/ws/policy/ api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/ common/common/ common/common/src/test/java/o...
Date Wed, 21 Dec 2011 22:08:32 GMT
Author: dkulp
Date: Wed Dec 21 22:08:27 2011
New Revision: 1221902

URL: http://svn.apache.org/viewvc?rev=1221902&view=rev
Log:
Merged revisions 1214496 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1214496 | dkulp | 2011-12-14 16:56:16 -0500 (Wed, 14 Dec 2011) | 3 lines
  
  Update to latest easymock to simplify things a bit and to move us
  forward with it.
  Remove easymock deps from poms that don't need it.
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/api/pom.xml
    cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
    cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
    cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
    cxf/branches/2.4.x-fixes/common/common/pom.xml
    cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java
    cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
    cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
    cxf/branches/2.4.x-fixes/integration/jbi/pom.xml
    cxf/branches/2.4.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
    cxf/branches/2.4.x-fixes/integration/jca/pom.xml
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
    cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
    cxf/branches/2.4.x-fixes/parent/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/coloc/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/jbi/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/object/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/xml/pom.xml
    cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
    cxf/branches/2.4.x-fixes/rt/core/pom.xml
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
    cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/pom.xml
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
    cxf/branches/2.4.x-fixes/rt/databinding/jibx/pom.xml
    cxf/branches/2.4.x-fixes/rt/databinding/sdo/pom.xml
    cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/js/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/simple/pom.xml
    cxf/branches/2.4.x-fixes/rt/management-web/pom.xml
    cxf/branches/2.4.x-fixes/rt/management/pom.xml
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor2Test.java
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/transports/common/pom.xml
    cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml
    cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/servicelist/BaseUrlHelperTest.java
    cxf/branches/2.4.x-fixes/rt/transports/jbi/pom.xml
    cxf/branches/2.4.x-fixes/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/AbstractJBITest.java
    cxf/branches/2.4.x-fixes/rt/transports/jbi/src/test/java/org/apache/cxf/transport/jbi/JBIConduitTest.java
    cxf/branches/2.4.x-fixes/rt/transports/jms/pom.xml
    cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
    cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
    cxf/branches/2.4.x-fixes/rt/transports/local/pom.xml
    cxf/branches/2.4.x-fixes/rt/ws/addr/pom.xml
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/pom.xml
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/pom.xml
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
    cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
    cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml
    cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
    cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
    cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
    cxf/branches/2.4.x-fixes/systests/transports/pom.xml
    cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.4.x-fixes/tools/common/pom.xml
    cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml
    cxf/branches/2.4.x-fixes/tools/validator/pom.xml
    cxf/branches/2.4.x-fixes/tools/wsdlto/core/pom.xml
    cxf/branches/2.4.x-fixes/tools/wsdlto/misc/pom.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/api/pom.xml Wed Dec 21 22:08:27 2011
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java (original)
+++ cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java Wed Dec 21 22:08:27 2011
@@ -33,8 +33,8 @@ import org.apache.cxf.interceptor.Interc
 import org.apache.cxf.logging.FaultListener;
 import org.apache.cxf.message.FaultMode;
 import org.apache.cxf.message.Message;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java (original)
+++ cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java Wed Dec 21 22:08:27 2011
@@ -33,8 +33,8 @@ import org.apache.neethi.Assertion;
 import org.apache.neethi.ExactlyOne;
 import org.apache.neethi.Policy;
 import org.apache.neethi.builders.PolicyContainingPrimitiveAssertion;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java (original)
+++ cxf/branches/2.4.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java Wed Dec 21 22:08:27 2011
@@ -32,8 +32,8 @@ import org.apache.neethi.Constants;
 import org.apache.neethi.ExactlyOne;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/common/common/pom.xml Wed Dec 21 22:08:27 2011
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -51,11 +51,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <optional>true</optional>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java Wed Dec 21 22:08:27 2011
@@ -62,7 +62,7 @@ public class ForkedCommandTest extends A
         assertEquals(cmdline1, cmdline2);
         
         new ForkedCommandException(new NullPointerException());
-        Message msg = org.easymock.classextension.EasyMock.createMock(Message.class);
+        Message msg = org.easymock.EasyMock.createMock(Message.class);
         new ForkedCommandException(msg, new NullPointerException());
     }
 

Modified: cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java Wed Dec 21 22:08:27 2011
@@ -40,7 +40,7 @@ import net.sf.cglib.proxy.MethodProxy;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.resource.ResourceResolver;
 
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java Wed Dec 21 22:08:27 2011
@@ -26,8 +26,8 @@ import java.util.logging.Logger;
 
 import org.apache.cxf.common.i18n.BundleUtils;
 
+import org.easymock.EasyMock;
 import org.easymock.IArgumentMatcher;
-import org.easymock.classextension.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jbi/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jbi/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/integration/jbi/pom.xml Wed Dec 21 22:08:27 2011
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java Wed Dec 21 22:08:27 2011
@@ -33,7 +33,7 @@ import org.apache.cxf.common.i18n.Messag
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.jbi.JBITransportFactory;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/pom.xml Wed Dec 21 22:08:27 2011
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java Wed Dec 21 22:08:27 2011
@@ -32,7 +32,7 @@ import javax.resource.spi.ResourceAdapte
 import javax.security.auth.Subject;
 
 
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java Wed Dec 21 22:08:27 2011
@@ -27,7 +27,7 @@ import javax.resource.spi.ConnectionRequ
 import javax.security.auth.Subject;
 
 
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java Wed Dec 21 22:08:27 2011
@@ -29,7 +29,7 @@ import javax.resource.spi.ResourceAdapte
 
 import org.apache.cxf.Bus;
 //import org.apache.cxf.jca.cxf.test.DummyBus;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Test;
 
 public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectionFactoryImplTest {

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java Wed Dec 21 22:08:27 2011
@@ -30,7 +30,7 @@ import javax.resource.spi.ConnectionMana
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.xml.namespace.QName;
 
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java Wed Dec 21 22:08:27 2011
@@ -28,7 +28,7 @@ import javax.resource.ResourceException;
 import org.apache.cxf.Bus;
 import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
 import org.apache.cxf.test.AbstractCXFTest;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Ignore;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java Wed Dec 21 22:08:27 2011
@@ -36,7 +36,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.connector.CXFConnectionFactory;
 import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java Wed Dec 21 22:08:27 2011
@@ -34,7 +34,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.connector.Connection;
 import org.apache.cxf.jca.cxf.handlers.ProxyInvocationHandler;
 import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Ignore;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java Wed Dec 21 22:08:27 2011
@@ -32,7 +32,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.BusFactory;
 import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java Wed Dec 21 22:08:27 2011
@@ -33,7 +33,7 @@ import javax.resource.spi.ResourceAdapte
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java Wed Dec 21 22:08:27 2011
@@ -25,7 +25,7 @@ import org.apache.cxf.jca.cxf.CXFInvocat
 import org.apache.cxf.jca.cxf.CXFManagedConnection;
 import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
 import org.apache.cxf.jca.cxf.ManagedConnectionImpl;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java Wed Dec 21 22:08:27 2011
@@ -23,8 +23,8 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.BusFactory;
 import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Wed Dec 21 22:08:27 2011
@@ -1029,8 +1029,9 @@
             </dependency>
             <dependency>
                 <groupId>org.easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>2.4</version>
+                <artifactId>easymock</artifactId>
+                <version>3.1</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>asm</groupId>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/coloc/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/coloc/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/coloc/pom.xml Wed Dec 21 22:08:27 2011
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java Wed Dec 21 22:08:27 2011
@@ -40,8 +40,8 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.OperationInfo;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -50,8 +50,8 @@ import org.apache.cxf.service.model.Mess
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java Wed Dec 21 22:08:27 2011
@@ -45,8 +45,8 @@ import org.apache.headers.coloc.types.Fa
 import org.apache.headers.coloc.types.InHeaderT;
 import org.apache.headers.coloc.types.OutHeaderT;
 import org.apache.headers.rpc_lit.PingMeFault;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/pom.xml Wed Dec 21 22:08:27 2011
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java Wed Dec 21 22:08:27 2011
@@ -41,8 +41,8 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java Wed Dec 21 22:08:27 2011
@@ -46,8 +46,8 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -168,7 +168,8 @@ public class CorbaConduitTest extends As
     public void testClose() throws Exception {       
         Method m = CorbaConduit.class.getDeclaredMethod("buildRequest", 
             new Class[] {CorbaMessage.class, OperationType.class});
-        CorbaConduit conduit = EasyMock.createMock(CorbaConduit.class, new Method[] {m});       
+        CorbaConduit conduit = EasyMock.createMockBuilder(CorbaConduit.class)
+            .addMockedMethod(m).createMock();       
         
         org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
         CorbaMessage msg = control.createMock(CorbaMessage.class);

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java Wed Dec 21 22:08:27 2011
@@ -23,8 +23,8 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
 import org.apache.cxf.message.Message;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java Wed Dec 21 22:08:27 2011
@@ -38,8 +38,8 @@ import org.apache.cxf.service.model.Endp
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -176,7 +176,9 @@ public class CorbaServerConduitTest exte
         
         Method m = CorbaServerConduit.class.getDeclaredMethod("buildRequestResult", 
             new Class[] {CorbaMessage.class});
-        CorbaServerConduit conduit = EasyMock.createMock(CorbaServerConduit.class, new Method[] {m});       
+        CorbaServerConduit conduit = EasyMock.createMockBuilder(CorbaServerConduit.class)
+            .addMockedMethod(m)
+            .createMock();
         
         CorbaMessage msg = control.createMock(CorbaMessage.class);        
         conduit.buildRequestResult(msg);

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java Wed Dec 21 22:08:27 2011
@@ -21,7 +21,7 @@ package org.apache.cxf.binding.corba.run
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/http/pom.xml Wed Dec 21 22:08:27 2011
@@ -87,11 +87,6 @@
             <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/jbi/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/jbi/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/jbi/pom.xml Wed Dec 21 22:08:27 2011
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -40,7 +40,7 @@ import org.apache.cxf.message.MessageImp
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptor;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/rt/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/object/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/object/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/object/pom.xml Wed Dec 21 22:08:27 2011
@@ -91,12 +91,5 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
-
 </project>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/pom.xml Wed Dec 21 22:08:27 2011
@@ -103,7 +103,7 @@
 
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -34,8 +34,8 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.hello_world_rpclit.types.MyComplexStruct;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -40,8 +40,8 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.staxutils.DepthXMLStreamReader;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.hello_world_rpclit.types.MyComplexStruct;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java Wed Dec 21 22:08:27 2011
@@ -39,8 +39,8 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.service.model.ServiceModelUtil;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java Wed Dec 21 22:08:27 2011
@@ -50,9 +50,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.classextension.EasyMock.createNiceControl;
 
 public class SoapBindingFactoryTest extends Assert {
     IMocksControl control;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java Wed Dec 21 22:08:27 2011
@@ -27,8 +27,8 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java Wed Dec 21 22:08:27 2011
@@ -44,8 +44,8 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -39,8 +39,8 @@ import org.apache.cxf.service.model.Inte
 import org.apache.cxf.service.model.MessageInfo.Type;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java Wed Dec 21 22:08:27 2011
@@ -25,8 +25,8 @@ import org.apache.cxf.binding.soap.Soap1
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBinding;
 import org.apache.cxf.binding.soap.SoapFault;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/xml/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/xml/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/xml/pom.xml Wed Dec 21 22:08:27 2011
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java Wed Dec 21 22:08:27 2011
@@ -51,8 +51,8 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.WSDLManagerImpl;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/core/pom.xml Wed Dec 21 22:08:27 2011
@@ -87,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Wed Dec 21 22:08:27 2011
@@ -33,8 +33,8 @@ import org.apache.cxf.phase.PhaseManager
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.wsdl.WSDLManager;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java Wed Dec 21 22:08:27 2011
@@ -21,7 +21,7 @@ package org.apache.cxf.bus.spring;
 import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.CXFBusLifeCycleManager;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.support.AbstractRefreshableApplicationContext;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java Wed Dec 21 22:08:27 2011
@@ -22,8 +22,8 @@ package org.apache.cxf.endpoint;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java Wed Dec 21 22:08:27 2011
@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
 
 import javax.xml.namespace.QName;
 
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -50,8 +50,8 @@ import org.apache.cxf.service.model.Oper
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.staxutils.PartialXMLStreamReader;
 import org.apache.cxf.staxutils.StaxUtils;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -37,8 +37,8 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.OperationInfo;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
-import org.easymock.classextension.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -34,7 +34,7 @@ import org.apache.cxf.message.MessageImp
 import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -31,7 +31,7 @@ import org.apache.cxf.message.MessageImp
 import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java Wed Dec 21 22:08:27 2011
@@ -26,8 +26,8 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java Wed Dec 21 22:08:27 2011
@@ -51,8 +51,8 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Wed Dec 21 22:08:27 2011
@@ -67,8 +67,8 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/pom.xml Wed Dec 21 22:08:27 2011
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -55,14 +55,14 @@ import org.apache.cxf.wsdl11.WSDLService
 import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
 import org.apache.hello_world_soap_http.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 
+import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createNiceControl;
 
 public class BareInInterceptorTest extends Assert {
     

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -36,8 +36,8 @@ import org.apache.cxf.staxutils.DepthXML
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.hello_world_soap_http.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
-import org.easymock.classextension.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java Wed Dec 21 22:08:27 2011
@@ -54,13 +54,13 @@ import org.apache.cxf.wsdl11.WSDLService
 import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
 import org.apache.hello_world_soap_http.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createNiceControl;
 
 public class DocLiteralInInterceptorTest extends Assert {
     PhaseInterceptorChain chain;

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Wed Dec 21 22:08:27 2011
@@ -60,8 +60,8 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.apache.hello_world.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeOneWay;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java Wed Dec 21 22:08:27 2011
@@ -52,13 +52,13 @@ import org.apache.cxf.staxutils.StaxUtil
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.hello_world_soap_http.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 
+import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createNiceControl;
 
 public class TestBase extends Assert {
 

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jibx/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jibx/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jibx/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jibx/pom.xml Wed Dec 21 22:08:27 2011
@@ -39,12 +39,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.4.x-fixes/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/sdo/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/sdo/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/sdo/pom.xml Wed Dec 21 22:08:27 2011
@@ -87,11 +87,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/xmlbeans/pom.xml Wed Dec 21 22:08:27 2011
@@ -40,12 +40,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml Wed Dec 21 22:08:27 2011
@@ -185,7 +185,7 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
+            <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java Wed Dec 21 22:08:27 2011
@@ -44,7 +44,7 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java Wed Dec 21 22:08:27 2011
@@ -44,7 +44,7 @@ import org.apache.cxf.message.ExchangeIm
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 import org.junit.Assert;
 import org.junit.Test;



Mime
View raw message