Return-Path: X-Original-To: apmail-cocoon-cvs-archive@www.apache.org Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B7F87B24 for ; Fri, 22 Jul 2011 09:52:28 +0000 (UTC) Received: (qmail 4375 invoked by uid 500); 22 Jul 2011 09:52:26 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 4199 invoked by uid 500); 22 Jul 2011 09:52:17 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 4184 invoked by uid 99); 22 Jul 2011 09:52:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2011 09:52:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2011 09:52:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BBCEA2388994 for ; Fri, 22 Jul 2011 09:51:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149530 - in /cocoon/cocoon3/trunk: ./ cocoon-all/ cocoon-all/src/main/assembly/ cocoon-all/src/main/groovy/ cocoon-pipeline/ cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ cocoon-pipeline/src/main/java/org/apache/cocoon... Date: Fri, 22 Jul 2011 09:51:45 -0000 To: cvs@cocoon.apache.org From: reinhard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110722095146.BBCEA2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reinhard Date: Fri Jul 22 09:51:39 2011 New Revision: 1149530 URL: http://svn.apache.org/viewvc?rev=1149530&view=rev Log: move wildcardMatcherHelper and murmurhash impl to cocoon-util; add cocoon-util to cocoon-all, the svn-tag creation script and the docs Added: cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/matcher/WildcardMatcherTest.java - copied unchanged from r1149494, cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/matcher/WildcardMatcherTest.java cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/ cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHash.java - copied, changed from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHash.java cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilder.java - copied, changed from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilder.java cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelper.java - copied, changed from r1149494, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilderTest.java - copied, changed from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilderTest.java cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelperTest.java - copied, changed from r1149494, cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelperTestCase.java Removed: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHash.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilder.java cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilderTest.java cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelperTestCase.java Modified: cocoon/cocoon3/trunk/cocoon-all/pom.xml cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java cocoon/cocoon3/trunk/parent/pom.xml cocoon/cocoon3/trunk/pom.xml cocoon/cocoon3/trunk/svn-release-tags.sh Modified: cocoon/cocoon3/trunk/cocoon-all/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/pom.xml?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/pom.xml (original) +++ cocoon/cocoon3/trunk/cocoon-all/pom.xml Fri Jul 22 09:51:39 2011 @@ -83,6 +83,10 @@ cocoon-stringtemplate + org.apache.cocoon.util + cocoon-util + + org.apache.cocoon.wicket cocoon-wicket Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml (original) +++ cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml Fri Jul 22 09:51:39 2011 @@ -200,6 +200,16 @@ + ../cocoon-util + src/cocoon-util + + pom.xml + LICENSE.txt + NOTICE.txt + src/ + + + ../cocoon-wicket src/cocoon-wicket Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy (original) +++ cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy Fri Jul 22 09:51:39 2011 @@ -56,6 +56,9 @@ ant.copy(todir: new File(project.basedir fileset(dir: new File(project.basedir, "../cocoon-stringtemplate/src/main/java")) { exclude(name: '**/.svn') } + fileset(dir: new File(project.basedir, "../cocoon-util/src/main/java")) { + exclude(name: '**/.svn') + } fileset(dir: new File(project.basedir, "../cocoon-wicket/src/main/java")) { exclude(name: '**/.svn') } Modified: cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/pom.xml Fri Jul 22 09:51:39 2011 @@ -29,16 +29,20 @@ 3.0.0-beta-1-SNAPSHOT ../parent - + org.apache.cocoon.pipeline cocoon-pipeline 3.0.0-beta-1-SNAPSHOT - + Apache Cocoon 3: Pipeline The core of Cocoon 3. A Servlet API independent implementation of pipelines. + org.apache.cocoon.util + cocoon-util + + commons-logging commons-logging @@ -62,6 +66,6 @@ xmlunit xmlunit test - + Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java Fri Jul 22 09:51:39 2011 @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; import org.apache.cocoon.pipeline.util.StringRepresentation; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java Fri Jul 22 09:51:39 2011 @@ -19,7 +19,7 @@ */ package org.apache.cocoon.pipeline.caching; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; /** * A cache key implementation that expires after a defined number of seconds. Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java Fri Jul 22 09:51:39 2011 @@ -18,7 +18,7 @@ package org.apache.cocoon.pipeline.cachi import java.io.Serializable; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; public class InvalidCacheKey extends AbstractCacheKey { Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java Fri Jul 22 09:51:39 2011 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; /** * A {@link CacheKey} that contains a {@link Map} of parameters. Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java Fri Jul 22 09:51:39 2011 @@ -18,8 +18,8 @@ */ package org.apache.cocoon.pipeline.caching; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; import org.apache.cocoon.pipeline.util.StringRepresentation; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; public class SimpleCacheKey extends AbstractCacheKey { Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java (original) +++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java Fri Jul 22 09:51:39 2011 @@ -22,8 +22,8 @@ import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; import org.apache.cocoon.pipeline.util.StringRepresentation; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; public class TimestampCacheKey extends AbstractCacheKey { Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java (original) +++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java Fri Jul 22 09:51:39 2011 @@ -19,7 +19,7 @@ package org.apache.cocoon.sample.generat import org.apache.cocoon.pipeline.caching.AbstractCacheKey; import org.apache.cocoon.pipeline.caching.CacheKey; import org.apache.cocoon.pipeline.component.CachingPipelineComponent; -import org.apache.cocoon.pipeline.util.MurmurHashCodeBuilder; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; public class CachingTimestampGenerator extends TimestampGenerator implements CachingPipelineComponent { Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java (original) +++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java Fri Jul 22 09:51:39 2011 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; -import org.apache.cocoon.sitemap.util.WildcardMatcherHelper; +import org.apache.cocoon.util.wildcard.WildcardMatcherHelper; public class WildcardMatcher implements Matcher { Copied: cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHash.java (from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHash.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHash.java?p2=cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHash.java&p1=cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHash.java&r1=1149494&r2=1149530&rev=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHash.java (original) +++ cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHash.java Fri Jul 22 09:51:39 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.pipeline.util; +package org.apache.cocoon.util.murmurhash; /** * This is a very fast, non-cryptographic hash suitable for general hash-based lookup. See Copied: cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilder.java (from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilder.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilder.java?p2=cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilder.java&p1=cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilder.java&r1=1149494&r2=1149530&rev=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilder.java (original) +++ cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilder.java Fri Jul 22 09:51:39 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.pipeline.util; +package org.apache.cocoon.util.murmurhash; /** * A hash code builder based on MurmurHash. Copied: cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelper.java (from r1149494, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelper.java?p2=cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelper.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java&r1=1149494&r2=1149530&rev=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java (original) +++ cocoon/cocoon3/trunk/cocoon-util/src/main/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelper.java Fri Jul 22 09:51:39 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.sitemap.util; +package org.apache.cocoon.util.wildcard; import java.util.HashMap; import java.util.Map; @@ -42,7 +42,7 @@ public class WildcardMatcherHelper { /** * Match a pattern against a string and isolates wildcard replacement into a Map.
* Here is how the matching algorithm works: - * + * *
    *
  • The '*' character, meaning that zero or more characters (excluding the path separator '/') are to be matched. *
    • @@ -61,10 +61,10 @@ public class WildcardMatcherHelper { *
    foo/bar/baz/bug * * The first '**' in the pattern will suck up as much as possible without making the match fail. - * + * * @param pat The pattern string. * @param str The string to math agains the pattern - * + * * @return a Map containing the representation of the extracted pattern. The extracted patterns are * keys in the Map from left to right beginning with "1" for te left most, "2" for the next, * a.s.o. The key "0" is the string itself. If the return value is null, string does not match to the Copied: cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilderTest.java (from r1149494, cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilderTest.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilderTest.java?p2=cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilderTest.java&p1=cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilderTest.java&r1=1149494&r2=1149530&rev=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/util/MurmurHashCodeBuilderTest.java (original) +++ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/murmurhash/MurmurHashCodeBuilderTest.java Fri Jul 22 09:51:39 2011 @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.pipeline.util; +package org.apache.cocoon.util.murmurhash; import static junit.framework.Assert.*; +import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder; import org.junit.Test; public class MurmurHashCodeBuilderTest { Copied: cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelperTest.java (from r1149494, cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelperTestCase.java) URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelperTest.java?p2=cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelperTest.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelperTestCase.java&r1=1149494&r2=1149530&rev=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelperTestCase.java (original) +++ cocoon/cocoon3/trunk/cocoon-util/src/test/java/org/apache/cocoon/util/wildcard/WildcardMatcherHelperTest.java Fri Jul 22 09:51:39 2011 @@ -14,16 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.sitemap.util; +package org.apache.cocoon.util.wildcard; import java.util.Map; +import org.apache.cocoon.util.wildcard.WildcardMatcherHelper; + import junit.framework.TestCase; /** * @version $Id$ */ -public class WildcardMatcherHelperTestCase extends TestCase { +public class WildcardMatcherHelperTest extends TestCase { // ~ Methods ------------------------------------------------------------------------------------ Modified: cocoon/cocoon3/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/parent/pom.xml (original) +++ cocoon/cocoon3/trunk/parent/pom.xml Fri Jul 22 09:51:39 2011 @@ -506,6 +506,11 @@ 3.0.0-beta-1-SNAPSHOT + org.apache.cocoon.util + cocoon-util + 3.0.0-beta-1-SNAPSHOT + + org.apache.cocoon.wicket cocoon-wicket 3.0.0-beta-1-SNAPSHOT Modified: cocoon/cocoon3/trunk/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/pom.xml (original) +++ cocoon/cocoon3/trunk/pom.xml Fri Jul 22 09:51:39 2011 @@ -55,6 +55,7 @@ cocoon-sitemap cocoon-stax cocoon-stringtemplate + cocoon-util cocoon-wicket parent Modified: cocoon/cocoon3/trunk/svn-release-tags.sh URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/svn-release-tags.sh?rev=1149530&r1=1149529&r2=1149530&view=diff ============================================================================== --- cocoon/cocoon3/trunk/svn-release-tags.sh (original) +++ cocoon/cocoon3/trunk/svn-release-tags.sh Fri Jul 22 09:51:39 2011 @@ -67,4 +67,6 @@ svn cp https://svn.apache.org/repos/asf/ svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-$1/cocoon-stringtemplate/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-stringtemplate/cocoon-stringtemplate-$1/ -m "add tag for modules released during multi-pom process" +svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-$1/cocoon-util/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-wicket/cocoon-util-$1/ -m "add tag for modules released during multi-pom process" + svn cp https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-root/cocoon-root-$1/cocoon-wicket/ https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/cocoon-wicket/cocoon-wicket-$1/ -m "add tag for modules released during multi-pom process"