Author: sergeyb Date: Wed May 22 22:13:37 2013 New Revision: 1485463 URL: http://svn.apache.org/r1485463 Log: Merged revisions 1485461 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1485461 | sergeyb | 2013-05-22 23:04:25 +0100 (Wed, 22 May 2013) | 9 lines Merged revisions 1485457 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1485457 | sergeyb | 2013-05-22 23:02:30 +0100 (Wed, 22 May 2013) | 1 line [CXF-5021] Forgot to remove a redundant prefix in the custom resource path ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1485461 Merged /cxf/trunk:r1485457 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java?rev=1485463&r1=1485462&r2=1485463&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java (original) +++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java Wed May 22 22:13:37 2013 @@ -67,7 +67,7 @@ public abstract class AbstractHTTPServle private static final String STATIC_RESOURCES_PARAMETER = "static-resources-list"; private static final String STATIC_WELCOME_FILE_PARAMETER = "static-welcome-file"; - private static final String STATIC_RESOURCES_MAP_RESOURCE = "/WEB-INF/cxfServletStaticResourcesMap.txt"; + private static final String STATIC_RESOURCES_MAP_RESOURCE = "/cxfServletStaticResourcesMap.txt"; private static final String REDIRECTS_PARAMETER = "redirects-list"; private static final String REDIRECT_SERVLET_NAME_PARAMETER = "redirect-servlet-name";
