Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org Received: (qmail 46279 invoked from network); 21 Dec 2008 10:25:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Dec 2008 10:25:10 -0000 Received: (qmail 71171 invoked by uid 500); 21 Dec 2008 10:25:10 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 71159 invoked by uid 500); 21 Dec 2008 10:25:10 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 71150 invoked by uid 99); 21 Dec 2008 10:25:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Dec 2008 02:25:10 -0800 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; Sun, 21 Dec 2008 10:24:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30227238895D; Sun, 21 Dec 2008 02:24:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r728420 [1/2] - in /incubator/jspwiki/trunk: ./ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/action/ src/com/ecyrd/jspwiki/attachment/ src/com/ecyrd/jspwiki/auth/ src/com/ecyrd/jspwiki/auth/acl/ src/com/ecyrd/jspwiki/auth/permissions/ src/c... Date: Sun, 21 Dec 2008 10:24:31 -0000 To: jspwiki-commits@incubator.apache.org From: jalkanen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081221102437.30227238895D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jalkanen Date: Sun Dec 21 02:24:24 2008 New Revision: 728420 URL: http://svn.apache.org/viewvc?rev=728420&view=rev Log: Moved WikiPage to the api-package. Added: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiPage.java - copied, changed from r728413, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java Removed: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/JCRWikiPage.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageLock.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageTimeComparator.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/AbstractPageActionBean.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/Attachment.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/DavUtil.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/PageDavItem.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/WikiDocument.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/AtomFeed.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Entry.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS10Feed.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS20Feed.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchProvider.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckLockTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckVersionTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CommentLinkTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/DiffLinkTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditLinkTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/InsertPageTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToParentTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NextVersionTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NoSuchPageTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageDateTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageInfoLinkTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageNameTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageSizeTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageTypeTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageVersionTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ParentPageNameTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PermissionTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PreviousVersionTag.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/DefaultWikiContext.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerPermission.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiActionBeanContext.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiInterceptor.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiPageTypeConverter.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/HttpUtil.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java incubator/jspwiki/trunk/src/webdocs/Comment.jsp incubator/jspwiki/trunk/src/webdocs/Delete.jsp incubator/jspwiki/trunk/src/webdocs/Diff.jsp incubator/jspwiki/trunk/src/webdocs/Edit.jsp incubator/jspwiki/trunk/src/webdocs/Search.jsp incubator/jspwiki/trunk/src/webdocs/rss.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java incubator/jspwiki/trunk/tests/stress/StressTestRCSProvider.java incubator/jspwiki/trunk/tests/stress/StressTestVersioningProvider.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sun Dec 21 02:24:24 2008 @@ -1,3 +1,13 @@ +2008-12-21 Janne Jalkanen + + * 3.0.0-svn-38 + + * Second step in refactoring WikiPage: WikiPage is now a part + of the API package, and all internal methods are using that now. + + * This is the Winter Solstice build (only two more hours to go and + then things start going for the better again). + 2008-12-20 Harry Metske * 3.0.0-svn-37 Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/JCRWikiPage.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/JCRWikiPage.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/JCRWikiPage.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/JCRWikiPage.java Sun Dec 21 02:24:24 2008 @@ -20,10 +20,10 @@ */ package com.ecyrd.jspwiki; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; +import java.io.InputStream; +import java.util.*; + +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.auth.acl.Acl; import com.ecyrd.jspwiki.auth.acl.AclEntry; @@ -336,4 +336,46 @@ { return m_name.hashCode() * m_version; } + + public InputStream getContentAsStream() + { + // TODO Auto-generated method stub + return null; + } + + public String getContentAsString() + { + // TODO Auto-generated method stub + return null; + } + + public String getContentType() + { + // TODO Auto-generated method stub + return null; + } + + public Set getReferrers() + { + // TODO Auto-generated method stub + return null; + } + + public void setContent( String content ) + { + // TODO Auto-generated method stub + + } + + public void setContent( InputStream in ) + { + // TODO Auto-generated method stub + + } + + public void setContentType( String contentType ) + { + // TODO Auto-generated method stub + + } } Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageLock.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageLock.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageLock.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageLock.java Sun Dec 21 02:24:24 2008 @@ -23,6 +23,8 @@ import java.io.Serializable; import java.util.Date; +import org.apache.jspwiki.api.WikiPage; + /** * Describes a lock acquired by an user on a page. For the most part, * the regular developer does not have to instantiate this class. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java Sun Dec 21 02:24:24 2008 @@ -28,6 +28,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.jspwiki.api.FilterException; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.auth.WikiPrincipal; import com.ecyrd.jspwiki.auth.WikiSecurityException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageTimeComparator.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageTimeComparator.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageTimeComparator.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageTimeComparator.java Sun Dec 21 02:24:24 2008 @@ -22,6 +22,9 @@ import java.io.Serializable; import java.util.*; + +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,8 @@ import java.util.*; import org.apache.commons.lang.time.StopWatch; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Dec 21 02:24:24 2008 @@ -77,7 +77,7 @@ *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "37"; + public static final String BUILD = "38"; /** * This is the generic version string you should use Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java Sun Dec 21 02:24:24 2008 @@ -27,6 +27,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.action.*; import com.ecyrd.jspwiki.ui.stripes.HandlerInfo; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Sun Dec 21 02:24:24 2008 @@ -39,6 +39,7 @@ import org.apache.commons.lang.time.StopWatch; import org.apache.jspwiki.api.FilterException; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.action.WikiActionBean; import com.ecyrd.jspwiki.action.WikiContextFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/AbstractPageActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/AbstractPageActionBean.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/AbstractPageActionBean.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/AbstractPageActionBean.java Sun Dec 21 02:24:24 2008 @@ -1,8 +1,9 @@ package com.ecyrd.jspwiki.action; +import org.apache.jspwiki.api.WikiPage; + import net.sourceforge.stripes.validation.Validate; -import com.ecyrd.jspwiki.WikiPage; /** * Abstract WikiActionBean subclass used by all ActionBeans that use and process Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java Sun Dec 21 02:24:24 2008 @@ -3,6 +3,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.RedirectResolution; @@ -14,7 +15,6 @@ import net.sourceforge.stripes.validation.ValidationMethod; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.auth.permissions.PagePermission; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java Sun Dec 21 02:24:24 2008 @@ -6,9 +6,9 @@ import net.sourceforge.stripes.validation.ValidationErrors; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.auth.permissions.PagePermission; import com.ecyrd.jspwiki.content.ContentManager; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java Sun Dec 21 02:24:24 2008 @@ -19,6 +19,7 @@ import net.sourceforge.stripes.util.ResolverUtil; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.auth.SessionMonitor; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/Attachment.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/Attachment.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/Attachment.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/Attachment.java Sun Dec 21 02:24:24 2008 @@ -20,9 +20,10 @@ */ package com.ecyrd.jspwiki.attachment; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.JCRWikiPage; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; /** * Describes an attachment. Attachments are actually derivatives of Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java Sun Dec 21 02:24:24 2008 @@ -28,6 +28,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.content.WikiName; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java Sun Dec 21 02:24:24 2008 @@ -43,6 +43,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java Sun Dec 21 02:24:24 2008 @@ -33,12 +33,12 @@ import com.ecyrd.jspwiki.log.LoggerFactory; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import org.freshcookies.security.policy.LocalPolicy; import org.freshcookies.security.policy.PolicyException; import com.ecyrd.jspwiki.NoRequiredPropertyException; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.WikiSession; import com.ecyrd.jspwiki.auth.acl.Acl; import com.ecyrd.jspwiki.auth.acl.AclEntry; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/AclManager.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.util.Properties; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.auth.WikiSecurityException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/acl/DefaultAclManager.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java Sun Dec 21 02:24:24 2008 @@ -26,8 +26,8 @@ import java.util.Arrays; import org.apache.commons.lang.StringUtils; +import org.apache.jspwiki.api.WikiPage; -import com.ecyrd.jspwiki.WikiPage; /** *

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.util.WeakHashMap; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + /** * Provides a factory for Permission objects. Since the Permissions are immutable, Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Sun Dec 21 02:24:24 2008 @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java Sun Dec 21 02:24:24 2008 @@ -25,12 +25,13 @@ import java.util.Collections; import java.util.Iterator; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.dav.items.AttachmentItem; import com.ecyrd.jspwiki.dav.items.DavItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/DavUtil.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/DavUtil.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/DavUtil.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/DavUtil.java Sun Dec 21 02:24:24 2008 @@ -29,9 +29,9 @@ import org.apache.ecs.XhtmlDocument; import org.apache.ecs.xhtml.li; import org.apache.ecs.xhtml.ul; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; /** * Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java Sun Dec 21 02:24:24 2008 @@ -24,9 +24,10 @@ import java.util.Collection; import java.util.Iterator; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.dav.items.DavItem; import com.ecyrd.jspwiki.dav.items.DirectoryItem; import com.ecyrd.jspwiki.dav.items.HTMLPageDavItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java Sun Dec 21 02:24:24 2008 @@ -25,12 +25,13 @@ import java.util.Collections; import java.util.Iterator; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.dav.items.DavItem; import com.ecyrd.jspwiki.dav.items.DirectoryItem; import com.ecyrd.jspwiki.dav.items.PageDavItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/HTMLPageDavItem.java Sun Dec 21 02:24:24 2008 @@ -25,11 +25,11 @@ import java.io.UnsupportedEncodingException; import java.util.Collection; +import org.apache.jspwiki.api.WikiPage; import org.jdom.Element; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.dav.DavPath; import com.ecyrd.jspwiki.dav.DavProvider; import com.ecyrd.jspwiki.dav.WikiDavProvider; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/PageDavItem.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/PageDavItem.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/PageDavItem.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/PageDavItem.java Sun Dec 21 02:24:24 2008 @@ -27,10 +27,10 @@ import java.util.Collection; import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.jspwiki.api.WikiPage; import org.jdom.Element; import org.jdom.Namespace; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.dav.DavPath; import com.ecyrd.jspwiki.dav.DavProvider; import com.ecyrd.jspwiki.dav.WikiDavProvider; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java Sun Dec 21 02:24:24 2008 @@ -37,6 +37,8 @@ import org.apache.commons.jrcs.diff.myers.MyersDiff; import org.apache.commons.lang.time.StopWatch; import org.apache.jspwiki.api.ModuleData; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Sun Dec 21 02:24:24 2008 @@ -36,6 +36,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import org.jdom.*; import com.ecyrd.jspwiki.*; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/WikiDocument.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/WikiDocument.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/WikiDocument.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/WikiDocument.java Sun Dec 21 02:24:24 2008 @@ -22,10 +22,10 @@ import java.lang.ref.WeakReference; +import org.apache.jspwiki.api.WikiPage; import org.jdom.Document; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; /** * Stores the DOM tree of a rendered WikiPage. This class Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Sun Dec 21 02:24:24 2008 @@ -29,6 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java Sun Dec 21 02:24:24 2008 @@ -29,10 +29,10 @@ import org.apache.jspwiki.api.PluginException; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.content.WikiName; import com.ecyrd.jspwiki.filters.RedirectException; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java Sun Dec 21 02:24:24 2008 @@ -26,10 +26,10 @@ import java.util.ResourceBundle; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.auth.AuthorizationManager; import com.ecyrd.jspwiki.auth.permissions.PermissionFactory; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Sun Dec 21 02:24:24 2008 @@ -26,10 +26,10 @@ import org.apache.ecs.xhtml.*; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.i18n.InternationalizationManager; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Sun Dec 21 02:24:24 2008 @@ -25,6 +25,7 @@ import java.util.regex.PatternSyntaxException; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java Sun Dec 21 02:24:24 2008 @@ -26,10 +26,10 @@ import java.util.ResourceBundle; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.ReferenceManager; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.util.TextUtil; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,7 @@ import java.util.ResourceBundle; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java Sun Dec 21 02:24:24 2008 @@ -24,10 +24,10 @@ import java.util.*; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java Sun Dec 21 02:24:24 2008 @@ -24,6 +24,7 @@ import java.util.*; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.content.WikiName; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Sun Dec 21 02:24:24 2008 @@ -28,6 +28,7 @@ import java.util.regex.Pattern; import org.apache.jspwiki.api.PluginException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.auth.AuthorizationManager; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java Sun Dec 21 02:24:24 2008 @@ -23,6 +23,8 @@ import java.io.*; import java.util.*; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.content.WikiName; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java Sun Dec 21 02:24:24 2008 @@ -39,6 +39,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.search.QueryItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java Sun Dec 21 02:24:24 2008 @@ -24,6 +24,8 @@ import java.io.InputStream; import java.util.*; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java Sun Dec 21 02:24:24 2008 @@ -23,6 +23,8 @@ import java.io.IOException; import java.util.*; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java Sun Dec 21 02:24:24 2008 @@ -22,6 +22,9 @@ import java.io.*; import java.util.Properties; + +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java Sun Dec 21 02:24:24 2008 @@ -37,6 +37,8 @@ import java.text.SimpleDateFormat; import java.text.ParseException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.content.WikiName; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java Sun Dec 21 02:24:24 2008 @@ -28,6 +28,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.content.ContentManager; import com.ecyrd.jspwiki.content.WikiName; import com.ecyrd.jspwiki.log.Logger; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java Sun Dec 21 02:24:24 2008 @@ -27,6 +27,8 @@ import java.util.Date; import java.util.List; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.search.QueryItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java Sun Dec 21 02:24:24 2008 @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Date; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.search.QueryItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java Sun Dec 21 02:24:24 2008 @@ -36,6 +36,7 @@ import com.ecyrd.jspwiki.log.LoggerFactory; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import org.intabulas.sandler.*; import org.intabulas.sandler.exceptions.*; import org.intabulas.sandler.elements.*; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/AtomFeed.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/AtomFeed.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/AtomFeed.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/AtomFeed.java Sun Dec 21 02:24:24 2008 @@ -30,6 +30,7 @@ import javax.servlet.ServletContext; import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.jspwiki.api.WikiPage; import org.jdom.Element; import org.jdom.Namespace; import org.jdom.output.Format; @@ -38,7 +39,6 @@ import com.ecyrd.jspwiki.Release; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Entry.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Entry.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Entry.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Entry.java Sun Dec 21 02:24:24 2008 @@ -20,7 +20,7 @@ */ package com.ecyrd.jspwiki.rss; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; /** * Represents an entry, that is, an unit of change, in a Feed. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS10Feed.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS10Feed.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS10Feed.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS10Feed.java Sun Dec 21 02:24:24 2008 @@ -25,10 +25,10 @@ import java.util.Iterator; import org.apache.ecs.xml.XML; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; /** * Provides an implementation of an RSS 1.0 feed. In addition, this class is Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS20Feed.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS20Feed.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS20Feed.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSS20Feed.java Sun Dec 21 02:24:24 2008 @@ -27,6 +27,7 @@ import javax.servlet.ServletContext; +import org.apache.jspwiki.api.WikiPage; import org.jdom.Element; import org.jdom.output.Format; import org.jdom.output.XMLOutputter; @@ -34,7 +35,6 @@ import com.ecyrd.jspwiki.Release; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Sun Dec 21 02:24:24 2008 @@ -23,6 +23,7 @@ import java.util.*; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java Sun Dec 21 02:24:24 2008 @@ -27,12 +27,13 @@ import java.util.StringTokenizer; import java.util.TreeSet; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.NoRequiredPropertyException; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.providers.ProviderException; import com.ecyrd.jspwiki.providers.WikiPageProvider; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,8 @@ import org.apache.commons.lang.StringUtils; import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; + +import org.apache.jspwiki.api.WikiPage; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java Sun Dec 21 02:24:24 2008 @@ -26,6 +26,7 @@ import org.apache.commons.lang.time.StopWatch; import org.apache.jspwiki.api.FilterException; import org.apache.jspwiki.api.WikiException; +import org.apache.jspwiki.api.WikiPage; import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.event.WikiEvent; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java Sun Dec 21 02:24:24 2008 @@ -25,8 +25,9 @@ import java.io.IOException; import java.io.StringReader; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; /** * SearchMatcher performs the task of matching a search query to a page's Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchProvider.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchProvider.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchProvider.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchProvider.java Sun Dec 21 02:24:24 2008 @@ -23,7 +23,8 @@ import java.io.IOException; import java.util.Collection; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiProvider; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java Sun Dec 21 02:24:24 2008 @@ -20,7 +20,7 @@ */ package com.ecyrd.jspwiki.search; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; /** * Defines a search result. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java Sun Dec 21 02:24:24 2008 @@ -25,12 +25,13 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.WikiEngine; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; import com.ecyrd.jspwiki.attachment.AttachmentManager; import com.ecyrd.jspwiki.attachment.Attachment; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.i18n.InternationalizationManager; import com.ecyrd.jspwiki.parser.MarkupParser; import com.ecyrd.jspwiki.parser.WikiDocument; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java Sun Dec 21 02:24:24 2008 @@ -30,8 +30,9 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.http.HttpServletRequest; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.providers.ProviderException; import com.ecyrd.jspwiki.util.TextUtil; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckLockTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckLockTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckLockTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckLockTag.java Sun Dec 21 02:24:24 2008 @@ -23,13 +23,14 @@ import java.io.IOException; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.PageManager; import com.ecyrd.jspwiki.PageLock; import com.ecyrd.jspwiki.providers.ProviderException; import javax.servlet.http.HttpSession; +import org.apache.jspwiki.api.WikiPage; + /** * Checks whether the page is locked for editing. If the mode matches, * the tag body is included. The "mode" can be any of the following: Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckVersionTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckVersionTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckVersionTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CheckVersionTag.java Sun Dec 21 02:24:24 2008 @@ -22,9 +22,10 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.InternalWikiException; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CommentLinkTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CommentLinkTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CommentLinkTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CommentLinkTag.java Sun Dec 21 02:24:24 2008 @@ -24,9 +24,10 @@ import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.InternalWikiException; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; /** * Writes a comment link. Body of the link becomes the link text. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/DiffLinkTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/DiffLinkTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/DiffLinkTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/DiffLinkTag.java Sun Dec 21 02:24:24 2008 @@ -23,6 +23,8 @@ import java.io.IOException; import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.*; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditLinkTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditLinkTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditLinkTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditLinkTag.java Sun Dec 21 02:24:24 2008 @@ -23,9 +23,10 @@ import java.io.IOException; import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; /** * Writes an edit link. Body of the link becomes the link text. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java Sun Dec 21 02:24:24 2008 @@ -22,9 +22,10 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.plugin.WeblogPlugin; import com.ecyrd.jspwiki.util.BlogUtil; import com.ecyrd.jspwiki.util.TextUtil; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.AttachmentManager; import com.ecyrd.jspwiki.providers.ProviderException; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java Sun Dec 21 02:24:24 2008 @@ -25,12 +25,13 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.WikiEngine; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/InsertPageTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/InsertPageTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/InsertPageTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/InsertPageTag.java Sun Dec 21 02:24:24 2008 @@ -23,8 +23,9 @@ import java.io.IOException; import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java Sun Dec 21 02:24:24 2008 @@ -29,11 +29,12 @@ import javax.servlet.jsp.tagext.TryCatchFinally; import javax.servlet.jsp.PageContext; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.log.Logger; import com.ecyrd.jspwiki.log.LoggerFactory; import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.action.WikiContextFactory; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java Sun Dec 21 02:24:24 2008 @@ -29,6 +29,8 @@ import javax.servlet.jsp.tagext.BodyContent; import javax.servlet.jsp.tagext.BodyTag; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.*; import com.ecyrd.jspwiki.attachment.Attachment; import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToParentTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToParentTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToParentTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToParentTag.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.attachment.Attachment; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkToTag.java Sun Dec 21 02:24:24 2008 @@ -23,8 +23,9 @@ import java.io.IOException; import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NextVersionTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NextVersionTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NextVersionTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NextVersionTag.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + /** * Writes the version number of the next version of the page. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NoSuchPageTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NoSuchPageTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NoSuchPageTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/NoSuchPageTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageDateTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageDateTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageDateTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageDateTag.java Sun Dec 21 02:24:24 2008 @@ -24,7 +24,8 @@ import java.text.SimpleDateFormat; import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.preferences.Preferences; import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageInfoLinkTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageInfoLinkTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageInfoLinkTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageInfoLinkTag.java Sun Dec 21 02:24:24 2008 @@ -23,9 +23,10 @@ import java.io.IOException; import javax.servlet.jsp.JspWriter; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; /** * Writes a link to the Wiki PageInfo. Body of the link becomes the actual text. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageNameTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageNameTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageNameTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageNameTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageSizeTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageSizeTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageSizeTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageSizeTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageTypeTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageTypeTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageTypeTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageTypeTag.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.attachment.Attachment; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageVersionTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageVersionTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageVersionTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PageVersionTag.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + /** * Writes the version of the current page. If this is Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ParentPageNameTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ParentPageNameTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ParentPageNameTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ParentPageNameTag.java Sun Dec 21 02:24:24 2008 @@ -22,8 +22,9 @@ import java.io.IOException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.attachment.Attachment; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PermissionTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PermissionTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PermissionTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PermissionTag.java Sun Dec 21 02:24:24 2008 @@ -24,8 +24,8 @@ import java.security.Permission; import org.apache.commons.lang.StringUtils; +import org.apache.jspwiki.api.WikiPage; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.WikiProvider; import com.ecyrd.jspwiki.WikiSession; import com.ecyrd.jspwiki.action.GroupActionBean; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PreviousVersionTag.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PreviousVersionTag.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PreviousVersionTag.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PreviousVersionTag.java Sun Dec 21 02:24:24 2008 @@ -22,7 +22,8 @@ import java.io.IOException; -import com.ecyrd.jspwiki.WikiPage; +import org.apache.jspwiki.api.WikiPage; + /** * Outputs the version number of the previous version of this page. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java Sun Dec 21 02:24:24 2008 @@ -24,9 +24,10 @@ import javax.management.NotCompliantMBeanException; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.search.SearchManager; import com.ecyrd.jspwiki.ui.admin.SimpleAdminBean; import com.ecyrd.jspwiki.ui.progress.ProgressItem; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/DefaultWikiContext.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/DefaultWikiContext.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/DefaultWikiContext.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/DefaultWikiContext.java Sun Dec 21 02:24:24 2008 @@ -28,9 +28,10 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.jspwiki.api.WikiPage; + import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.WikiSession; import com.ecyrd.jspwiki.auth.WikiPrincipal; import com.ecyrd.jspwiki.auth.permissions.AllPermission; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerPermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerPermission.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerPermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerPermission.java Sun Dec 21 02:24:24 2008 @@ -39,7 +39,7 @@ * * *

These examples assume that the ActionBeans they annotate contain the appropriate properties; - * in this case, page is assumed to be a {@link com.ecyrd.jspwiki.WikiPage} property, + * in this case, page is assumed to be a {@link org.apache.jspwiki.api.WikiPage} property, * and context is assumed to be a {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext} * property.

*

This Annotation class does not parse, process or instantiate Permissions; it merely specifies Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiActionBeanContext.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiActionBeanContext.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiActionBeanContext.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiActionBeanContext.java Sun Dec 21 02:24:24 2008 @@ -7,11 +7,12 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import org.apache.jspwiki.api.WikiPage; + import net.sourceforge.stripes.action.ActionBeanContext; import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.WikiSession; /** Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiInterceptor.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiInterceptor.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiInterceptor.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiInterceptor.java Sun Dec 21 02:24:24 2008 @@ -48,7 +48,7 @@ * {@link com.ecyrd.jspwiki.WikiSession} *

  • wikiActionBean - the * {@link com.ecyrd.jspwiki.action.WikiActionBean} injected by Stripes
    • - *
  • wikiPage - the {@link com.ecyrd.jspwiki.WikiPage} + *
  • wikiPage - the {@link org.apache.jspwiki.api.WikiPage} * associated with the WikiActionBean, or the "front page" if the WikiActionBean * is not a WikiContext
    • * Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiPageTypeConverter.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiPageTypeConverter.java?rev=728420&r1=728419&r2=728420&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiPageTypeConverter.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/WikiPageTypeConverter.java Sun Dec 21 02:24:24 2008 @@ -17,6 +17,8 @@ import java.util.Collection; import java.util.Locale; +import org.apache.jspwiki.api.WikiPage; + import net.sourceforge.stripes.controller.StripesFilter; import net.sourceforge.stripes.validation.LocalizableError; import net.sourceforge.stripes.validation.SimpleError; @@ -24,12 +26,11 @@ import net.sourceforge.stripes.validation.ValidationError; import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; /** * Stripes type converter that converts a WikiPage name, expressed as a String, - * into an {@link com.ecyrd.jspwiki.WikiPage} object. This converter is looked + * into an {@link org.apache.jspwiki.api.WikiPage} object. This converter is looked * up and returned by the Stripes * {@link net.sourceforge.stripes.validation.TypeConverterFactory} for HTTP * request parameters that need to be bound to ActionBean properties of type @@ -53,7 +54,7 @@ * * @param pageName the name of the WikiPage to retrieve * @param targetType the type to return, which will always be of type - * {@link com.ecyrd.jspwiki.WikiPage} + * {@link org.apache.jspwiki.api.WikiPage} * @param errors the current Collection of validation errors for this field * @return the */