jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1431063 - in /incubator/jspwiki/trunk/src/org/apache/wiki: attachment/ auth/ auth/login/ content/ diff/ filters/ forms/ parser/ plugin/ preferences/ providers/ render/ rpc/atom/ rss/ search/ tags/ ui/ ui/admin/beans/ url/ util/ xmlrpc/
Date Wed, 09 Jan 2013 20:57:09 GMT
Author: juanpablo
Date: Wed Jan  9 20:57:08 2013
New Revision: 1431063

URL: http://svn.apache.org/viewvc?rev=1431063&view=rev
Log:
* org.apache.wiki.TextUtil moved to org.apache.wiki.util.TextUtil. Original class marked 
   with @Deprecated and forwarding to the new one until 2.10

Modified:
    incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
    incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/filters/ProfanityFilter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
    incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/UnusedPagesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/preferences/Preferences.java
    incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/providers/BasicAttachmentProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingAttachmentProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/render/WikiRenderer.java
    incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java
    incubator/jspwiki/trunk/src/org/apache/wiki/rss/Feed.java
    incubator/jspwiki/trunk/src/org/apache/wiki/rss/RSSGenerator.java
    incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/search/SearchManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/CalendarTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/FeedDiscoveryTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/IncludeTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/LinkTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/MessagesTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/SetPaginationTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/TabTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/VariableTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/WikiTagBase.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/AbstractCommand.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/CommandResolver.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/Installer.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/WikiJSPFilter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
    incubator/jspwiki/trunk/src/org/apache/wiki/url/DefaultURLConstructor.java
    incubator/jspwiki/trunk/src/org/apache/wiki/url/ShortURLConstructor.java
    incubator/jspwiki/trunk/src/org/apache/wiki/util/CommentedProperties.java
    incubator/jspwiki/trunk/src/org/apache/wiki/util/MailUtil.java
    incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/xmlrpc/RPCHandler.java

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java Wed Jan  9 20:57:08 2013
@@ -51,6 +51,7 @@ import org.apache.wiki.i18n.Internationa
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.ui.progress.ProgressItem;
 import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java Wed Jan  9 20:57:08 2013
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
 import org.apache.wiki.api.exceptions.WikiException;
@@ -43,6 +42,7 @@ import org.apache.wiki.auth.login.*;
 import org.apache.wiki.event.WikiEventListener;
 import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiSecurityEvent;
+import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.TimedCounterList;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java Wed Jan  9 20:57:08 2013
@@ -29,7 +29,10 @@ import javax.mail.internet.AddressExcept
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
 import org.apache.wiki.api.engine.FilterManager;
 import org.apache.wiki.api.exceptions.WikiException;
 import org.apache.wiki.api.filters.PageFilter;
@@ -49,6 +52,7 @@ import org.apache.wiki.rpc.json.JSONRPCM
 import org.apache.wiki.ui.InputValidator;
 import org.apache.wiki.util.ClassUtil;
 import org.apache.wiki.util.MailUtil;
+import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.workflow.*;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAssertionLoginModule.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAssertionLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAssertionLoginModule.java Wed Jan  9 20:57:08 2013
@@ -30,10 +30,9 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.auth.WikiPrincipal;
 import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java Wed Jan  9 20:57:08 2013
@@ -29,11 +29,11 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.auth.WikiPrincipal;
 import org.apache.wiki.util.FileUtil;
 import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Logs in an user based on a cookie stored in the user's computer.  The cookie

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java Wed Jan  9 20:57:08 2013
@@ -25,8 +25,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-
-import org.apache.wiki.*;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.WikiException;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.event.WikiEventManager;
@@ -34,6 +36,7 @@ import org.apache.wiki.event.WikiPageRen
 import org.apache.wiki.parser.JSPWikiMarkupParser;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides page renaming functionality.  Note that there used to be

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java Wed Jan  9 20:57:08 2013
@@ -27,9 +27,9 @@ import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.util.TextUtil;
 import org.suigeneris.jrcs.diff.Diff;
 import org.suigeneris.jrcs.diff.DifferentiationFailedException;
 import org.suigeneris.jrcs.diff.Revision;
@@ -37,6 +37,7 @@ import org.suigeneris.jrcs.diff.Revision
 import org.suigeneris.jrcs.diff.delta.*;
 import org.suigeneris.jrcs.diff.myers.MyersDiff;
 
+
 /**
  * A seriously better diff provider, which highlights changes word-by-word using
  * CSS.
@@ -44,7 +45,6 @@ import org.suigeneris.jrcs.diff.myers.My
  * Suggested by John Volkar.
  *
  */
-
 public class ContextualDiffProvider implements DiffProvider
 {
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java Wed Jan  9 20:57:08 2013
@@ -27,10 +27,10 @@ import java.util.Properties;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * This DiffProvider allows external command line tools to be used to generate

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java Wed Jan  9 20:57:08 2013
@@ -29,10 +29,10 @@ import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.NoRequiredPropertyException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.util.TextUtil;
 import org.suigeneris.jrcs.diff.Diff;
 import org.suigeneris.jrcs.diff.DifferentiationFailedException;
 import org.suigeneris.jrcs.diff.Revision;
@@ -48,7 +48,6 @@ import org.suigeneris.jrcs.diff.myers.My
  * This is the JSPWiki 'traditional' diff.  It uses an internal diff engine.
  * 
  */
-
 public class TraditionalDiffProvider implements DiffProvider
 {
     private static final Logger log = Logger.getLogger(TraditionalDiffProvider.class);

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/ProfanityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/ProfanityFilter.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/ProfanityFilter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/ProfanityFilter.java Wed Jan  9 20:57:08 2013
@@ -27,9 +27,9 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.filters.BasicPageFilter;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  This class is an example of how to have a simple filter.  It removes

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java Wed Jan  9 20:57:08 2013
@@ -38,6 +38,7 @@ import org.apache.wiki.auth.user.UserPro
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.ui.EditorManager;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 import org.suigeneris.jrcs.diff.Diff;
 import org.suigeneris.jrcs.diff.DifferentiationFailedException;
 import org.suigeneris.jrcs.diff.Revision;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java Wed Jan  9 20:57:08 2013
@@ -23,10 +23,10 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.ecs.xhtml.input;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Creates a simple input text field.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java Wed Jan  9 20:57:08 2013
@@ -43,6 +43,7 @@ import org.apache.wiki.i18n.Internationa
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.render.CleanTextRenderer;
 import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.util.TextUtil;
 import org.jdom.*;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java Wed Jan  9 20:57:08 2013
@@ -29,7 +29,10 @@ import org.apache.commons.lang.StringUti
 import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
-import org.apache.wiki.*;
+import org.apache.wiki.StringTransmutator;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.MarkupParser;
@@ -38,6 +41,7 @@ import org.apache.wiki.preferences.Prefe
 import org.apache.wiki.preferences.Preferences.TimeFormat;
 import org.apache.wiki.render.RenderingManager;
 import org.apache.wiki.util.PageSorter;
+import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.comparators.CollatorComparator;
 import org.apache.wiki.util.comparators.HumanComparator;
 import org.apache.wiki.util.comparators.JavaNaturalComparator;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java Wed Jan  9 20:57:08 2013
@@ -20,10 +20,10 @@ package org.apache.wiki.plugin;
 
 import java.util.Map;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.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/org/apache/wiki/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java Wed Jan  9 20:57:08 2013
@@ -28,7 +28,6 @@ import org.apache.ecs.xhtml.*;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.engine.PluginManager;
@@ -41,6 +40,7 @@ import org.apache.wiki.modules.WikiModul
 import org.apache.wiki.parser.PluginContent;
 import org.apache.wiki.util.ClassUtil;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java Wed Jan  9 20:57:08 2013
@@ -24,11 +24,11 @@ import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.oro.text.regex.*;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiProvider;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  The IfPlugin allows parts of a WikiPage to be executed conditionally, and is intended as a flexible way

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java Wed Jan  9 20:57:08 2013
@@ -20,7 +20,6 @@ package org.apache.wiki.plugin;
 
 import java.util.Map;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.PluginException;
@@ -28,6 +27,7 @@ import org.apache.wiki.api.plugin.WikiPl
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides an image plugin for better control than is possible with a simple image inclusion.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java Wed Jan  9 20:57:08 2013
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
@@ -31,6 +30,7 @@ import org.apache.wiki.api.plugin.WikiPl
 import org.apache.wiki.auth.AuthorizationManager;
 import org.apache.wiki.auth.permissions.PermissionFactory;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Inserts page contents.  Muchos thanks to Scott Hurlbert for the initial code.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java Wed Jan  9 20:57:08 2013
@@ -22,11 +22,11 @@ package org.apache.wiki.plugin;
 
 import java.util.Map;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.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/org/apache/wiki/plugin/PageViewPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java Wed Jan  9 20:57:08 2013
@@ -27,11 +27,15 @@ import org.apache.commons.lang.StringUti
 import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
-import org.apache.wiki.*;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.InitializablePlugin;
 import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.event.*;
+import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.WikiBackgroundThread;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java Wed Jan  9 20:57:08 2013
@@ -24,7 +24,6 @@ import java.util.*;
 
 import org.apache.ecs.xhtml.*;
 import org.apache.log4j.Logger;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
@@ -34,6 +33,7 @@ import org.apache.wiki.attachment.Attach
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.preferences.Preferences;
 import org.apache.wiki.preferences.Preferences.TimeFormat;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Returns the Recent Changes in the wiki being a date-sorted list of page names.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java Wed Jan  9 20:57:08 2013
@@ -22,9 +22,13 @@ import java.util.*;
 
 import org.apache.log4j.Logger;
 import org.apache.oro.text.regex.*;
-import org.apache.wiki.*;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java Wed Jan  9 20:57:08 2013
@@ -25,11 +25,11 @@ import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.ReferenceManager;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Displays the pages referring to the current page.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java Wed Jan  9 20:57:08 2013
@@ -24,13 +24,17 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.engine.FilterManager;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.Heading;
 import org.apache.wiki.parser.HeadingListener;
 import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides a table of contents. 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/UnusedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/UnusedPagesPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/UnusedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/UnusedPagesPlugin.java Wed Jan  9 20:57:08 2013
@@ -23,9 +23,9 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.wiki.ReferenceManager;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * Plugin for displaying pages that are not linked to in other pages.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java Wed Jan  9 20:57:08 2013
@@ -22,13 +22,13 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Creates a list of all weblog entries on a monthly basis.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java Wed Jan  9 20:57:08 2013
@@ -36,6 +36,7 @@ import org.apache.wiki.parser.PluginCont
 import org.apache.wiki.preferences.Preferences;
 import org.apache.wiki.preferences.Preferences.TimeFormat;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  <p>Builds a simple weblog.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/preferences/Preferences.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/preferences/Preferences.java Wed Jan  9 20:57:08 2013
@@ -33,10 +33,10 @@ import org.json.JSONObject;
 
 import org.apache.wiki.InternalWikiException;
 import org.apache.wiki.PropertyReader;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Represents an object which is used to store user preferences.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java Wed Jan  9 20:57:08 2013
@@ -24,6 +24,7 @@ import java.util.*;
 import org.apache.log4j.Logger;
 import org.apache.wiki.*;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides a simple directory based repository for Wiki pages.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/BasicAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/BasicAttachmentProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/BasicAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/BasicAttachmentProvider.java Wed Jan  9 20:57:08 2013
@@ -27,6 +27,7 @@ import org.apache.log4j.Logger;
 import org.apache.wiki.*;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides basic, versioning attachments.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingAttachmentProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingAttachmentProvider.java Wed Jan  9 20:57:08 2013
@@ -23,11 +23,12 @@ import java.io.InputStream;
 import java.util.*;
 
 import org.apache.log4j.Logger;
-
 import org.apache.wiki.*;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
+
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.CacheEntry;
 import com.opensymphony.oscache.base.NeedsRefreshException;
@@ -46,7 +47,6 @@ import com.opensymphony.oscache.base.eve
 // FIXME: We probably clear the cache a bit too aggressively in places.
 // FIXME: Does not yet react well to external cache changes.  Should really use custom
 //        EntryRefreshPolicy for that.
-
 public class CachingAttachmentProvider
     implements WikiAttachmentProvider
 {

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/CachingProvider.java Wed Jan  9 20:57:08 2013
@@ -22,11 +22,12 @@ import java.io.IOException;
 import java.util.*;
 
 import org.apache.log4j.Logger;
-
 import org.apache.wiki.*;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.render.RenderingManager;
 import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.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/org/apache/wiki/providers/RCSFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java Wed Jan  9 20:57:08 2013
@@ -27,6 +27,7 @@ import org.apache.log4j.Logger;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  This class implements a simple RCS file provider.  NOTE: You MUST

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java Wed Jan  9 20:57:08 2013
@@ -27,7 +27,6 @@ import java.util.Properties;
 
 import org.apache.log4j.Logger;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.WikiException;
@@ -40,6 +39,7 @@ import org.apache.wiki.parser.JSPWikiMar
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.parser.WikiDocument;
 import org.apache.wiki.providers.CachingProvider;
+import org.apache.wiki.util.TextUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/render/WikiRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/render/WikiRenderer.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/render/WikiRenderer.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/render/WikiRenderer.java Wed Jan  9 20:57:08 2013
@@ -20,11 +20,11 @@ package org.apache.wiki.render;
 
 import java.io.IOException;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides an interface to the basic rendering engine.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java Wed Jan  9 20:57:08 2013
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
@@ -39,6 +38,7 @@ import org.apache.wiki.plugin.WeblogEntr
 import org.apache.wiki.plugin.WeblogPlugin;
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.util.BlogUtil;
+import org.apache.wiki.util.TextUtil;
 import org.intabulas.sandler.Sandler;
 import org.intabulas.sandler.SyndicationFactory;
 import org.intabulas.sandler.elements.*;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/rss/Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/rss/Feed.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/rss/Feed.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/rss/Feed.java Wed Jan  9 20:57:08 2013
@@ -22,8 +22,8 @@ import java.util.*;
 
 import javax.servlet.ServletContext;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Represents an abstract feed.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/rss/RSSGenerator.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/rss/RSSGenerator.java Wed Jan  9 20:57:08 2013
@@ -21,11 +21,11 @@ package org.apache.wiki.rss;
 import java.util.*;
 
 import org.apache.log4j.Logger;
-
 import org.apache.wiki.*;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.auth.permissions.PagePermission;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  The master class for generating different kinds of Feeds (including RSS1.0, 2.0 and Atom).

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java Wed Jan  9 20:57:08 2013
@@ -48,10 +48,9 @@ import org.apache.wiki.attachment.Attach
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.providers.WikiPageProvider;
-import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.*;
 import org.apache.wiki.util.FileUtil;
-import org.apache.wiki.util.WatchDog;
-import org.apache.wiki.util.WikiBackgroundThread;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Interface for the search providers that handle searching the Wiki

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/search/SearchManager.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/search/SearchManager.java Wed Jan  9 20:57:08 2013
@@ -37,13 +37,13 @@ import org.apache.wiki.providers.Provide
 import org.apache.wiki.rpc.RPCCallable;
 import org.apache.wiki.rpc.json.JSONRPCManager;
 import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Manages searching the Wiki.
  *
  *  @since 2.2.21.
  */
-
 public class SearchManager
     extends BasicPageFilter
     implements InternalModule, WikiEventListener

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/AuthorTag.java Wed Jan  9 20:57:08 2013
@@ -22,11 +22,11 @@ import java.io.IOException;
 
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.parser.WikiDocument;
 import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Writes the author name of the current page, including a link to that page,

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/CalendarTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/CalendarTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/CalendarTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/CalendarTag.java Wed Jan  9 20:57:08 2013
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletReq
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/FeedDiscoveryTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/FeedDiscoveryTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/FeedDiscoveryTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/FeedDiscoveryTag.java Wed Jan  9 20:57:08 2013
@@ -20,12 +20,12 @@ package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.plugin.WeblogPlugin;
 import org.apache.wiki.util.BlogUtil;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Outputs links to all the site feeds and APIs this Wiki/blog supports.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/IncludeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/IncludeTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/IncludeTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/IncludeTag.java Wed Jan  9 20:57:08 2013
@@ -22,8 +22,8 @@ import java.io.IOException;
 import javax.servlet.jsp.JspException;
 import javax.servlet.ServletException;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Includes an another JSP page, making sure that we actually pass

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/LinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/LinkTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/LinkTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/LinkTag.java Wed Jan  9 20:57:08 2013
@@ -27,11 +27,15 @@ import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTag;
 
-import org.apache.wiki.*;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.parser.JSPWikiMarkupParser;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Provides a generic link tag for all kinds of linking

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/MessagesTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/MessagesTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/MessagesTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/MessagesTag.java Wed Jan  9 20:57:08 2013
@@ -20,8 +20,8 @@ package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiSession;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * Returns or clears the current messages associated with the user's wiki

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/SetPaginationTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/SetPaginationTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/SetPaginationTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/SetPaginationTag.java Wed Jan  9 20:57:08 2013
@@ -22,7 +22,7 @@ import java.io.IOException;
 
 import javax.servlet.jsp.jstl.fmt.LocaleSupport;
 
-import org.apache.wiki.TextUtil;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/TabTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/TabTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/TabTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/TabTag.java Wed Jan  9 20:57:08 2013
@@ -19,8 +19,9 @@
 
 package org.apache.wiki.tags;
 
-import javax.servlet.jsp.*;
-import org.apache.wiki.TextUtil;
+import javax.servlet.jsp.JspTagException;
+
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Generates single tabbed page layout.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserNameTag.java Wed Jan  9 20:57:08 2013
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletReq
 
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Returns the current user name, or empty, if the user has not been

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/UserProfileTag.java Wed Jan  9 20:57:08 2013
@@ -26,7 +26,6 @@ import java.util.ResourceBundle;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
@@ -37,6 +36,7 @@ import org.apache.wiki.auth.WikiSecurity
 import org.apache.wiki.auth.authorize.Role;
 import org.apache.wiki.auth.user.UserProfile;
 import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/VariableTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/VariableTag.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/VariableTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/VariableTag.java Wed Jan  9 20:57:08 2013
@@ -22,9 +22,9 @@ import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.JspException;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.NoSuchVariableException;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Returns the value of an Wiki variable.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/WikiTagBase.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/WikiTagBase.java Wed Jan  9 20:57:08 2013
@@ -25,8 +25,8 @@ import javax.servlet.jsp.tagext.TryCatch
 
 import org.apache.log4j.Logger;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Base class for JSPWiki tags.  You do not necessarily have
@@ -41,6 +41,8 @@ public abstract class WikiTagBase
     extends TagSupport
     implements TryCatchFinally
 {
+    private static final long serialVersionUID = -1409836349293777141L;
+
     public static final String ATTR_CONTEXT = "jspwiki.context";
 
     static    Logger    log = Logger.getLogger( WikiTagBase.class );

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/AbstractCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/AbstractCommand.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/AbstractCommand.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/AbstractCommand.java Wed Jan  9 20:57:08 2013
@@ -18,7 +18,7 @@
  */
 package org.apache.wiki.ui;
 
-import org.apache.wiki.TextUtil;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/CommandResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/CommandResolver.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/CommandResolver.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/CommandResolver.java Wed Jan  9 20:57:08 2013
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletReq
 import org.apache.log4j.Logger;
 
 import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.WikiProvider;
@@ -37,6 +36,7 @@ import org.apache.wiki.auth.GroupPrincip
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.url.URLConstructor;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * <p>Resolves special pages, JSPs and Commands on behalf of a

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/Installer.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/Installer.java Wed Jan  9 20:57:08 2013
@@ -27,7 +27,10 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wiki.*;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.PropertyReader;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
 import org.apache.wiki.auth.*;
 import org.apache.wiki.auth.authorize.Group;
 import org.apache.wiki.auth.authorize.GroupManager;
@@ -37,6 +40,7 @@ import org.apache.wiki.i18n.Internationa
 import org.apache.wiki.providers.BasicAttachmentProvider;
 import org.apache.wiki.providers.FileSystemProvider;
 import org.apache.wiki.util.CommentedProperties;
+import org.apache.wiki.util.TextUtil;
 
 /**
  * Manages JSPWiki installation on behalf of <code>admin/Install.jsp</code>.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/WikiJSPFilter.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/WikiJSPFilter.java Wed Jan  9 20:57:08 2013
@@ -27,12 +27,12 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.log4j.NDC;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiPageEvent;
 import org.apache.wiki.url.DefaultURLConstructor;
 import org.apache.wiki.util.UtilJ2eeCompat;
+import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.WatchDog;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java Wed Jan  9 20:57:08 2013
@@ -21,11 +21,11 @@ package org.apache.wiki.ui.admin.beans;
 import javax.management.NotCompliantMBeanException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.ui.admin.AdminBean;
 import org.apache.wiki.management.SimpleMBean;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  This class is still experimental.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/url/DefaultURLConstructor.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/url/DefaultURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/url/DefaultURLConstructor.java Wed Jan  9 20:57:08 2013
@@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletReq
 
 import org.apache.commons.lang.StringUtils;
 
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.ui.Command;
 import org.apache.wiki.ui.CommandResolver;
+import org.apache.wiki.util.TextUtil;
 
 /**
  *  Implements the default URL constructor using links directly to the

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/url/ShortURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/url/ShortURLConstructor.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/url/ShortURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/url/ShortURLConstructor.java Wed Jan  9 20:57:08 2013
@@ -26,9 +26,9 @@ import javax.servlet.http.HttpServletReq
 import org.apache.log4j.Logger;
 
 import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/CommentedProperties.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/CommentedProperties.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/CommentedProperties.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/CommentedProperties.java Wed Jan  9 20:57:08 2013
@@ -21,10 +21,8 @@ package org.apache.wiki.util;
 import java.io.*;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Map.Entry;
-
-import org.apache.wiki.TextUtil;
+import java.util.Properties;
 
 /**
  * Extends {@link java.util.Properties} by providing support for comment

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/MailUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/MailUtil.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/MailUtil.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/MailUtil.java Wed Jan  9 20:57:08 2013
@@ -30,8 +30,6 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.apache.log4j.Logger;
-
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java Wed Jan  9 20:57:08 2013
@@ -24,7 +24,6 @@ import java.util.*;
 
 import org.apache.commons.lang.SystemUtils;
 import org.apache.wiki.PageManager;
-import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.WikiException;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/xmlrpc/RPCHandler.java?rev=1431063&r1=1431062&r2=1431063&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/xmlrpc/RPCHandler.java Wed Jan  9 20:57:08 2013
@@ -22,12 +22,15 @@ import java.io.UnsupportedEncodingExcept
 import java.util.*;
 
 import org.apache.log4j.Logger;
-import org.apache.xmlrpc.XmlRpcException;
-
-import org.apache.wiki.*;
+import org.apache.wiki.LinkCollector;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.auth.permissions.PagePermission;
 import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.util.TextUtil;
+import org.apache.xmlrpc.XmlRpcException;
 
 /**
  *  Provides handlers for all RPC routines.
@@ -36,7 +39,6 @@ import org.apache.wiki.auth.permissions.
  */
 // We could use WikiEngine directly, but because of introspection it would
 // show just too many methods to be safe.
-
 public class RPCHandler
     extends AbstractRPCHandler
 {



Mime
View raw message