cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1562972 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
Date Thu, 30 Jan 2014 21:24:46 GMT
Author: sergeyb
Date: Thu Jan 30 21:24:46 2014
New Revision: 1562972

URL: http://svn.apache.org/r1562972
Log:
Merged revisions 1562968 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1562968 | sergeyb | 2014-01-30 21:19:29 +0000 (Thu, 30 Jan 2014) | 1 line
  
  [CXF-5534] Adding the tests provided by Hans Weisheimer
........

Added:
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
      - copied, changed from r1562968, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
Modified:
    cxf/branches/2.7.x-fixes/   (props changed)

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1562968

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

Copied: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
(from r1562968, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java?p2=cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java&r1=1562968&r2=1562972&rev=1562972&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
Thu Jan 30 21:24:46 2014
@@ -30,11 +30,11 @@ import static org.junit.Assert.assertEqu
 
 public class ProviderFactoryExceptionMapperTest {
 
-    private ServerProviderFactory pf;
+    private ProviderFactory pf;
 
     @Before
     public void setUp() throws Exception {
-        pf = ServerProviderFactory.getInstance();
+        pf = ProviderFactory.getInstance();
         pf.registerUserProvider(new RuntimeExceptionMapper2());
         pf.registerUserProvider(new RuntimeExceptionMapper1());
         pf.registerUserProvider(new RuntimeExceptionMapper());



Mime
View raw message