You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/06 08:17:59 UTC
svn commit: r482940 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java
Author: cziegeler
Date: Tue Dec 5 23:17:59 2006
New Revision: 482940
URL: http://svn.apache.org/viewvc?view=rev&rev=482940
Log:
Use new matching code
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java?view=diff&rev=482940&r1=482939&r2=482940
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonBean.java Tue Dec 5 23:17:59 2006
@@ -24,7 +24,7 @@
import org.apache.cocoon.components.notification.Notifier;
import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
import org.apache.cocoon.components.notification.Notifying;
-import org.apache.cocoon.matching.helpers.WildcardHelper;
+import org.apache.cocoon.util.WildcardMatcherHelper;
import org.apache.commons.lang.SystemUtils;
import org.apache.excalibur.source.ModifiableSource;
@@ -246,13 +246,11 @@
}
public void addExcludePattern(String pattern) {
- int preparedPattern[] = WildcardHelper.compilePattern(pattern);
- excludePatterns.add(preparedPattern);
+ excludePatterns.add(pattern);
}
public void addIncludePattern(String pattern) {
- int preparedPattern[] = WildcardHelper.compilePattern(pattern);
- includePatterns.add(preparedPattern);
+ includePatterns.add(pattern);
}
public void addIncludeLinkExtension(String extension) {
@@ -649,8 +647,8 @@
included = false;
i = includePatterns.iterator();
while (i.hasNext()){
- int pattern[] = (int[])i.next();
- if (WildcardHelper.match(map, uri, pattern)) {
+ final String pattern = (String)i.next();
+ if (WildcardMatcherHelper.match(pattern, uri) != null ) {
included=true;
break;
}
@@ -659,8 +657,8 @@
if (excludePatterns.size() != 0) {
i = excludePatterns.iterator();
while (i.hasNext()) {
- int pattern[] = (int[])i.next();
- if (WildcardHelper.match(map, uri, pattern)) {
+ final String pattern = (String)i.next();
+ if (WildcardMatcherHelper.match(pattern, uri) != null ) {
included=false;
break;
}