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/06/22 13:57:13 UTC
svn commit: r416339 - in /cocoon/branches/BRANCH_2_1_X/src:
java/org/apache/cocoon/matching/helpers/ java/org/apache/cocoon/util/
test/org/apache/cocoon/util/test/
Author: cziegeler
Date: Thu Jun 22 04:57:13 2006
New Revision: 416339
URL: http://svn.apache.org/viewvc?rev=416339&view=rev
Log:
Sync with changes from trunk
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/BufferedOutputStream.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Deprecation.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/WildcardHelperTestCase.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java?rev=416339&r1=416338&r2=416339&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java Thu Jun 22 04:57:13 2006
@@ -17,6 +17,8 @@
import java.util.Map;
+import org.apache.cocoon.util.WildcardMatcherHelper;
+
/**
* This class is an utility class that perform wilcard-patterns matching and
* isolation.
@@ -26,6 +28,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
+ * @deprecated Use the {@link WildcardMatcherHelper} instead.
* @version CVS $Id$
*/
public class WildcardHelper {
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/BufferedOutputStream.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/BufferedOutputStream.java?rev=416339&r1=416338&r2=416339&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/BufferedOutputStream.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/BufferedOutputStream.java Thu Jun 22 04:57:13 2006
@@ -156,7 +156,7 @@
public void clearBuffer() {
this.count = 0;
}
-
+
/**
* Return the size of the current buffer
*/
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Deprecation.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Deprecation.java?rev=416339&r1=416338&r2=416339&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Deprecation.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/Deprecation.java Thu Jun 22 04:57:13 2006
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.commons.lang.enums.Enum;
import org.apache.commons.lang.enums.ValuedEnum;
/**
@@ -89,7 +88,7 @@
}
public static LogLevel getLevel(String level) {
- return (LogLevel)Enum.getEnum(LogLevel.class, level);
+ return (LogLevel)ValuedEnum.getEnum(LogLevel.class, level);
}
}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java?rev=416339&r1=416338&r2=416339&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java Thu Jun 22 04:57:13 2006
@@ -98,7 +98,7 @@
*
* @return inputStream the underlying InputStream.
*/
- public synchronized InputStream getInputStream() {
+ public InputStream getInputStream() {
return m_inputStream;
}
Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/WildcardHelperTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/WildcardHelperTestCase.java?rev=416339&r1=416338&r2=416339&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/WildcardHelperTestCase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/WildcardHelperTestCase.java Thu Jun 22 04:57:13 2006
@@ -102,6 +102,9 @@
boolean result = WildcardHelper.match(resultMap, "foo/bar/", expr);
assertFalse("Url 'foo/bar/' should not match pattern '*/'.", result);
+ result = WildcardHelper.match(resultMap, "test/foo/bar/", expr);
+ assertFalse("Url 'test/foo/bar/' should not match pattern '*/'.", result);
+
result = WildcardHelper.match(resultMap, "foo/", expr);
assertTrue("Url 'foo/' should match pattern '*/'", result);
}