Repository: cxf Updated Branches: refs/heads/master a92a1e680 -> fcb071c37
[CXF-6568] Renaming the property Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fcb071c3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fcb071c3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fcb071c3 Branch: refs/heads/master Commit: fcb071c37f4e4c6846f76f928f10b47ae2781559 Parents: a92a1e6 Author: Sergey Beryozkin <[email protected]> Authored: Mon Aug 31 09:51:29 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Aug 31 09:51:29 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/provider/ServerProviderFactory.java | 2 +- .../java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fcb071c3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java index bbcfa06..077fad5 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java @@ -73,7 +73,7 @@ public final class ServerProviderFactory extends ProviderFactory { WriterInterceptor.class)); private static final String WADL_PROVIDER_NAME = "org.apache.cxf.jaxrs.model.wadl.WadlGenerator"; - private static final String MAKE_DEFAULT_WAE_LEAST_SPECIFIC = "make.default.wae.least.specific"; + private static final String MAKE_DEFAULT_WAE_LEAST_SPECIFIC = "default.wae.mapper.least.specific"; private List<ProviderInfo<ExceptionMapper<?>>> exceptionMappers = new ArrayList<ProviderInfo<ExceptionMapper<?>>>(1); http://git-wip-us.apache.org/repos/asf/cxf/blob/fcb071c3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java index f6a5869..5bec732 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java @@ -375,7 +375,7 @@ public class ProviderFactoryTest extends Assert { @Test public void testExceptionMappersHierarchy3() throws Exception { Message m = new MessageImpl(); - m.put("make.default.wae.least.specific", true); + m.put("default.wae.mapper.least.specific", true); ServerProviderFactory pf = ServerProviderFactory.getInstance(); TestRuntimeExceptionMapper rm = new TestRuntimeExceptionMapper(); @@ -393,7 +393,7 @@ public class ProviderFactoryTest extends Assert { @Test public void testExceptionMappersHierarchy4() throws Exception { Message m = new MessageImpl(); - m.put("make.default.wae.least.specific", true); + m.put("default.wae.mapper.least.specific", true); ServerProviderFactory pf = ServerProviderFactory.getInstance(); ExceptionMapper<WebApplicationException> em = pf.createExceptionMapper(WebApplicationException.class, m);
