Return-Path: 
 <jspwiki-commits-return-1876-apmail-incubator-jspwiki-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org
Received: (qmail 43846 invoked from network); 30 Sep 2010 18:45:24 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 30 Sep 2010 18:45:24 -0000
Received: (qmail 97154 invoked by uid 500); 30 Sep 2010 18:45:24 -0000
Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org
Received: (qmail 97130 invoked by uid 500); 30 Sep 2010 18:45:23 -0000
Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jspwiki-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jspwiki-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jspwiki-commits@incubator.apache.org>
List-Id: <jspwiki-commits.incubator.apache.org>
Reply-To: jspwiki-dev@incubator.apache.org
Delivered-To: mailing list jspwiki-commits@incubator.apache.org
Received: (qmail 97123 invoked by uid 99); 30 Sep 2010 18:45:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Sep 2010 18:45:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 30 Sep 2010 18:45:22 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4FFFB23888E7; Thu, 30 Sep 2010 18:45:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1003200 - in /incubator/jspwiki/trunk: ./ etc/
 src/WebContent/templates/default/layout/ src/java/org/apache/wiki/
 src/java/org/apache/wiki/content/resolver/ src/java/org/apache/wiki/util/
 src/wikipages/de/ src/wikipages/en/ src/wikipages/e...
Date: Thu, 30 Sep 2010 18:45:01 -0000
To: jspwiki-commits@incubator.apache.org
From: metskem@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100930184502.4FFFB23888E7@eris.apache.org>

Author: metskem
Date: Thu Sep 30 18:45:00 2010
New Revision: 1003200

URL: http://svn.apache.org/viewvc?rev=1003200&view=rev
Log:
        * 3.0.0-svn-221
        
        * JSPWIKI-664 SpecialPage renamed, but wikipages not changed.
        Changed all references to "FindPage" into "Search" .

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/etc/jspwiki.properties
    incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/resolver/SpecialPageNameResolver.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
    incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt
    incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/es/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/it/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/nl/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/pt_BR/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/zh_CN/LeftMenu.txt
    incubator/jspwiki/trunk/tests/etc/jspwiki.properties
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Sep 30 18:45:00 2010
@@ -1,3 +1,10 @@
+2010-09-30  Harry Metske <metskem@apache.org>
+
+        * 3.0.0-svn-221
+        
+        * JSPWIKI-664 SpecialPage renamed, but wikipages not changed.
+        Changed all references to "FindPage" into "Search" .
+
 2010-08-29  Harry Metske <metskem@apache.org>
 
         * 3.0.0-svn-220

Modified: incubator/jspwiki/trunk/etc/jspwiki.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties Thu Sep 30 18:45:00 2010
@@ -272,7 +272,6 @@ jspwiki.searchProvider = LuceneSearchPro
 #  an existing one by redefining it here.
 #
 jspwiki.specialPage.CreateGroup = NewGroup.jsp
-#jspwiki.specialPage.FindPage = Search.jsp
 jspwiki.specialPage.Search = Search.jsp
 jspwiki.specialPage.Login = Login.jsp
 jspwiki.specialPage.NewGroup = NewGroup.jsp

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp Thu Sep 30 18:45:00 2010
@@ -84,7 +84,7 @@
 
          Links to favicon and common pages
     --%>
-    <link rel="search" href="<wiki:LinkTo format='url' page='FindPage' />" title='Search ${wikiEngine.applicationName}' />
+    <link rel="search" href="<wiki:LinkTo format='url' page='Search' />" title='Search ${wikiEngine.applicationName}' />
     <link rel="help" href="<wiki:LinkTo format='url' page='TextFormattingRules' />" title="Help" />
     <link rel="start" href="<wiki:LinkTo format='url' page='${wikiEngine.frontPage}' />" title="Front page" />
     <s:url value="${templates['images/favicon.ico']}" var="favicon" />

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Thu Sep 30 18:45:00 2010
@@ -77,7 +77,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "220";
+    public static final String     BUILD         = "221";
 
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/resolver/SpecialPageNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/resolver/SpecialPageNameResolver.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/resolver/SpecialPageNameResolver.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/resolver/SpecialPageNameResolver.java Thu Sep 30 18:45:00 2010
@@ -72,8 +72,8 @@ public class SpecialPageNameResolver ext
     /**
      * Determines whether a "page" exists by examining the list of special pages
      * and querying the page manager. The WikiPath will be tried with its qualifying
-     * space, and without. This means that if the value of {@code page} is "Main:FindPage",
-     * special pages called "FindPage" or "Main:FindPage" would match.
+     * space, and without. This means that if the value of {@code page} is "Main:Search",
+     * special pages called "Search" or "Main:Search" would match.
      * 
      * @param page the page to seek
      * @return <code>true</code> if the page exists, <code>false</code>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java Thu Sep 30 18:45:00 2010
@@ -83,8 +83,7 @@ public final class PropertyReader
       "jspwiki.specialPage.CreateProfile",   "Register.jsp",
       "jspwiki.specialPage.EditProfile",     "UserPreferences.jsp",
       "jspwiki.specialPage.Preferences",     "UserPreferences.jsp",
-      "jspwiki.specialPage.Search",          "Search.jsp",
-      "jspwiki.specialPage.FindPage",        "FindPage.jsp"};
+      "jspwiki.specialPage.Search",        "Searche.jsp"};
 
 
     /**

Modified: incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [letzte Änderungen|RecentChanges]
 * [WikiEtikette|WikiEtiquette]
 
-* [Suche|FindPage]
+* [Suche|Search]
 * [Unbenutzte Seiten|UnusedPages]
 * [Undefinierte Seiten|UndefinedPages]
 * [Seitenindex|PageIndex]

Modified: incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@ WikiWiki ist hawaiianisch und bedeutet "
 
 Wiki ist einfach. Das ist gut! Ein Wiki kann aber auch sehr schnell sehr komplex werden, was ebenfalls gut ist!
 
-Jeder kann darin stöbern. Alles was man braucht ist ein Web-Browser, der ein Minimum an HTML unterstützt. Um Seiten zu suchen, gehe auf die Seite [Suche|FindPage] oder tippe deine Anfrage einfach nur in die Box in der rechten oberen Ecke.
+Jeder kann darin stöbern. Alles was man braucht ist ein Web-Browser, der ein Minimum an HTML unterstützt. Um Seiten zu suchen, gehe auf die Seite [Suche|Search] oder tippe deine Anfrage einfach nur in die Box in der rechten oberen Ecke.
 
 !Inhalte
 

Modified: incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [Recent Changes]
 * [WikiEtiquette]
 
-* [Find pages|FindPage]
+* [Find pages|Search]
 * [Unused pages|UnusedPages]
 * [Undefined pages|UndefinedPages]
 * [Page Index]

Modified: incubator/jspwiki/trunk/src/wikipages/es/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/es/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/es/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/es/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [Cambios Recientes|Recent Changes]
 * [WikiEtiqueta|WikiEtiquette]
 
-* [Buscar páginas|FindPage]
+* [Buscar páginas|Search]
 * [Páginas sin usar|UnusedPages]
 * [Páginas sin definir|UndefinedPages]
 * [Índice|Page Index]

Modified: incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -3,7 +3,7 @@
 * [Derniers changements|RecentChanges]
 * [WikiEtiquette]
 
-* [Rechercher une page|FindPage]
+* [Rechercher une page|Search]
 * [Pages orphelines|UnusedPages]
 * [Pages non définies|UndefinedPages]
 * [Index des pages|PageIndex]

Modified: incubator/jspwiki/trunk/src/wikipages/it/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/it/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/it/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/it/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [Cambiamenti recenti | Recent Changes]
 * [WikiEtiquette]
 
-* [Trova le pagine|FindPage]
+* [Trova le pagine|Search]
 * [Pagine non usate|UnusedPages]
 * [Pagine non definite|UndefinedPages]
 * [Indice | Page Index]

Modified: incubator/jspwiki/trunk/src/wikipages/nl/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/nl/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/nl/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/nl/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [Recente Wijzigingen|Recent Changes]
 * [WikiEtiquette]
 
-* [Zoek pagina's|FindPage]
+* [Zoek pagina's|Search]
 * [Ongebruikte pagina's|UnusedPages]
 * [Ongedefinieerde pagina's|UndefinedPages]
 * [Pagina Index]

Modified: incubator/jspwiki/trunk/src/wikipages/pt_BR/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/pt_BR/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/pt_BR/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/pt_BR/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -6,7 +6,7 @@
 * [Recursos Humanos|RecursosHumanos]
 * [Tecnologia|Tecnologia]
 <hr>
-* [Encontrar Páginas|FindPage]
+* [Encontrar Páginas|Search]
 * [Páginas não usadas|UnusedPages]
 * [Páginas não definidas|UndefinedPages]
 * [Índice de Páginas|PageIndex]

Modified: incubator/jspwiki/trunk/src/wikipages/zh_CN/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/zh_CN/LeftMenu.txt?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/zh_CN/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/zh_CN/LeftMenu.txt Thu Sep 30 18:45:00 2010
@@ -4,7 +4,7 @@
 * [最近修改|Recent Changes]
 * [Wiki 礼仪|WikiEtiquette]
 
-* [查找页面|FindPage]
+* [查找页面|Search]
 * [未引用页面|UnusedPages]
 * [未定义页面|UndefinedPages]
 * [页面索引|PageIndex]

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.properties (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties Thu Sep 30 18:45:00 2010
@@ -53,7 +53,7 @@ jspwiki.authorizer=org.apache.wiki.TestA
 # jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
 #
 jspwiki.specialPage.RecentChanges = RecentChanges.jsp
-jspwiki.specialPage.FindPage = Search.jsp
+jspwiki.specialPage.Search = Search.jsp
 
 # InterWiki links The %s is replaced with the page reference (specify
 # multiple times to get multiple references).  Page references should

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java Thu Sep 30 18:45:00 2010
@@ -84,13 +84,13 @@ public class EditActionBeanTest extends 
 
     public void testEditSpecialPage() throws Exception
     {
-        // Make sure no special page FindPage actually exists
-        m_engine.deletePage( "FindPage" );
+        // Make sure no special page Search actually exists
+        m_engine.deletePage( "Search" );
 
         // Try editing the 'special page'
         MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
         String startTime = String.valueOf( System.currentTimeMillis() );
-        trip.addParameter( "page", "FindPage" );
+        trip.addParameter( "page", "Search" );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
         trip.addParameter( "wikiText", "This is the edited text" );
         trip.addParameter( "append", CryptoUtil.encrypt( "false" ) );

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java Thu Sep 30 18:45:00 2010
@@ -96,12 +96,12 @@ public class ViewActionBeanTest extends 
     }
     
     public void testSpecialPage() throws Exception {
-        // Make sure no special page FindPage actually exists
-        m_engine.deletePage( "FindPage" );
+        // Make sure no special page Search actually exists
+        m_engine.deletePage( "Search" );
         
         // Execute the request with a 'special page' reference
         MockRoundtrip trip = m_engine.guestTrip( "/Wiki.jsp");
-        trip.addParameter( "page","FindPage" );
+        trip.addParameter( "page","Search" );
         trip.execute("view");
 
         // ...we should get a dummy page for the 'page' property

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java Thu Sep 30 18:45:00 2010
@@ -145,11 +145,11 @@ public class WikiContextFactoryTest exte
         assertEquals( WikiContext.EDIT, context.getRequestContext() );
         assertEquals( page, context.getPage() );
         
-        // Passing a VIEW request with page=FindPage yields an ordinary page name, not a special page or JSP
+        // Passing a VIEW request with page=Search yields an ordinary page name, not a special page or JSP
         // FIXME: this won't work because WikiActionBeanResolver doesn't keep a cache of URLBindings 
         request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Wiki.jsp");
         request.setSession( session );
-        request.getParameterMap().put( "page", new String[]{"FindPage"} );
+        request.getParameterMap().put( "page", new String[]{"Search"} );
         context = resolver.newContext( request, response, WikiContext.VIEW );
         assertEquals( WikiContext.VIEW, context.getRequestContext() );
         

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java Thu Sep 30 18:45:00 2010
@@ -59,7 +59,7 @@ public class SpecialPageNameResolverTest
         uri = resolver.getSpecialPageURI( "RecentChanges" );
         assertEquals( "/RecentChanges.jsp", uri.toString() );
         
-        uri = resolver.getSpecialPageURI( "FindPage" );
+        uri = resolver.getSpecialPageURI( "Search" );
         assertEquals( "/Search.jsp", uri.toString() );
         
         // UserPrefs doesn't exist in our test properties

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1003200&r1=1003199&r2=1003200&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Thu Sep 30 18:45:00 2010
@@ -844,12 +844,12 @@ public class JSPWikiMarkupParserTest ext
 
     public void testParagraph2() throws Exception
     {
-        String src = "[WikiEtiquette]\r\n\r\n[Find page]";
+        String src = "[WikiEtiquette]\r\n\r\n[Search]";
 
         newPage( "WikiEtiquette" );
 
         assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>"+
-                      "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=FindPage\">Find page</a></p>", translate(src) );
+                      "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Search</a></p>", translate(src) );
     }
 
     public void testParagraph3() throws Exception
@@ -862,16 +862,16 @@ public class JSPWikiMarkupParserTest ext
 
     public void testParagraph4() throws Exception
     {
-        String src = "\r\n[Recent Changes]\\\\\r\n[WikiEtiquette]\r\n\r\n[Find pages|FindPage]\\\\\r\n[Unused pages|UnusedPages]";
+        String src = "\r\n[Recent Changes]\\\\\r\n[WikiEtiquette]\r\n\r\n[Find pages|Search]\\\\\r\n[Unused pages|UnusedPages]";
 
         newPage("WikiEtiquette");
         newPage("RecentChanges");
-        newPage("FindPage");
+        newPage("Search");
         newPage("UnusedPages");
 
         assertEquals( "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=RecentChanges\">Recent Changes</a><br />\n"+
                       "<a class=\"wikipage\" href=\"/Wiki.jsp?page=WikiEtiquette\">WikiEtiquette</a>\n</p>\n"+
-                      "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=FindPage\">Find pages</a><br />\n"+
+                      "<p><a class=\"wikipage\" href=\"/Wiki.jsp?page=Search\">Find pages</a><br />\n"+
                       "<a class=\"wikipage\" href=\"/Wiki.jsp?page=UnusedPages\">Unused pages</a></p>",
                       translate(src) );
     }