Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B84297E9 for ; Thu, 3 Jan 2013 18:53:53 +0000 (UTC) Received: (qmail 4757 invoked by uid 500); 3 Jan 2013 18:53:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 4663 invoked by uid 500); 3 Jan 2013 18:53:53 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 4656 invoked by uid 99); 3 Jan 2013 18:53:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 18:53:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 18:53:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 531FA2388A36; Thu, 3 Jan 2013 18:53:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428547 - in /cxf/branches/2.6.x-fixes: integration/jca/src/test/java/org/apache/cxf/jca/servant/ rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ rt/core/src/main/java/org/apache/cxf/test/ rt/core/src/test/java/org/... Date: Thu, 03 Jan 2013 18:53:29 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130103185331.531FA2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jan 3 18:53:29 2013 New Revision: 1428547 URL: http://svn.apache.org/viewvc?rev=1428547&view=rev Log: Merged revisions 1428543 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1428543 | dkulp | 2013-01-03 13:46:04 -0500 (Thu, 03 Jan 2013) | 2 lines Fix deprecation warnings ........ Modified: cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java cxf/branches/2.6.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/TestService.java cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java cxf/branches/2.6.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java cxf/branches/2.6.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterRpcLitImpl.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java cxf/branches/2.6.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java Modified: cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java (original) +++ cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java Thu Jan 3 18:53:29 2013 @@ -19,14 +19,14 @@ package org.apache.cxf.jca.servant; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; + /** * */ Modified: cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java (original) +++ cxf/branches/2.6.x-fixes/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java Thu Jan 3 18:53:29 2013 @@ -20,8 +20,8 @@ package org.apache.cxf.jca.servant; import javax.xml.namespace.QName; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; Modified: cxf/branches/2.6.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.6.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java Thu Jan 3 18:53:29 2013 @@ -25,8 +25,6 @@ import java.util.Map; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.model.SoapOperationInfo; import org.apache.cxf.helpers.CastUtils; @@ -42,6 +40,7 @@ import org.apache.cxf.service.model.Serv import org.easymock.EasyMock; import org.easymock.IMocksControl; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java Thu Jan 3 18:53:29 2013 @@ -33,11 +33,12 @@ import javax.xml.xpath.XPathFactory; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import junit.framework.Assert; import junit.framework.AssertionFailedError; import org.apache.cxf.helpers.DOMUtils; +import org.junit.Assert; + /** * XPath test assertions. * Modified: cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java Thu Jan 3 18:53:29 2013 @@ -22,11 +22,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import junit.framework.Assert; - import org.apache.cxf.bus.managers.WorkQueueManagerImpl; import org.apache.cxf.workqueue.AutomaticWorkQueueImpl; import org.apache.cxf.workqueue.WorkQueueManager; +import org.junit.Assert; import org.junit.Test; import org.osgi.service.cm.ConfigurationException; Modified: cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java Thu Jan 3 18:53:29 2013 @@ -23,8 +23,7 @@ import javax.security.auth.callback.Call import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java Thu Jan 3 18:53:29 2013 @@ -25,8 +25,6 @@ import java.util.Collection; import org.w3c.dom.Document; import org.w3c.dom.Node; -import junit.framework.AssertionFailedError; - import org.junit.Test; @@ -64,7 +62,7 @@ public abstract class AbstractHelloWorld + "/databinding/sdo/hello_world_soap_http/types']", doc); return; - } catch (AssertionFailedError ex) { + } catch (AssertionError ex) { //ignore } } Modified: cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/TestService.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/TestService.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/TestService.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/TestService.java Thu Jan 3 18:53:29 2013 @@ -23,9 +23,8 @@ import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; -import junit.framework.Assert; - import com.sample.procure.PurchaseOrderDocument; +import org.junit.Assert; @WebService(targetNamespace = "urn:TestService", Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java Thu Jan 3 18:53:29 2013 @@ -20,10 +20,10 @@ package org.apache.cxf.jaxrs.spring; import javax.xml.namespace.QName; -import junit.framework.Assert; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; import org.junit.After; +import org.junit.Assert; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java Thu Jan 3 18:53:29 2013 @@ -22,11 +22,11 @@ package org.apache.cxf.jaxws; import java.io.InputStream; import java.io.OutputStream; -import junit.framework.Assert; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.message.Message; import org.apache.cxf.transport.Conduit; import org.apache.cxf.transport.MessageObserver; +import org.junit.Assert; public class MessageReplayObserver implements MessageObserver { String responseMessage; Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java Thu Jan 3 18:53:29 2013 @@ -25,8 +25,6 @@ import java.util.List; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.anonymous_complex_type.AnonymousComplexType; @@ -57,6 +55,7 @@ import org.apache.cxf.jaxws.spring.Names import org.apache.cxf.message.Message; import org.apache.hello_world_soap_http.Greeter; import org.junit.After; +import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java Thu Jan 3 18:53:29 2013 @@ -20,8 +20,6 @@ package org.apache.cxf.jaxws.ws; import java.util.List; -import junit.framework.Assert; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.CXFBusFactory; @@ -37,6 +35,7 @@ import org.apache.cxf.ws.policy.WSPolicy import org.apache.hello_world_soap_http.GreeterImpl; import org.apache.neethi.Policy; import org.junit.After; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java Thu Jan 3 18:53:29 2013 @@ -20,7 +20,6 @@ package org.apache.cxf.transport.http_je import java.net.URL; -import junit.framework.Assert; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; @@ -31,6 +30,7 @@ import org.apache.cxf.transport.http.HTT import org.junit.After; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java Thu Jan 3 18:53:29 2013 @@ -19,8 +19,8 @@ package org.apache.cxf.transport.jms; -import junit.framework.Assert; import org.apache.cxf.transport.jms.uri.JMSEndpoint; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java Thu Jan 3 18:53:29 2013 @@ -24,8 +24,6 @@ import java.util.Map; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.cxf.binding.soap.SoapBindingConstants; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.message.Exchange; @@ -44,6 +42,7 @@ import org.apache.cxf.ws.addressing.Name import org.easymock.EasyMock; import org.easymock.IMocksControl; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/IgnorablePolicyInterceptorProviderTest.java Thu Jan 3 18:53:29 2013 @@ -25,8 +25,6 @@ import java.util.Set; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; @@ -37,6 +35,7 @@ import org.apache.cxf.message.MessageImp import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion; import org.apache.neethi.Assertion; +import org.junit.Assert; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java Thu Jan 3 18:53:29 2013 @@ -20,7 +20,6 @@ package org.apache.cxf.ws.policy.spring; import java.util.Collection; -import junit.framework.Assert; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.ws.policy.PolicyEngine; @@ -28,6 +27,7 @@ import org.apache.cxf.ws.policy.PolicyEn import org.apache.cxf.ws.policy.PolicyProvider; import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider; import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; +import org.junit.Assert; import org.junit.Test; public class PolicyBeansTest extends Assert { Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java Thu Jan 3 18:53:29 2013 @@ -34,7 +34,6 @@ import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.xml.namespace.QName; -import junit.framework.Assert; import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.model.SoapBindingInfo; @@ -56,6 +55,7 @@ import org.easymock.EasyMock; import org.easymock.IMocksControl; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProtocolVariationTest.java Thu Jan 3 18:53:29 2013 @@ -19,11 +19,10 @@ package org.apache.cxf.ws.rm; -import junit.framework.Assert; - import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.addressing.VersionTransformer.Names200408; +import org.junit.Assert; import org.junit.Test; /** Modified: cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java (original) +++ cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java Thu Jan 3 18:53:29 2013 @@ -25,8 +25,6 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; -import junit.framework.Assert; - import org.apache.cxf.feature.Features; import org.apache.cxf.helpers.CastUtils; import org.apache.ws.security.WSConstants; @@ -37,6 +35,8 @@ import org.apache.ws.security.saml.ext.A import org.apache.ws.security.util.WSSecurityUtil; import org.example.contract.doubleit.DoubleItPortType; +import org.junit.Assert; + @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") Modified: cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java Thu Jan 3 18:53:29 2013 @@ -31,8 +31,6 @@ import javax.wsdl.extensions.soap12.SOAP import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import junit.framework.Assert; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Server; @@ -40,6 +38,7 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; import org.apache.cxf.testutil.common.TestUtil; import org.apache.hello_world_soap_http.Greeter; +import org.junit.Assert; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java (original) +++ cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java Thu Jan 3 18:53:29 2013 @@ -22,7 +22,6 @@ package org.apache.cxf.systest.coloc; import java.util.ResourceBundle; import javax.xml.ws.Holder; -import static junit.framework.Assert.assertEquals; import org.apache.commons.logging.Log; import org.apache.cxf.common.i18n.Message; @@ -38,6 +37,8 @@ import org.apache.headers.coloc.types.Ou import org.apache.headers.doc_lit.HeaderTester; import org.apache.headers.doc_lit.PingMeFault; +import static org.junit.Assert.assertEquals; + public class BaseHeaderTesterDocLitImpl implements HeaderTester { private Log logger; Modified: cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterRpcLitImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterRpcLitImpl.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterRpcLitImpl.java (original) +++ cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/coloc/BaseHeaderTesterRpcLitImpl.java Thu Jan 3 18:53:29 2013 @@ -23,7 +23,6 @@ import java.util.ResourceBundle; import javax.xml.ws.Holder; -import static junit.framework.Assert.assertEquals; import org.apache.commons.logging.Log; import org.apache.cxf.common.i18n.Message; @@ -41,6 +40,8 @@ import org.apache.headers.coloc.types.Pi import org.apache.headers.rpc_lit.HeaderTester; import org.apache.headers.rpc_lit.PingMeFault; +import static org.junit.Assert.assertEquals; + public class BaseHeaderTesterRpcLitImpl implements HeaderTester { private Log logger; Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java Thu Jan 3 18:53:29 2013 @@ -27,8 +27,6 @@ import java.util.logging.Logger; import javax.xml.ws.BindingProvider; import javax.xml.ws.Endpoint; -import junit.framework.AssertionFailedError; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; @@ -265,7 +263,7 @@ public abstract class AbstractClientPers // verify the final ack range to be complete try { mf.verifyAcknowledgementRange(1, 5); - } catch (AssertionFailedError er) { + } catch (AssertionError er) { //possibly only got the first 2 ranges when split in 3, lets //wait for the third and then recheck awaitMessages(1, 3); Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java Thu Jan 3 18:53:29 2013 @@ -29,12 +29,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import junit.framework.Assert; - import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.rm.RMConstants; +import org.junit.Assert; + public class MessageFlow extends Assert { private final String addressingNamespace; Modified: cxf/branches/2.6.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java Thu Jan 3 18:53:29 2013 @@ -29,12 +29,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import junit.framework.Assert; - import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.rm.RMConstants; +import org.junit.Assert; + public class MessageFlow extends Assert { private final String addressingNamespace; Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java (original) +++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java Thu Jan 3 18:53:29 2013 @@ -21,9 +21,8 @@ package org.apache.cxf.testutil.common; import java.util.logging.Logger; -import junit.framework.Assert; - import org.apache.cxf.common.logging.LogUtils; +import org.junit.Assert; public abstract class AbstractTestServerBase extends Assert { Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java (original) +++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/recorders/MessageRecorder.java Thu Jan 3 18:53:29 2013 @@ -21,7 +21,7 @@ package org.apache.cxf.testutil.recorder import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; public class MessageRecorder extends Assert { Modified: cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java?rev=1428547&r1=1428546&r2=1428547&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java (original) +++ cxf/branches/2.6.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java Thu Jan 3 18:53:29 2013 @@ -34,8 +34,6 @@ import javax.wsdl.xml.WSDLWriter; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; -import junit.framework.Assert; - import org.apache.cxf.binding.corba.wsdl.BindingType; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; import org.apache.cxf.binding.corba.wsdl.TypeMappingType; @@ -43,6 +41,8 @@ import org.apache.cxf.wsdl.JAXBExtension import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.junit.Assert; + public class WSDLGenerationTester { private XmlSchemaCollection schemaCol = new XmlSchemaCollection();