jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r723267 - 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/login/ src/com/ecyrd/jspwiki/content/ src/com/ecyrd/jspw...
Date Thu, 04 Dec 2008 09:32:49 GMT
Author: jalkanen
Date: Thu Dec  4 01:32:42 2008
New Revision: 723267

URL: http://svn.apache.org/viewvc?rev=723267&view=rev
Log:
Moved FileUtil and TextUtil to the util-package
Moved QueryItem, SearchMatcher, SearchResult and SearchResultComparator to the search-package.

Added:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/QueryItem.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/QueryItem.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchMatcher.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResult.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResultComparator.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResultComparator.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/FileUtil.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/FileUtil.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/TextUtil.java
      - copied, changed from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/TextUtil.java
Removed:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/FileUtil.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/QueryItem.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchMatcher.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResult.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResultComparator.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/TextUtil.java
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/methods/GetMethod.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.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/Search.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.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/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/render/RenderingManager.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WikiRenderer.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Feed.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.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/tags/AuthorTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IncludeTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/MessagesTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserNameTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserProfileTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/VariableTag.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PlainEditorAdminBean.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TextUtilTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.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/search/SearchManagerTest.java
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/TextUtilTest.java
    incubator/jspwiki/trunk/tests/stress/MassiveRepositoryTest.java
    incubator/jspwiki/trunk/tests/stress/StressTestSpeed.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Dec  4 01:32:42 2008
@@ -10,6 +10,12 @@
         regexp library with Java built-in regexps for DenouncePlugin, as well
         as DenouncePluginTest.  Thanks!
 
+        * Moved FileUtil and TextUtil to com.ecyrd.jspwiki.util (where they
+        should've been in the first place)
+        
+        * Moved QueryItem, SearchMatcher, SearchResult and SearchResultComparator
+        to the search-package.
+
 2008-12-02  Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-21

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java Thu Dec  4 01:32:42 2008
@@ -44,6 +44,7 @@
 import com.ecyrd.jspwiki.providers.RepositoryModifiedException;
 import com.ecyrd.jspwiki.providers.WikiPageProvider;
 import com.ecyrd.jspwiki.util.ClassUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.jspwiki.util.WikiBackgroundThread;
 import com.ecyrd.jspwiki.workflow.Outcome;
 import com.ecyrd.jspwiki.workflow.Task;

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java Thu Dec  4 01:32:42 2008
@@ -30,6 +30,8 @@
 
 import org.apache.jspwiki.api.WikiException;
 
+import com.ecyrd.jspwiki.util.TextUtil;
+
 /**
  * Property Reader for the WikiEngine. Reads the properties for the WikiEngine
  * and implements the feature of cascading properties and variable substitution,

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ReferenceManager.java Thu Dec  4 01:32:42 2008
@@ -38,6 +38,7 @@
 import com.ecyrd.jspwiki.modules.InternalModule;
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.providers.WikiPageProvider;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /*
   BUGS

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Thu Dec  4 01:32:42 2008
@@ -73,6 +73,7 @@
 import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
 import com.ecyrd.jspwiki.url.URLConstructor;
 import com.ecyrd.jspwiki.util.ClassUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.jspwiki.util.WatchDog;
 import com.ecyrd.jspwiki.workflow.*;
 

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java Thu Dec  4 01:32:42 2008
@@ -26,6 +26,7 @@
 import com.ecyrd.jspwiki.ui.stripes.HandlerInfo;
 import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
 import com.ecyrd.jspwiki.url.StripesURLConstructor;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * <p>

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java Thu Dec  4 01:32:42 2008
@@ -61,6 +61,7 @@
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.ui.progress.ProgressItem;
 import com.ecyrd.jspwiki.util.HttpUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java Thu Dec  4 01:32:42 2008
@@ -38,7 +38,6 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiSession;
 import com.ecyrd.jspwiki.auth.authorize.Role;
@@ -47,6 +46,7 @@
 import com.ecyrd.jspwiki.event.WikiEventListener;
 import com.ecyrd.jspwiki.event.WikiEventManager;
 import com.ecyrd.jspwiki.event.WikiSecurityEvent;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.jspwiki.util.TimedCounterList;
 
 /**

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModule.java Thu Dec  4 01:32:42 2008
@@ -34,9 +34,9 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.auth.WikiPrincipal;
 import com.ecyrd.jspwiki.util.HttpUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java Thu Dec  4 01:32:42 2008
@@ -33,11 +33,11 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.FileUtil;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.auth.WikiPrincipal;
+import com.ecyrd.jspwiki.util.FileUtil;
 import com.ecyrd.jspwiki.util.HttpUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Logs in an user based on a cookie stored in the user's computer.  The cookie

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Thu Dec  4 01:32:42 2008
@@ -36,6 +36,7 @@
 import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides page renaming functionality.  Note that there used to be

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/methods/GetMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/methods/GetMethod.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/methods/GetMethod.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/methods/GetMethod.java Thu Dec  4 01:32:42 2008
@@ -26,10 +26,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.FileUtil;
 import com.ecyrd.jspwiki.dav.DavPath;
 import com.ecyrd.jspwiki.dav.DavProvider;
 import com.ecyrd.jspwiki.dav.items.DavItem;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ContextualDiffProvider.java Thu Dec  4 01:32:42 2008
@@ -31,9 +31,9 @@
 import org.apache.commons.jrcs.diff.myers.MyersDiff;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java Thu Dec  4 01:32:42 2008
@@ -29,6 +29,8 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.*;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java Thu Dec  4 01:32:42 2008
@@ -33,9 +33,9 @@
 import org.apache.commons.jrcs.diff.myers.MyersDiff;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.action.WikiContextFactory;

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java Thu Dec  4 01:32:42 2008
@@ -29,8 +29,8 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 
 /**

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java Thu Dec  4 01:32:42 2008
@@ -43,6 +43,8 @@
 import com.ecyrd.jspwiki.auth.user.UserProfile;
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.ui.EditorManager;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  This is Herb, the JSPWiki spamfilter that can also do choke modifications.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java Thu Dec  4 01:32:42 2008
@@ -27,9 +27,9 @@
 import org.apache.ecs.xhtml.input;
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.plugin.WikiPlugin;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Creates a simple input text field.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java Thu Dec  4 01:32:42 2008
@@ -28,7 +28,7 @@
 import org.apache.jspwiki.api.ModuleData;
 import org.jdom.Element;
 
-import com.ecyrd.jspwiki.FileUtil;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 /**
  *  A WikiModule describes whatever JSPWiki plugin there is: it can be a plugin,

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Thu Dec  4 01:32:42 2008
@@ -49,6 +49,7 @@
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.render.CleanTextRenderer;
 import com.ecyrd.jspwiki.render.RenderingManager;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Parses JSPWiki-style markup into a WikiDocument DOM tree.  This class is the

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Thu Dec  4 01:32:42 2008
@@ -37,6 +37,7 @@
 import com.ecyrd.jspwiki.preferences.Preferences;
 import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
 import com.ecyrd.jspwiki.render.RenderingManager;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  This is a base class for all plugins using referral things.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java Thu Dec  4 01:32:42 2008
@@ -24,8 +24,8 @@
 
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a page-specific counter, it is reset every time a page is rendered, so it is not usable as a hitcounter.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java Thu Dec  4 01:32:42 2008
@@ -29,9 +29,9 @@
 import org.apache.jspwiki.api.PluginException;
 import org.apache.oro.text.regex.*;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiProvider;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  The IfPlugin allows parts of a WikiPage to be executed conditionally.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java Thu Dec  4 01:32:42 2008
@@ -25,12 +25,12 @@
 import org.apache.jspwiki.api.ModuleData;
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.attachment.Attachment;
 import com.ecyrd.jspwiki.attachment.AttachmentManager;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides an image plugin for better control than is possible with a simple image inclusion.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java Thu Dec  4 01:32:42 2008
@@ -27,13 +27,13 @@
 
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 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;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Inserts page contents.  Muchos thanks to Scott Hurlbert for the initial code.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java Thu Dec  4 01:32:42 2008
@@ -26,9 +26,9 @@
 
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Outputs an image with the supplied text as the <tt>title</tt> which is shown as a tooltip by

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java Thu Dec  4 01:32:42 2008
@@ -40,6 +40,8 @@
 import com.ecyrd.jspwiki.modules.WikiModuleInfo;
 import com.ecyrd.jspwiki.parser.PluginContent;
 import com.ecyrd.jspwiki.util.ClassUtil;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Manages plugin classes.  There exists a single instance of PluginManager

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Thu Dec  4 01:32:42 2008
@@ -27,7 +27,6 @@
 import org.apache.ecs.xhtml.*;
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiPage;
@@ -37,6 +36,7 @@
 import com.ecyrd.jspwiki.log.LoggerFactory;
 import com.ecyrd.jspwiki.preferences.Preferences;
 import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Returns the Recent Changes in the wiki being a date-sorted list of page names.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Thu Dec  4 01:32:42 2008
@@ -28,6 +28,7 @@
 import com.ecyrd.jspwiki.*;
 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/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java Thu Dec  4 01:32:42 2008
@@ -28,11 +28,11 @@
 import org.apache.jspwiki.api.PluginException;
 
 import com.ecyrd.jspwiki.ReferenceManager;
-import com.ecyrd.jspwiki.TextUtil;
 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;
 
 /**
  *  Displays the pages referring to the current page.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java Thu Dec  4 01:32:42 2008
@@ -28,12 +28,12 @@
 import org.apache.ecs.xhtml.*;
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.SearchResult;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.search.SearchResult;
 
 /**
  *  The "Search" plugin allows you to access the JSPWiki search routines and show the displays in an array on your page. 

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java Thu Dec  4 01:32:42 2008
@@ -33,6 +33,7 @@
 import com.ecyrd.jspwiki.parser.Heading;
 import com.ecyrd.jspwiki.parser.HeadingListener;
 import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a table of contents. 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java Thu Dec  4 01:32:42 2008
@@ -28,8 +28,8 @@
 import org.apache.jspwiki.api.PluginException;
 
 import com.ecyrd.jspwiki.ReferenceManager;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Plugin for displaying pages that are not linked to in other pages.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java Thu Dec  4 01:32:42 2008
@@ -25,13 +25,13 @@
 
 import org.apache.jspwiki.api.PluginException;
 
-import com.ecyrd.jspwiki.TextUtil;
 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;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Creates a list of all weblog entries on a monthly basis.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Thu Dec  4 01:32:42 2008
@@ -38,6 +38,7 @@
 import com.ecyrd.jspwiki.preferences.Preferences;
 import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  <p>Builds a simple weblog.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java Thu Dec  4 01:32:42 2008
@@ -36,11 +36,11 @@
 
 import com.ecyrd.jspwiki.InternalWikiException;
 import com.ecyrd.jspwiki.PropertyReader;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.action.WikiContextFactory;
 import com.ecyrd.jspwiki.i18n.InternationalizationManager;
 import com.ecyrd.jspwiki.util.HttpUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Represents an object which is used to store user preferences.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java Thu Dec  4 01:32:42 2008
@@ -29,6 +29,12 @@
 import java.util.List;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.search.QueryItem;
+import com.ecyrd.jspwiki.search.SearchMatcher;
+import com.ecyrd.jspwiki.search.SearchResult;
+import com.ecyrd.jspwiki.search.SearchResultComparator;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.*;
 

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java Thu Dec  4 01:32:42 2008
@@ -41,6 +41,9 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.search.QueryItem;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.attachment.Attachment;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java Thu Dec  4 01:32:42 2008
@@ -30,6 +30,7 @@
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.attachment.Attachment;
 import com.ecyrd.jspwiki.attachment.AttachmentManager;
+import com.ecyrd.jspwiki.search.QueryItem;
 import com.ecyrd.jspwiki.util.ClassUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.CacheEntry;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java Thu Dec  4 01:32:42 2008
@@ -29,7 +29,9 @@
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.render.RenderingManager;
+import com.ecyrd.jspwiki.search.QueryItem;
 import com.ecyrd.jspwiki.util.ClassUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 import com.opensymphony.oscache.base.events.*;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java Thu Dec  4 01:32:42 2008
@@ -34,6 +34,9 @@
 import java.text.ParseException;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
+
 import org.apache.oro.text.regex.*;
 
 import com.ecyrd.jspwiki.*;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java Thu Dec  4 01:32:42 2008
@@ -29,6 +29,7 @@
 import java.util.List;
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 import com.ecyrd.jspwiki.*;
 

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiAttachmentProvider.java Thu Dec  4 01:32:42 2008
@@ -29,6 +29,7 @@
 
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.attachment.Attachment;
+import com.ecyrd.jspwiki.search.QueryItem;
 
 /**
  *  Defines an attachment provider - a class which is capable of saving

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/WikiPageProvider.java Thu Dec  4 01:32:42 2008
@@ -25,6 +25,7 @@
 import java.util.Date;
 
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.search.QueryItem;
 
 /**
  *  Each Wiki page provider should implement this interface.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java Thu Dec  4 01:32:42 2008
@@ -32,7 +32,6 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.event.WikiEvent;
@@ -44,6 +43,7 @@
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.parser.WikiDocument;
 import com.ecyrd.jspwiki.providers.CachingProvider;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WikiRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WikiRenderer.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WikiRenderer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WikiRenderer.java Thu Dec  4 01:32:42 2008
@@ -22,11 +22,11 @@
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.parser.WikiDocument;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides an interface to the basic rendering engine.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Feed.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Feed.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/Feed.java Thu Dec  4 01:32:42 2008
@@ -24,8 +24,8 @@
 
 import javax.servlet.ServletContext;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Represents an abstract feed.

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Thu Dec  4 01:32:42 2008
@@ -31,6 +31,7 @@
 import com.ecyrd.jspwiki.attachment.Attachment;
 import com.ecyrd.jspwiki.auth.permissions.PagePermission;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  The master class for generating different kinds of Feeds (including RSS1.0, 2.0 and Atom).

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java Thu Dec  4 01:32:42 2008
@@ -35,8 +35,8 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.FileUtil;
 import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.util.FileUtil;
 import com.ecyrd.jspwiki.util.WatchDog;
 import com.ecyrd.jspwiki.util.WikiBackgroundThread;
 

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java Thu Dec  4 01:32:42 2008
@@ -31,10 +31,6 @@
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
 import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.QueryItem;
-import com.ecyrd.jspwiki.SearchMatcher;
-import com.ecyrd.jspwiki.SearchResult;
-import com.ecyrd.jspwiki.SearchResultComparator;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiPage;
 import com.ecyrd.jspwiki.attachment.Attachment;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java Thu Dec  4 01:32:42 2008
@@ -53,9 +53,7 @@
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.providers.WikiPageProvider;
-import com.ecyrd.jspwiki.util.ClassUtil;
-import com.ecyrd.jspwiki.util.WatchDog;
-import com.ecyrd.jspwiki.util.WikiBackgroundThread;
+import com.ecyrd.jspwiki.util.*;
 
 /**
  *  Interface for the search providers that handle searching the Wiki

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/QueryItem.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/QueryItem.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/QueryItem.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/QueryItem.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/QueryItem.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/QueryItem.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/QueryItem.java Thu Dec  4 01:32:42 2008
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.search;
 
 /**
  *  This simple class just fulfils the role of a container

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java Thu Dec  4 01:32:42 2008
@@ -41,6 +41,7 @@
 import com.ecyrd.jspwiki.rpc.RPCCallable;
 import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
 import com.ecyrd.jspwiki.util.ClassUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Manages searching the Wiki.

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchMatcher.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchMatcher.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchMatcher.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchMatcher.java Thu Dec  4 01:32:42 2008
@@ -18,13 +18,16 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.search;
 
 
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.StringReader;
 
+import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.WikiPage;
+
 /**
  * SearchMatcher performs the task of matching a search query to a page's
  * contents. This utility class is isolated to simplify WikiPageProvider

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResult.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResult.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResult.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResult.java Thu Dec  4 01:32:42 2008
@@ -18,7 +18,9 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.search;
+
+import com.ecyrd.jspwiki.WikiPage;
 
 /**
  *  Defines a search result.

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResultComparator.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResultComparator.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResultComparator.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResultComparator.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResultComparator.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/SearchResultComparator.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchResultComparator.java Thu Dec  4 01:32:42 2008
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.search;
 
 import java.io.Serializable;
 import java.util.*;

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AuthorTag.java Thu Dec  4 01:32:42 2008
@@ -24,11 +24,11 @@
 
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiPage;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.i18n.InternationalizationManager;
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.parser.WikiDocument;
 import com.ecyrd.jspwiki.render.RenderingManager;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Writes the author name of the current page, including a link to that page,

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CalendarTag.java Thu Dec  4 01:32:42 2008
@@ -33,8 +33,8 @@
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiPage;
 import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 
 /**

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/FeedDiscoveryTag.java Thu Dec  4 01:32:42 2008
@@ -22,12 +22,12 @@
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.TextUtil;
 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;
 
 /**
  *  Outputs links to all the site feeds and APIs this Wiki/blog supports.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IncludeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IncludeTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IncludeTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IncludeTag.java Thu Dec  4 01:32:42 2008
@@ -24,8 +24,8 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.ServletException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Includes an another JSP page, making sure that we actually pass

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=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java Thu Dec  4 01:32:42 2008
@@ -34,6 +34,7 @@
 import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
 import com.ecyrd.jspwiki.parser.MarkupParser;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a generic link tag for all kinds of linking

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/MessagesTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/MessagesTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/MessagesTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/MessagesTag.java Thu Dec  4 01:32:42 2008
@@ -27,8 +27,8 @@
 import net.sourceforge.stripes.validation.ValidationError;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiSession;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Returns or clears the current messages associated with the user's wiki

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java Thu Dec  4 01:32:42 2008
@@ -28,8 +28,8 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.search.SearchResult;
 
-import com.ecyrd.jspwiki.SearchResult;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java Thu Dec  4 01:32:42 2008
@@ -24,7 +24,7 @@
 
 import javax.servlet.jsp.jstl.fmt.LocaleSupport;
 
-import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java Thu Dec  4 01:32:42 2008
@@ -22,7 +22,8 @@
 package com.ecyrd.jspwiki.tags;
 
 import javax.servlet.jsp.*;
-import com.ecyrd.jspwiki.TextUtil;
+
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Generates single tabbed page layout.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserNameTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserNameTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserNameTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserNameTag.java Thu Dec  4 01:32:42 2008
@@ -26,7 +26,7 @@
 
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Returns the current user name, or empty, if the user has not been

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserProfileTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserProfileTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserProfileTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/UserProfileTag.java Thu Dec  4 01:32:42 2008
@@ -28,7 +28,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiSession;
@@ -39,6 +38,7 @@
 import com.ecyrd.jspwiki.auth.authorize.Role;
 import com.ecyrd.jspwiki.auth.user.UserProfile;
 import com.ecyrd.jspwiki.i18n.InternationalizationManager;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/VariableTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/VariableTag.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/VariableTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/VariableTag.java Thu Dec  4 01:32:42 2008
@@ -24,9 +24,9 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.JspException;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.NoSuchVariableException;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Returns the value of an Wiki variable.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java Thu Dec  4 01:32:42 2008
@@ -29,6 +29,7 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.action.WikiActionBean;

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java Thu Dec  4 01:32:42 2008
@@ -39,6 +39,7 @@
 import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
 import com.ecyrd.jspwiki.providers.FileSystemProvider;
 import com.ecyrd.jspwiki.util.CommentedProperties;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Manages JSPWiki installation on behalf of <code>admin/Install.jsp</code>.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java Thu Dec  4 01:32:42 2008
@@ -29,11 +29,11 @@
 
 import org.slf4j.MDC;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.action.WikiActionBean;
 import com.ecyrd.jspwiki.event.*;
 import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.jspwiki.util.UtilJ2eeCompat;
 import com.ecyrd.jspwiki.util.WatchDog;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PlainEditorAdminBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PlainEditorAdminBean.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PlainEditorAdminBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PlainEditorAdminBean.java Thu Dec  4 01:32:42 2008
@@ -23,10 +23,10 @@
 import javax.management.NotCompliantMBeanException;
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.ui.admin.AdminBean;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.management.SimpleMBean;
 
 /**

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java Thu Dec  4 01:32:42 2008
@@ -31,9 +31,9 @@
 
 import org.apache.commons.lang.StringUtils;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Implements the default URL constructor using links directly to the

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java Thu Dec  4 01:32:42 2008
@@ -27,9 +27,9 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 import com.ecyrd.jspwiki.InternalWikiException;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiEngine;
 

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/CommentedProperties.java Thu Dec  4 01:32:42 2008
@@ -26,8 +26,6 @@
 import java.util.Properties;
 import java.util.Map.Entry;
 
-import com.ecyrd.jspwiki.FileUtil;
-import com.ecyrd.jspwiki.TextUtil;
 
 /**
  * Extends {@link java.util.Properties} by providing support for comment

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/FileUtil.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/FileUtil.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/FileUtil.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/FileUtil.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/FileUtil.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/FileUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/FileUtil.java Thu Dec  4 01:32:42 2008
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.util;
 
 import java.io.*;
 import java.nio.ByteBuffer;

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java Thu Dec  4 01:32:42 2008
@@ -34,7 +34,6 @@
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiEngine;
 
 /**

Copied: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/TextUtil.java (from r723261, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/TextUtil.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/TextUtil.java?p2=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/TextUtil.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/TextUtil.java&r1=723261&r2=723267&rev=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/TextUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/TextUtil.java Thu Dec  4 01:32:42 2008
@@ -18,13 +18,15 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 import java.util.Properties;
 import java.util.Random;
 
+import com.ecyrd.jspwiki.InternalWikiException;
+
 
 /**
  *  Contains a number of static utility methods.

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Thu Dec  4 01:32:42 2008
@@ -25,6 +25,8 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.util.TextUtil;
+
 import org.apache.xmlrpc.XmlRpcException;
 
 import com.ecyrd.jspwiki.*;

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java Thu Dec  4 01:32:42 2008
@@ -4,6 +4,8 @@
 import junit.framework.*;
 import java.io.*;
 
+import com.ecyrd.jspwiki.util.FileUtil;
+
 public class FileUtilTest extends TestCase
 {
     public FileUtilTest( String s )

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java Thu Dec  4 01:32:42 2008
@@ -31,6 +31,8 @@
 import com.ecyrd.jspwiki.providers.FileSystemProvider;
 import com.ecyrd.jspwiki.providers.ProviderException;
 import com.ecyrd.jspwiki.ui.WikiServletFilter;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  <p>Simple test engine that always assumes pages are found. The version of TestEngine that is part of JSPWiki 3.0

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TextUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TextUtilTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TextUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TextUtilTest.java Thu Dec  4 01:32:42 2008
@@ -4,6 +4,8 @@
 import junit.framework.*;
 import java.util.*;
 
+import com.ecyrd.jspwiki.util.TextUtil;
+
 public class TextUtilTest extends TestCase
 {
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java Thu Dec  4 01:32:42 2008
@@ -8,6 +8,8 @@
 import org.apache.jspwiki.api.WikiException;
 
 import com.ecyrd.jspwiki.providers.*;
+import com.ecyrd.jspwiki.util.FileUtil;
+import com.ecyrd.jspwiki.util.TextUtil;
 import com.ecyrd.jspwiki.attachment.*;
 
 public class WikiEngineTest extends TestCase

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Thu Dec  4 01:32:42 2008
@@ -9,10 +9,10 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.ecyrd.jspwiki.FileUtil;
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiPage;
 import com.ecyrd.jspwiki.providers.ProviderException;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 public class AttachmentManagerTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Thu Dec  4 01:32:42 2008
@@ -22,6 +22,7 @@
 import com.ecyrd.jspwiki.attachment.Attachment;
 import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
 import com.ecyrd.jspwiki.render.XHTMLRenderer;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 public class JSPWikiMarkupParserTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java Thu Dec  4 01:32:42 2008
@@ -7,6 +7,7 @@
 
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.attachment.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 public class BasicAttachmentProviderTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java Thu Dec  4 01:32:42 2008
@@ -10,6 +10,7 @@
 import java.util.*;
 
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 public class CachingProviderTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java Thu Dec  4 01:32:42 2008
@@ -24,6 +24,7 @@
 
 import com.ecyrd.jspwiki.log.Logger;
 import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.search.QueryItem;
 
 import com.ecyrd.jspwiki.*;
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java Thu Dec  4 01:32:42 2008
@@ -6,6 +6,7 @@
 import java.util.*;
 
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 public class FileSystemProviderTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Thu Dec  4 01:32:42 2008
@@ -5,6 +5,7 @@
 import java.io.*;
 import java.util.*;
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 /**
  *  Tests the RCSFileProvider.  If you are getting strange errors, please check that you

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Thu Dec  4 01:32:42 2008
@@ -6,6 +6,7 @@
 import java.util.*;
 
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 // FIXME: Should this thingy go directly to the VersioningFileProvider,
 //        or should it rely on the WikiEngine API?

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java Thu Dec  4 01:32:42 2008
@@ -2,6 +2,7 @@
 
 import java.util.*;
 import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.search.QueryItem;
 
 /**
  *  This is a simple provider that is used by some of the tests.  It has some

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java Thu Dec  4 01:32:42 2008
@@ -10,7 +10,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.ecyrd.jspwiki.SearchResult;
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiContext;
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/TextUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/TextUtilTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/TextUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/TextUtilTest.java Thu Dec  4 01:32:42 2008
@@ -1,6 +1,5 @@
 package com.ecyrd.jspwiki.util;
 
-import com.ecyrd.jspwiki.TextUtil;
 
 import junit.framework.*;
 

Modified: incubator/jspwiki/trunk/tests/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/stress/MassiveRepositoryTest.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/stress/MassiveRepositoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/stress/MassiveRepositoryTest.java Thu Dec  4 01:32:42 2008
@@ -7,10 +7,10 @@
 import junit.framework.TestCase;
 
 import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.TextUtil;
 import com.ecyrd.jspwiki.WikiProvider;
 import com.ecyrd.jspwiki.providers.CachingProvider;
 import com.ecyrd.jspwiki.providers.FileSystemProvider;
+import com.ecyrd.jspwiki.util.TextUtil;
 
 public class MassiveRepositoryTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/stress/StressTestSpeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/stress/StressTestSpeed.java?rev=723267&r1=723266&r2=723267&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/stress/StressTestSpeed.java (original)
+++ incubator/jspwiki/trunk/tests/stress/StressTestSpeed.java Thu Dec  4 01:32:42 2008
@@ -5,6 +5,7 @@
 import java.util.*;
 import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.providers.*;
+import com.ecyrd.jspwiki.util.FileUtil;
 
 public final class StressTestSpeed extends TestCase
 {



Mime
View raw message