Return-Path: X-Original-To: apmail-jspwiki-commits-archive@www.apache.org Delivered-To: apmail-jspwiki-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23CD310A48 for ; Wed, 4 Dec 2013 00:04:47 +0000 (UTC) Received: (qmail 85184 invoked by uid 500); 4 Dec 2013 00:04:47 -0000 Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org Received: (qmail 85166 invoked by uid 500); 4 Dec 2013 00:04:47 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 85158 invoked by uid 99); 4 Dec 2013 00:04:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 00:04:47 +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; Wed, 04 Dec 2013 00:04:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CC39B23888A6; Wed, 4 Dec 2013 00:04:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547650 - in /jspwiki/trunk/jspwiki-war/src: main/config/doc/ main/java/org/apache/wiki/ main/java/org/apache/wiki/providers/ main/java/org/apache/wiki/search/ test/java/org/apache/wiki/providers/ Date: Wed, 04 Dec 2013 00:04:24 -0000 To: commits@jspwiki.apache.org From: juanpablo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131204000424.CC39B23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: juanpablo Date: Wed Dec 4 00:04:23 2013 New Revision: 1547650 URL: http://svn.apache.org/r1547650 Log: * org.apache.wiki.QueryItem moved to org.apache.wiki.search package (left behind when moving org.apache.wiki.Search* classes) Added: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java - copied, changed from r1546194, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/QueryItem.java Removed: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/QueryItem.java Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original) +++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Wed Dec 4 00:04:23 2013 @@ -58,7 +58,16 @@ api.plugin -> all classes / methods anotated with @Deprecated because of the API changes will be removed in 2.10 timeframe -org.apache.wiki.SearchResult, org.apache.wiki.SearchResultComparator and org.apache.wiki.SearchMatcher +org.apache.wiki.QueryItem + -> moved to org.apache.wiki.search package + +org.apache.wiki.SearchResult + -> moved to org.apache.wiki.search package + +org.apache.wiki.SearchResultComparator + -> moved to org.apache.wiki.search package + +org.apache.wiki.SearchMatcher -> moved to org.apache.wiki.search package org.apache.wiki.WikiContext Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java Wed Dec 4 00:04:23 2013 @@ -37,11 +37,11 @@ import java.util.TreeSet; import org.apache.log4j.Logger; import org.apache.wiki.InternalWikiException; -import org.apache.wiki.QueryItem; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; import org.apache.wiki.WikiProvider; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; +import org.apache.wiki.search.QueryItem; import org.apache.wiki.search.SearchMatcher; import org.apache.wiki.search.SearchResult; import org.apache.wiki.search.SearchResultComparator; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java Wed Dec 4 00:04:23 2013 @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import org.apache.wiki.*; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.search.QueryItem; import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java Wed Dec 4 00:04:23 2013 @@ -31,6 +31,7 @@ import org.apache.wiki.*; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.attachment.Attachment; import org.apache.wiki.attachment.AttachmentManager; +import org.apache.wiki.search.QueryItem; import org.apache.wiki.util.ClassUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java Wed Dec 4 00:04:23 2013 @@ -30,6 +30,7 @@ import org.apache.wiki.*; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.render.RenderingManager; +import org.apache.wiki.search.QueryItem; import org.apache.wiki.util.ClassUtil; import org.apache.wiki.util.TextUtil; Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java Wed Dec 4 00:04:23 2013 @@ -20,13 +20,13 @@ package org.apache.wiki.providers; import java.io.InputStream; import java.io.IOException; - import java.util.Collection; import java.util.Date; import java.util.List; import org.apache.wiki.*; import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.search.QueryItem; /** * Defines an attachment provider - a class which is capable of saving Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java Wed Dec 4 00:04:23 2013 @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.Date; import org.apache.wiki.*; +import org.apache.wiki.search.QueryItem; /** * Each Wiki page provider should implement this interface. Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java Wed Dec 4 00:04:23 2013 @@ -26,7 +26,6 @@ import java.util.StringTokenizer; import java.util.TreeSet; import org.apache.log4j.Logger; -import org.apache.wiki.QueryItem; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; Copied: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java (from r1546194, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/QueryItem.java) URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/QueryItem.java&r1=1546194&r2=1547650&rev=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/QueryItem.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java Wed Dec 4 00:04:23 2013 @@ -16,16 +16,15 @@ specific language governing permissions and limitations under the License. */ -package org.apache.wiki; +package org.apache.wiki.search; + /** - * This simple class just fulfils the role of a container - * for searches. It tells the word and whether it is requested or not. - * + * This simple class just fulfils the role of a container for searches. It tells the word and whether it is + * requested or not. */ -// FIXME3.0: This should be moved to the search-package, as well as properly rewritten as a bean. -public class QueryItem -{ +public class QueryItem { + /** The word is required to be in the pages */ public static final int REQUIRED = 1; @@ -39,7 +38,7 @@ public class QueryItem /** The word that is being searched */ public String word; - /** The type of the word. See above for types. The default - is REQUESTED. */ + /** The type of the word. See above for types. The default is REQUESTED. */ public int type = REQUESTED; + } Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java Wed Dec 4 00:04:23 2013 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.BufferedReader; import java.io.StringReader; -import org.apache.wiki.QueryItem; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java Wed Dec 4 00:04:23 2013 @@ -18,11 +18,16 @@ */ package org.apache.wiki.providers; -import java.util.*; - -import org.apache.log4j.*; - -import org.apache.wiki.*; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Properties; +import java.util.Vector; + +import org.apache.log4j.Logger; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.WikiPage; +import org.apache.wiki.search.QueryItem; /** * A provider who counts the hits to different parts. Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java?rev=1547650&r1=1547649&r2=1547650&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java Wed Dec 4 00:04:23 2013 @@ -18,8 +18,15 @@ */ package org.apache.wiki.providers; -import java.util.*; -import org.apache.wiki.*; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Properties; +import java.util.Vector; + +import org.apache.wiki.WikiEngine; +import org.apache.wiki.WikiPage; +import org.apache.wiki.search.QueryItem; /** * This is a simple provider that is used by some of the tests. It has some