You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/04/12 20:14:59 UTC
svn commit: r764309 - in /incubator/jspwiki/trunk: ./ src/WebContent/
src/java/org/apache/wiki/ src/java/org/apache/wiki/action/
src/java/org/apache/wiki/content/ src/java/org/apache/wiki/content/lock/
src/java/org/apache/wiki/parser/ src/java/org/apac...
Author: jalkanen
Date: Sun Apr 12 18:14:58 2009
New Revision: 764309
URL: http://svn.apache.org/viewvc?rev=764309&view=rev
Log:
* Moved PageTimeComparator, PropertyReader and StringTransmutator
to the util package.
* Moved PageLock to org.apache.wiki.content.lock package.
Added:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java
- copied, changed from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java
- copied, changed from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java
- copied, changed from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/util/StringTransmutator.java
- copied, changed from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java
Removed:
incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/Comment.jsp
incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Apr 12 18:14:58 2009
@@ -1,3 +1,12 @@
+2009-04-12 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-100
+
+ * Moved PageTimeComparator, PropertyReader and StringTransmutator
+ to the util package.
+
+ * Moved PageLock to org.apache.wiki.content.lock package.
+
2009-04-10 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-99
Modified: incubator/jspwiki/trunk/src/WebContent/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Comment.jsp?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Comment.jsp Sun Apr 12 18:14:58 2009
@@ -1,6 +1,7 @@
<%@ page import="org.apache.wiki.log.Logger" %>
<%@ page import="org.apache.wiki.log.LoggerFactory" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.content.lock.PageLock" %>
<%@ page import="org.apache.wiki.filters.*" %>
<%@ page import="java.util.*" %>
<%@ page import="java.text.SimpleDateFormat" %>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java Sun Apr 12 18:14:58 2009
@@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.wiki.util.StringTransmutator;
+
/**
* Just a simple class collecting all of the links
* that come in.
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java Sun Apr 12 18:14:58 2009
@@ -30,6 +30,7 @@
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.modules.ModuleManager;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Apr 12 18:14:58 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "99";
+ public static final String BUILD = "100";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sun Apr 12 18:14:58 2009
@@ -76,9 +76,7 @@
import org.apache.wiki.ui.stripes.WikiActionBeanContext;
import org.apache.wiki.ui.stripes.WikiInterceptor;
import org.apache.wiki.url.URLConstructor;
-import org.apache.wiki.util.ClassUtil;
-import org.apache.wiki.util.TextUtil;
-import org.apache.wiki.util.WatchDog;
+import org.apache.wiki.util.*;
import org.apache.wiki.workflow.*;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Sun Apr 12 18:14:58 2009
@@ -40,6 +40,7 @@
import org.apache.wiki.auth.permissions.PagePermission;
import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageNotFoundException;
+import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.filters.RedirectException;
import org.apache.wiki.filters.SpamProtect;
import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java Sun Apr 12 18:14:58 2009
@@ -50,6 +50,7 @@
import org.apache.wiki.auth.acl.AclEntry;
import org.apache.wiki.auth.acl.AclEntryImpl;
import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.event.*;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java (from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java&p1=incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java&r1=764287&r2=764309&rev=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/lock/PageLock.java Sun Apr 12 18:14:58 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.content.lock;
import java.io.Serializable;
import java.util.Date;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java Sun Apr 12 18:14:58 2009
@@ -52,6 +52,7 @@
import org.apache.wiki.render.CleanTextRenderer;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.util.RegExpUtil;
+import org.apache.wiki.util.StringTransmutator;
import org.apache.wiki.util.TextUtil;
import org.jdom.*;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java Sun Apr 12 18:14:58 2009
@@ -26,9 +26,9 @@
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;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractFilteredPlugin.java Sun Apr 12 18:14:58 2009
@@ -28,7 +28,6 @@
import java.util.regex.PatternSyntaxException;
import org.apache.commons.lang.StringUtils;
-import org.apache.wiki.StringTransmutator;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.PluginException;
@@ -44,6 +43,7 @@
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.render.RenderingManager;
import org.apache.wiki.util.RegExpUtil;
+import org.apache.wiki.util.StringTransmutator;
import org.apache.wiki.util.TextUtil;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java Sun Apr 12 18:14:58 2009
@@ -25,10 +25,10 @@
import java.util.Map;
import java.util.ResourceBundle;
-import org.apache.wiki.PageLock;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.PluginException;
import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.lock.PageLock;
/**
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java Sun Apr 12 18:14:58 2009
@@ -23,7 +23,6 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.wiki.PageLock;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.PluginException;
@@ -31,6 +30,7 @@
import org.apache.wiki.content.ContentManager;
import org.apache.wiki.content.PageAlreadyExistsException;
import org.apache.wiki.content.WikiName;
+import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java Sun Apr 12 18:14:58 2009
@@ -31,13 +31,13 @@
import javax.servlet.jsp.PageContext;
import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.PropertyReader;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.ui.stripes.LocaleConverter;
+import org.apache.wiki.util.PropertyReader;
/**
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java Sun Apr 12 18:14:58 2009
@@ -33,6 +33,7 @@
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.PageTimeComparator;
import org.apache.wiki.util.TextUtil;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java Sun Apr 12 18:14:58 2009
@@ -24,10 +24,10 @@
import javax.servlet.http.HttpSession;
-import org.apache.wiki.PageLock;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.lock.PageLock;
import org.apache.wiki.providers.ProviderException;
/**
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java Sun Apr 12 18:14:58 2009
@@ -29,7 +29,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wiki.PropertyReader;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
import org.apache.wiki.auth.*;
@@ -40,6 +39,7 @@
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.providers.AbstractFileProvider;
import org.apache.wiki.util.CommentedProperties;
+import org.apache.wiki.util.PropertyReader;
import org.apache.wiki.util.TextUtil;
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java (from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java&p1=incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java&r1=764287&r2=764309&rev=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java Sun Apr 12 18:14:58 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.util;
import java.io.Serializable;
import java.util.*;
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java (from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java&p1=incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java&r1=764287&r2=764309&rev=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PropertyReader.java Sun Apr 12 18:14:58 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.util;
import java.io.File;
import java.io.FileInputStream;
@@ -28,8 +28,8 @@
import javax.servlet.ServletContext;
+import org.apache.wiki.Release;
import org.apache.wiki.api.WikiException;
-import org.apache.wiki.util.TextUtil;
/**
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/StringTransmutator.java (from r764287, incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/StringTransmutator.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/util/StringTransmutator.java&p1=incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java&r1=764287&r2=764309&rev=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/StringTransmutator.java Sun Apr 12 18:14:58 2009
@@ -18,7 +18,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.wiki;
+package org.apache.wiki.util;
+
+import org.apache.wiki.WikiContext;
/**
* Defines an interface for transforming strings within a Wiki context.
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java Sun Apr 12 18:14:58 2009
@@ -26,7 +26,6 @@
import javax.security.auth.login.LoginException;
-import org.apache.wiki.PageTimeComparator;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiPage;
@@ -43,6 +42,7 @@
import org.apache.wiki.plugin.WeblogEntryPlugin;
import org.apache.wiki.plugin.WeblogPlugin;
import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.PageTimeComparator;
import org.apache.xmlrpc.XmlRpcException;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java?rev=764309&r1=764308&r2=764309&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java Sun Apr 12 18:14:58 2009
@@ -22,7 +22,7 @@
import java.util.Properties;
-import org.apache.wiki.PropertyReader;
+import org.apache.wiki.util.PropertyReader;
import junit.framework.Test;
import junit.framework.TestCase;