Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-24 13:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added AntPathMatcher member to bring into line with recent Spring refactoring which breaks the build.

Browse Source
This commit is contained in:
Luke Taylor 2005-04-18 23:10:54 +00:00
parent 8085419e3d
commit 1fc79f04f1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/acegisecurity/intercept/web/PathBasedFilterInvocationDefinitionMap.java
View File

@ -21,6 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.util.PathMatcher; import org.springframework.util.PathMatcher;
import org.springframework.util.AntPathMatcher;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -41,7 +42,7 @@ import java.util.Vector;
* <p> * <p>
* The order of registering the Ant paths using the {@link * The order of registering the Ant paths using the {@link
* #addSecureUrl(String, ConfigAttributeDefinition)} is very important. The * #addSecureUrl(String, ConfigAttributeDefinition)} is very important. The
* system will identify the <B>first</B> matching path for a given HTTP URL. * system will identify the <b>first</b> matching path for a given HTTP URL.
* It will not proceed to evaluate later paths if a match has already been * It will not proceed to evaluate later paths if a match has already been
* found. Accordingly, the most specific paths should be registered first, * found. Accordingly, the most specific paths should be registered first,
* with the most general paths registered last. * with the most general paths registered last.
@ -62,6 +63,7 @@ public class PathBasedFilterInvocationDefinitionMap
private List requestMap = new Vector(); private List requestMap = new Vector();
private boolean convertUrlToLowercaseBeforeComparison = false; private boolean convertUrlToLowercaseBeforeComparison = false;
private PathMatcher pathMatcher = new AntPathMatcher();
//~ Methods ================================================================ //~ Methods ================================================================
@ -113,7 +115,7 @@ public class PathBasedFilterInvocationDefinitionMap
while (iter.hasNext()) { while (iter.hasNext()) {
EntryHolder entryHolder = (EntryHolder) iter.next(); EntryHolder entryHolder = (EntryHolder) iter.next();
boolean matched = PathMatcher.match(entryHolder.getAntPath(), url); boolean matched = pathMatcher.match(entryHolder.getAntPath(), url);
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Candidate is: '" + url + "'; pattern is " logger.debug("Candidate is: '" + url + "'; pattern is "