();
private StringBuilder m_result = new StringBuilder(1024);
- private PatternMatcher m_matcher = new Perl5Matcher();
private Pattern m_includePattern;
private Pattern m_excludePattern;
private boolean m_formatCompact = true;
@@ -65,9 +64,6 @@
/** The parameter name for the depth. Value is {@value}. */
public static final String PARAM_DEPTH = "depth";
- /** The parameter name for the type of the references. Value is {@value}. */
- public static final String PARAM_TYPE = "type";
-
/** The parameter name for the included pages. Value is {@value}. */
public static final String PARAM_INCLUDE = "include";
@@ -136,15 +132,14 @@
// glob compiler : * is 0..n instance of any char -- more convenient as input
// perl5 compiler : .* is 0..n instances of any char -- more powerful
//PatternCompiler g_compiler = new GlobCompiler();
- PatternCompiler compiler = new Perl5Compiler();
try
{
- m_includePattern = compiler.compile(includePattern);
+ m_includePattern = Pattern.compile(includePattern);
- m_excludePattern = compiler.compile(excludePattern);
+ m_excludePattern = Pattern.compile(excludePattern);
}
- catch( MalformedPatternException e )
+ catch( PatternSyntaxException e )
{
if (m_includePattern == null )
{
@@ -214,8 +209,8 @@
if( !m_engine.pageExists( link ) ) continue; // hide links to non
// existing pages
- if( m_matcher.matches( link , m_excludePattern ) ) continue;
- if( !m_matcher.matches( link , m_includePattern ) ) continue;
+ if( m_excludePattern.matcher( link ).find()) continue;
+ if( !m_includePattern.matcher( link ).find() ) continue;
if( m_exists.contains( link ) )
{
Index: /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
===================================================================
--- /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (revision 727418)
+++ /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (working copy)
@@ -30,6 +30,10 @@
import java.util.List;
import java.util.Date;
import java.util.Iterator;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
import java.text.SimpleDateFormat;
import java.text.ParseException;
import com.ecyrd.jspwiki.log.Logger;
@@ -37,8 +41,6 @@
import com.ecyrd.jspwiki.util.FileUtil;
import com.ecyrd.jspwiki.util.TextUtil;
-import org.apache.oro.text.regex.*;
-
import com.ecyrd.jspwiki.*;
/**
@@ -134,8 +136,7 @@
public WikiPage getPageInfo( String page, int version )
throws ProviderException
{
- PatternMatcher matcher = new Perl5Matcher();
- PatternCompiler compiler = new Perl5Compiler();
+ Matcher matcher = null;
BufferedReader stdout = null;
WikiPage info = super.getPageInfo( page, version );
@@ -154,12 +155,12 @@
stdout = new BufferedReader( new InputStreamReader(process.getInputStream() ) );
String line;
- Pattern headpattern = compiler.compile( PATTERN_REVISION );
+ Pattern headpattern = Pattern.compile( PATTERN_REVISION );
// This complicated pattern is required, since on Linux RCS adds
// quotation marks, but on Windows, it does not.
- Pattern userpattern = compiler.compile( PATTERN_AUTHOR );
- Pattern datepattern = compiler.compile( PATTERN_DATE );
- Pattern notepattern = compiler.compile( PATTERN_CHANGENOTE );
+ Pattern userpattern = Pattern.compile( PATTERN_AUTHOR );
+ Pattern datepattern = Pattern.compile( PATTERN_DATE );
+ Pattern notepattern = Pattern.compile( PATTERN_CHANGENOTE );
boolean found = false;
@@ -165,9 +166,10 @@
while( (line = stdout.readLine()) != null )
{
- if( matcher.contains( line, headpattern ) )
+ matcher = headpattern.matcher( line );
+ if( matcher.find() )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
try
{
@@ -185,9 +187,11 @@
// Just continue reading through
}
}
- else if( matcher.contains( line, datepattern ) && found )
+ else
+ matcher = datepattern.matcher( line );
+ if( matcher.find() && found )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
Date d = parseDate( result.group(1) );
if( d != null )
@@ -207,17 +211,19 @@
break;
}
- if( found && matcher.contains( line, userpattern ) )
+ matcher = userpattern.matcher( line );
+ if( found && matcher.find() )
{
- MatchResult result = matcher.getMatch();
- info.setAuthor( TextUtil.urlDecodeUTF8(result.group(1)) );
+ MatchResult result = matcher.toMatchResult();
+ info.setAuthor( TextUtil.urlDecodeUTF8( result.group( 1 ) ) );
}
- if( found && matcher.contains( line, notepattern ) )
+ matcher = notepattern.matcher( line );
+ if( found && matcher.find() )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
- info.setAttribute( WikiPage.CHANGENOTE, TextUtil.urlDecodeUTF8(result.group(1)) );
+ info.setAttribute( WikiPage.CHANGENOTE, TextUtil.urlDecodeUTF8( result.group( 1 ) ) );
}
}
@@ -277,8 +283,7 @@
try
{
- PatternMatcher matcher = new Perl5Matcher();
- PatternCompiler compiler = new Perl5Compiler();
+ Matcher matcher = null;;
int checkedOutVersion = -1;
String line;
String cmd = m_checkoutVersionCommand;
@@ -294,13 +299,14 @@
stderr = new BufferedReader(new InputStreamReader(process.getErrorStream()));
- Pattern headpattern = compiler.compile( PATTERN_REVISION );
+ Pattern headpattern = Pattern.compile( PATTERN_REVISION );
while( (line = stderr.readLine()) != null )
{
- if( matcher.contains( line, headpattern ) )
+ matcher = headpattern.matcher( line );
+ if( matcher.find() )
{
- MatchResult mr = matcher.getMatch();
+ MatchResult mr = matcher.toMatchResult();
checkedOutVersion = Integer.parseInt( mr.group(1) );
}
}
@@ -341,7 +347,7 @@
}
}
- catch( MalformedPatternException e )
+ catch( PatternSyntaxException e )
{
throw new InternalWikiException("Malformed pattern in RCSFileProvider!");
}
@@ -465,8 +471,7 @@
// FIXME: Put the rcs date formats into properties as well.
public List getVersionHistory( String page )
{
- PatternMatcher matcher = new Perl5Matcher();
- PatternCompiler compiler = new Perl5Compiler();
+ Matcher matcher =null;
BufferedReader stdout = null;
log.debug("Getting RCS version history");
@@ -475,13 +480,13 @@
try
{
- Pattern revpattern = compiler.compile( PATTERN_REVISION );
- Pattern datepattern = compiler.compile( PATTERN_DATE );
+ Pattern revpattern = Pattern.compile( PATTERN_REVISION );
+ Pattern datepattern = Pattern.compile( PATTERN_DATE );
// This complicated pattern is required, since on Linux RCS adds
// quotation marks, but on Windows, it does not.
- Pattern userpattern = compiler.compile( PATTERN_AUTHOR );
+ Pattern userpattern = Pattern.compile( PATTERN_AUTHOR );
- Pattern notepattern = compiler.compile( PATTERN_CHANGENOTE );
+ Pattern notepattern = Pattern.compile( PATTERN_CHANGENOTE );
String cmd = TextUtil.replaceString( m_fullLogCommand,
"%s",
@@ -498,11 +503,12 @@
while( (line = stdout.readLine()) != null )
{
- if( matcher.contains( line, revpattern ) )
+ matcher = revpattern.matcher( line );
+ if( matcher.find() )
{
info = new WikiPage( m_engine, page );
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
int vernum = Integer.parseInt( result.group(1) );
info.setVersion( vernum );
@@ -510,9 +516,10 @@
list.add( info );
}
- if( matcher.contains( line, datepattern ) && info != null )
+ matcher = datepattern.matcher( line );
+ if( matcher.find() && info != null )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
Date d = parseDate( result.group(1) );
@@ -519,9 +526,10 @@
info.setLastModified( d );
}
- if( matcher.contains( line, userpattern ) && info != null )
+ matcher = userpattern.matcher( line );
+ if( matcher.find() && info != null )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
info.setAuthor( TextUtil.urlDecodeUTF8(result.group(1)) );
}
@@ -526,9 +534,10 @@
info.setAuthor( TextUtil.urlDecodeUTF8(result.group(1)) );
}
- if( matcher.contains( line, notepattern ) && info != null )
+ matcher = notepattern.matcher( line );
+ if( matcher.find() && info != null )
{
- MatchResult result = matcher.getMatch();
+ MatchResult result = matcher.toMatchResult();
info.setAttribute( WikiPage.CHANGENOTE, TextUtil.urlDecodeUTF8(result.group(1)) );
}
Index: /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/util/RegExpUtil.java
===================================================================
--- /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/util/RegExpUtil.java (revision 0)
+++ /home/metskem/workspace/JSPWiki/src/com/ecyrd/jspwiki/util/RegExpUtil.java (revision 0)
@@ -0,0 +1,189 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package com.ecyrd.jspwiki.util;
+
+/**
+ * Copied code from the org.apache.oro.text.regex.GlobCompiler
+ * All credits to the author's
+ */
+public final class RegExpUtil
+{
+ private RegExpUtil()
+ {
+ // private constructor prevents construction
+ }
+
+ /**
+ * The default mask for the {@link #compile compile} methods. It is equal to
+ * 0. The default behavior is for a glob expression to be case sensitive
+ * unless it is compiled with the CASE_INSENSITIVE_MASK option.
+ */
+ public static final int DEFAULT_MASK = 0;
+
+ /**
+ * A mask passed as an option to the {@link #compile compile} methods to
+ * indicate a compiled glob expression should be case insensitive.
+ */
+ public static final int CASE_INSENSITIVE_MASK = 0x0001;
+
+ /**
+ * A mask passed as an option to the {@link #compile compile} methods to
+ * indicate that a * should not be allowed to match the null string. The
+ * normal behavior of the * metacharacter is that it may match any 0 or more
+ * characters. This mask causes it to match 1 or more characters of
+ * anything.
+ */
+ public static final int STAR_CANNOT_MATCH_NULL_MASK = 0x0002;
+
+ /**
+ * A mask passed as an option to the {@link #compile compile} methods to
+ * indicate that a ? should not be allowed to match the null string. The
+ * normal behavior of the ? metacharacter is that it may match any 1
+ * character. This mask causes it to match 0 or 1 characters.
+ */
+ public static final int QUESTION_MATCHES_ZERO_OR_ONE_MASK = 0x0004;
+
+ /**
+ * A mask passed as an option to the {@link #compile compile} methods to
+ * indicate that the resulting Perl5Pattern should be treated as a read only
+ * data structure by Perl5Matcher, making it safe to share a single
+ * Perl5Pattern instance among multiple threads without needing
+ * synchronization. Without this option, Perl5Matcher reserves the right to
+ * store heuristic or other information in Perl5Pattern that might
+ * accelerate future matches. When you use this option, Perl5Matcher will
+ * not store or modify any information in a Perl5Pattern. Use this option
+ * when you want to share a Perl5Pattern instance among multiple threads
+ * using different Perl5Matcher instances.
+ */
+ public static final int READ_ONLY_MASK = 0x0008;
+
+ /**
+ * This static method is the basic engine of the Glob PatternCompiler
+ * implementation. It takes a glob expression in the form of a character
+ * array and converts it into a String representation of a Perl5 pattern.
+ * The method is made public so that programmers may use it for their own
+ * purposes. However, the GlobCompiler compile methods work by converting
+ * the glob pattern to a Perl5 pattern using this method, and then invoking
+ * the compile() method of an internally stored Perl5Compiler instance.
+ *
+ *
+ * @param pattern A character array representation of a Glob pattern.
+ * @return A String representation of a Perl5 pattern equivalent to the Glob
+ * pattern.
+ */
+ public static String globToPerl5( char[] pattern, int options )
+ {
+ boolean inCharSet = false;
+ boolean starCannotMatchNull = false;
+ boolean questionMatchesZero = false;
+
+ int ch;
+ StringBuffer buffer;
+
+ buffer = new StringBuffer( 2 * pattern.length );
+ inCharSet = false;
+
+ questionMatchesZero = (options & QUESTION_MATCHES_ZERO_OR_ONE_MASK) != 0;
+ starCannotMatchNull = (options & STAR_CANNOT_MATCH_NULL_MASK) != 0;
+
+ for( ch = 0; ch < pattern.length; ch++ )
+ {
+ switch( pattern[ch] )
+ {
+ case '*':
+ if( inCharSet )
+ buffer.append( '*' );
+ else
+ {
+ if( starCannotMatchNull )
+ buffer.append( ".+" );
+ else
+ buffer.append( ".*" );
+ }
+ break;
+ case '?':
+ if( inCharSet )
+ buffer.append( '?' );
+ else
+ {
+ if( questionMatchesZero )
+ buffer.append( ".?" );
+ else
+ buffer.append( '.' );
+ }
+ break;
+ case '[':
+ inCharSet = true;
+ buffer.append( pattern[ch] );
+
+ if( ch + 1 < pattern.length )
+ {
+ switch( pattern[ch + 1] )
+ {
+ case '!':
+ case '^':
+ buffer.append( '^' );
+ ++ch;
+ continue;
+ case ']':
+ buffer.append( ']' );
+ ++ch;
+ continue;
+ }
+ }
+ break;
+ case ']':
+ inCharSet = false;
+ buffer.append( pattern[ch] );
+ break;
+ case '\\':
+ buffer.append( '\\' );
+ if( ch == pattern.length - 1 )
+ {
+ buffer.append( '\\' );
+ }
+ else if( isGlobMetaCharacter( pattern[ch + 1] ) )
+ buffer.append( pattern[++ch] );
+ else
+ buffer.append( '\\' );
+ break;
+ default:
+ if( !inCharSet && isPerl5MetaCharacter( pattern[ch] ) )
+ buffer.append( '\\' );
+ buffer.append( pattern[ch] );
+ break;
+ }
+ }
+
+ return buffer.toString();
+ }
+
+ private static boolean isPerl5MetaCharacter( char ch )
+ {
+ return "'*?+[]()|^$.{}\\".indexOf( ch ) >= 0;
+ }
+
+ private static boolean isGlobMetaCharacter( char ch )
+ {
+ return "*?[]".indexOf( ch ) >= 0;
+ }
+
+}
Index: /home/metskem/workspace/JSPWiki/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java
===================================================================
--- /home/metskem/workspace/JSPWiki/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java (revision 0)
+++ /home/metskem/workspace/JSPWiki/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java (revision 0)
@@ -0,0 +1,128 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+package com.ecyrd.jspwiki.plugin;
+
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import com.ecyrd.jspwiki.TestEngine;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiPage;
+
+public class ReferredPagesPluginTest extends TestCase
+{
+ Properties props = new Properties();
+
+ TestEngine engine;
+
+ WikiContext context;
+
+ PluginManager manager;
+
+ public ReferredPagesPluginTest( String s )
+ {
+ super( s );
+ }
+
+ public void setUp() throws Exception
+ {
+ props.load( TestEngine.findTestProperties() );
+
+ engine = new TestEngine( props );
+
+ engine.saveText( "SomeBodyPointsToMe", "Somebody points to this page" );
+ engine.saveText( "IPointToSomeoneElse", "Reference to [SomeBodyPointsToMe]." );
+ engine.saveText( "IPointToSomeoneElseToo", "Reference to [SomeBodyPointsToMe]." );
+ engine.saveText( "SomeBodyPointsToMeToo", "Somebody points to this page too" );
+ engine.saveText( "IPointToTwoPages", "Reference to [SomeBodyPointsToMe] and [SomeBodyPointsToMeToo]." );
+
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage( engine, "IPointToSomeoneElse" ) );
+ manager = new PluginManager( engine, props );
+ }
+
+ public void tearDown()
+ {
+ TestEngine.deleteTestPage( "SomeBodyPointsToMe" );
+ TestEngine.deleteTestPage( "IPointToSomeoneElse" );
+ TestEngine.deleteTestPage( "IPointToSomeoneElseToo" );
+ TestEngine.deleteTestPage( "IPointToTwoPages" );
+ }
+
+ /**
+ * Plain test without parameters
+ *
+ * @throws Exception
+ */
+ public void testReferredPage() throws Exception
+ {
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage( engine, "IPointToSomeoneElse" ) );
+
+ String res = manager.execute( context, "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin}" );
+
+ assertEquals(
+ "
\n",
+ res );
+ }
+
+ /**
+ * Test with the page parameter (page A tells us which pages page B points
+ * to)
+ *
+ * @throws Exception
+ */
+ public void testReferredPageParmPage() throws Exception
+ {
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage( engine, "IPointToSomeoneElse" ) );
+
+ String res = manager.execute( context, "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin page=IPointToSomeoneElseToo}" );
+
+ assertEquals(
+ "\n",
+ res );
+ }
+
+ /**
+ * Test with the include parameter
+ *
+ * @throws Exception
+ */
+ public void testReferredPageParmInClude() throws Exception
+ {
+ context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage( engine, "IPointToTwoPages" ) );
+
+ String res = manager.execute( context,
+ "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin include='SomeBodyPointsToMe.*'}" );
+
+ assertEquals(
+ "\n",
+ res );
+
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite( ReferredPagesPluginTest.class );
+ }
+}