svn commit: r1505965 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java

[se...@apache.org]

Author: sergeyb
Date: Tue Jul 23 10:45:28 2013
New Revision: 1505965

URL: http://svn.apache.org/r1505965
Log:
Moving FilterDeclaration package name closer to the relevant code to protect more from pre-3.0 servlet API being linked to; the reflection can be introduced if really needed

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java?rev=1505965&r1=1505964&r2=1505965&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java Tue Jul 23 10:45:28 2013
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.servlet
 import java.io.IOException;
 
 import javax.servlet.FilterChain;
-import javax.servlet.FilterRegistration;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -204,7 +203,7 @@ public class CXFNonSpringServlet extends
         
         @Override
         public String getServletPath() {
-            FilterRegistration fr = super.getServletContext().getFilterRegistration(filterName);
+            javax.servlet.FilterRegistration fr = super.getServletContext().getFilterRegistration(filterName);
             if (fr != null && !fr.getUrlPatternMappings().isEmpty()) {
                 String mapping = fr.getUrlPatternMappings().iterator().next();
                 if (mapping.endsWith("/*")) {