jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1547936 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/ main/java/org/apache/wiki/parser/ main/java/org/apache/wiki/plugin/ main/java/org/apache/wiki/util/ main/java/org/apache/wiki/xmlrpc/ test/java/org/apache/wiki/parser/
Date Wed, 04 Dec 2013 22:29:19 GMT
Author: juanpablo
Date: Wed Dec  4 22:29:18 2013
New Revision: 1547936

URL: http://svn.apache.org/r1547936
Log:
 * o.a.w.LinkCollector and o.a.w.StringTransmutator moved to o.a.w.util, as the're more "utility"
classes rather than "core" or "base" classes

Added:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/LinkCollector.java
      - copied, changed from r1547609, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/StringTransmutator.java
      - copied, changed from r1547610, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java
Removed:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java
Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java Wed Dec  4 22:29:18
2013
@@ -84,7 +84,9 @@ import org.apache.wiki.ui.admin.AdminBea
 import org.apache.wiki.ui.progress.ProgressManager;
 import org.apache.wiki.url.URLConstructor;
 import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.LinkCollector;
 import org.apache.wiki.util.PageSorter;
+import org.apache.wiki.util.StringTransmutator;
 import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.WatchDog;
 import org.apache.wiki.util.comparators.PageTimeComparator;

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
Wed Dec  4 22:29:18 2013
@@ -50,7 +50,6 @@ import org.apache.oro.text.regex.Pattern
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
 import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.StringTransmutator;
 import org.apache.wiki.VariableManager;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
@@ -65,6 +64,7 @@ import org.apache.wiki.preferences.Prefe
 import org.apache.wiki.providers.ProviderException;
 import org.apache.wiki.render.CleanTextRenderer;
 import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.util.StringTransmutator;
 import org.apache.wiki.util.TextUtil;
 import org.jdom2.Attribute;
 import org.jdom2.Content;

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java Wed Dec
 4 22:29:18 2013
@@ -24,10 +24,9 @@ import java.io.PushbackReader;
 import java.io.Reader;
 import java.util.ArrayList;
 
-
-import org.apache.wiki.StringTransmutator;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.util.StringTransmutator;
 
 /**
  *   Provides an abstract class for the parser instances.

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
Wed Dec  4 22:29:18 2013
@@ -23,13 +23,20 @@ import java.text.Collator;
 import java.text.ParseException;
 import java.text.RuleBasedCollator;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
-import org.apache.oro.text.regex.*;
-import org.apache.wiki.StringTransmutator;
+import org.apache.oro.text.regex.MalformedPatternException;
+import org.apache.oro.text.regex.Pattern;
+import org.apache.oro.text.regex.PatternCompiler;
+import org.apache.oro.text.regex.PatternMatcher;
+import org.apache.oro.text.regex.Perl5Matcher;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
@@ -41,6 +48,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.StringTransmutator;
 import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.comparators.CollatorComparator;
 import org.apache.wiki.util.comparators.HumanComparator;

Copied: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/LinkCollector.java (from
r1547609, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/LinkCollector.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/LinkCollector.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java&r1=1547609&r2=1547936&rev=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/LinkCollector.java Wed Dec
 4 22:29:18 2013
@@ -16,11 +16,13 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package org.apache.wiki;
+package org.apache.wiki.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.wiki.WikiContext;
+
 
 /**
  *  Just a simple class collecting all of the links that come in.

Copied: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/StringTransmutator.java
(from r1547610, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/StringTransmutator.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/StringTransmutator.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java&r1=1547610&r2=1547936&rev=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/StringTransmutator.java Wed
Dec  4 22:29:18 2013
@@ -16,7 +16,9 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package org.apache.wiki;
+package org.apache.wiki.util;
+
+import org.apache.wiki.WikiContext;
 
 
 /**

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java Wed Dec
 4 22:29:18 2013
@@ -19,16 +19,21 @@
 package org.apache.wiki.xmlrpc;
 
 import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
 
 import org.apache.log4j.Logger;
-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.LinkCollector;
 import org.apache.wiki.util.TextUtil;
 import org.apache.xmlrpc.XmlRpcException;
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java Wed
Dec  4 22:29:18 2013
@@ -18,17 +18,21 @@
  */
 package org.apache.wiki.xmlrpc;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
 
-import org.apache.xmlrpc.XmlRpcException;
-
-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.LinkCollector;
+import org.apache.xmlrpc.XmlRpcException;
 
 /**
  *  Provides handlers for all RPC routines.  These routines are used by

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1547936&r1=1547935&r2=1547936&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
Wed Dec  4 22:29:18 2013
@@ -34,7 +34,6 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import net.sf.ehcache.CacheManager;
 
-import org.apache.wiki.LinkCollector;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
@@ -45,6 +44,7 @@ import org.apache.wiki.attachment.Attach
 import org.apache.wiki.providers.BasicAttachmentProvider;
 import org.apache.wiki.render.XHTMLRenderer;
 import org.apache.wiki.stress.Benchmark;
+import org.apache.wiki.util.LinkCollector;
 import org.apache.wiki.util.TextUtil;
 
 public class JSPWikiMarkupParserTest extends TestCase



Mime
View raw message