jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1551055 - in /jspwiki/trunk/jspwiki-war/src/main: config/doc/2.10-API.txt java/org/apache/wiki/util/ClassUtil.java java/org/apache/wiki/util/XmlUtil.java
Date Sun, 15 Dec 2013 21:01:04 GMT
Author: juanpablo
Date: Sun Dec 15 21:01:04 2013
New Revision: 1551055

URL: http://svn.apache.org/r1551055
Log:
ClassUtils#MAPPINGS *must* be "ini/classmappings.xml", instead of "/ini/classmappings.xml"

XmlUtil: removed unused import

updated 2.10-API.txt

Modified:
    jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java

Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1551055&r1=1551054&r2=1551055&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Sun Dec 15 21:01:04 2013
@@ -59,7 +59,10 @@ api.plugin
     in 2.10 timeframe
 
 org.apache.wiki.LinkCollector
- -> moved to org.apache.wiki.util package    
+ -> moved to org.apache.wiki.util package
+
+org.apache.wiki.PageManager
+ -> getActiveLocks() returns List<PageLock> instead of List (internally it was returning
List<PageLock> anyway)
 
 org.apache.wiki.PageTimeComparator
  -> moved to org.apache.wiki.util.comparators package
@@ -149,6 +152,10 @@ org.apache.wiki.ui.admin.AdminBeanManage
  -> moved to new interface org.apache.wiki.ui.admin.DefaultAdminBeanManager
  -> new interface org.apache.wiki.api.engine.AdminBeanManager
  -> public static int getTypeFromString( String type ) not static anymore
+ 
+org.apache.wiki.util.MailUtil
+ -> sendMessage(WikiEngine, String, String, String) changed to sendMessage(Properties,
String, String, String) 
+ -> use WikiEngine.getWikiProperties() to pass the appropiate object
 
 org.apache.wiki.util.Watchable
  -> moved to org.apache.wiki package

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java?rev=1551055&r1=1551054&r2=1551055&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java Sun Dec 15
21:01:04 2013
@@ -52,7 +52,7 @@ public final class ClassUtil {
      *  The location of the classmappings.xml document. It will be searched for
      *  in the classpath.  It's value is "{@value}".
      */
-    public  static final String MAPPINGS = "/ini/classmappings.xml";
+    public  static final String MAPPINGS = "ini/classmappings.xml";
     
     private static Map<String, String> c_classMappings = new Hashtable<String, String>();
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java?rev=1551055&r1=1551054&r2=1551055&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java Sun Dec 15 21:01:04
2013
@@ -28,7 +28,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.jdom2.Document;



Mime
View raw message