Author: gmazza
Date: Thu Jul 18 11:34:56 2013
New Revision: 1504435
URL: http://svn.apache.org/r1504435
Log:
Removed unused variable in GenericThrottle & 72 unused imports reported by
Sonar, also replaced now-dead link in LinkbackExtractorTest.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
roller/trunk/app/src/test/resources/roller-custom.properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.planet.business.updater;
-import org.apache.roller.planet.business.fetcher.FetcherException;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
@@ -42,8 +41,8 @@ public interface FeedUpdater {
* the data from the subscriptions source after fetching an updated
version
* of the subscription.
*
- * @param subscription The PlanetSubscription to be updated.
- * @throws FetcherException If there is an error updating the subscription.
+ * @param sub The PlanetSubscription to be updated.
+ * @throws org.apache.roller.planet.business.fetcher.FetcherException If
there is an error updating the subscription.
*/
public void updateSubscription(Subscription sub) throws UpdaterException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
Thu Jul 18 11:34:56 2013
@@ -18,12 +18,9 @@ package org.apache.roller.planet.util.ro
import java.util.Date;
-import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.feed.module.DCModule;
-import com.sun.syndication.feed.rss.Channel;
import com.sun.syndication.feed.rss.Item;
import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.feed.synd.impl.ConverterForRSS20;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
Thu Jul 18 11:34:56 2013
@@ -26,7 +26,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.MediaFileDirectory;
import org.apache.roller.weblogger.pojos.MediaFileFilter;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.util.RollerMessages;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
Thu Jul 18 11:34:56 2013
@@ -28,7 +28,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.util.RollerMessages;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
Thu Jul 18 11:34:56 2013
@@ -21,7 +21,6 @@ package org.apache.roller.weblogger.busi
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.jpa.JPAOAuthManagerImpl;
import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
Thu Jul 18 11:34:56 2013
@@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -61,8 +60,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.MediaFileType;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.apache.roller.weblogger.pojos.WeblogEntryTag;
import org.apache.roller.weblogger.util.RollerMessages;
import org.apache.roller.weblogger.util.Utilities;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
Thu Jul 18 11:34:56 2013
@@ -24,9 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
-import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.runnable.ScheduledEntriesTask;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
Thu Jul 18 11:34:56 2013
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -28,7 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
Thu Jul 18 11:34:56 2013
@@ -20,7 +20,6 @@ package org.apache.roller.weblogger.busi
import java.util.Collection;
import java.util.Iterator;
-import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
Thu Jul 18 11:34:56 2013
@@ -20,7 +20,6 @@ package org.apache.roller.weblogger.busi
import java.io.BufferedReader;
import java.io.StringReader;
-import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.business.plugins.entry;
-import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
Thu Jul 18 11:34:56 2013
@@ -27,7 +27,6 @@ import java.io.UnsupportedEncodingExcept
import java.net.URLEncoder;
import java.text.FieldPosition;
import java.text.MessageFormat;
-import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
Thu Jul 18 11:34:56 2013
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.business.plugins.entry;
import java.util.Enumeration;
-import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WeblogEntryPlugin.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.business.plugins.entry;
-import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
Thu Jul 18 11:34:56 2013
@@ -18,8 +18,6 @@
package org.apache.roller.weblogger.pojos;
-import org.apache.roller.weblogger.business.BookmarkManager;
-
import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
Thu Jul 18 11:34:56 2013
@@ -53,7 +53,6 @@ import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.util.HTMLSanitizer;
import org.apache.roller.weblogger.util.Utilities;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
Thu Jul 18 11:34:56 2013
@@ -41,7 +41,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.startup.StartupException;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.planet.business.PlanetProvider;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManagerImpl;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
Thu Jul 18 11:34:56 2013
@@ -18,10 +18,6 @@
package org.apache.roller.weblogger.ui.core.plugins;
-import java.util.Locale;
-import org.apache.roller.weblogger.util.I18nMessages;
-
-
/**
* The default text editor. Basically just plain html textareas.
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.ui.rendering.model;
-import java.util.Locale;
import java.util.Map;
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
Thu Jul 18 11:34:56 2013
@@ -32,7 +32,6 @@ import org.apache.roller.weblogger.confi
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.business.URLStrategy;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.util.I18nMessages;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
Thu Jul 18 11:34:56 2013
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.apache.roller.weblogger.business.URLStrategy;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogFeedRequest;
import org.apache.roller.weblogger.util.I18nMessages;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
Thu Jul 18 11:34:56 2013
@@ -30,7 +30,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.ui.rendering.plugins.comments;
-import javax.servlet.http.HttpServletRequest;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.RollerMessages;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
Thu Jul 18 11:34:56 2013
@@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogEntry;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
Thu Jul 18 11:34:56 2013
@@ -18,13 +18,10 @@
package org.apache.roller.weblogger.ui.rendering.util;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
Thu Jul 18 11:34:56 2013
@@ -24,7 +24,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.Weblog;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java
Thu Jul 18 11:34:56 2013
@@ -18,10 +18,6 @@
package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
Thu Jul 18 11:34:56 2013
@@ -21,11 +21,8 @@ package org.apache.roller.weblogger.ui.r
import java.util.HashSet;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
Thu Jul 18 11:34:56 2013
@@ -18,17 +18,11 @@
package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.util.Utilities;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
Thu Jul 18 11:34:56 2013
@@ -31,7 +31,6 @@ import org.apache.roller.weblogger.confi
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
-import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.struts2.interceptor.validation.SkipValidation;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Thu Jul 18 11:34:56 2013
@@ -24,7 +24,6 @@ import java.sql.Connection;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetProvider;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.startup.StartupException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Thu Jul 18 11:34:56 2013
@@ -22,7 +22,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Thu Jul 18 11:34:56 2013
@@ -25,7 +25,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
Thu Jul 18 11:34:56 2013
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
Thu Jul 18 11:34:56 2013
@@ -18,15 +18,8 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.sql.Timestamp;
-import java.util.Date;
import org.apache.commons.lang.StringUtils;
-import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryManager;
-import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.util.DateUtil;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
Thu Jul 18 11:34:56 2013
@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletRes
// import org.apache.abdera.model.Feed;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.URLStrategy;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
Thu Jul 18 11:34:56 2013
@@ -80,7 +80,7 @@ public class GenericThrottle {
* then returns a boolean value indicating if the hit has pushed the client
* over the threshold.
*
- * @retuns true if client is abusive, false otherwise
+ * @return true if client is abusive, false otherwise
*/
public boolean processHit(String clientId) {
@@ -120,8 +120,7 @@ public class GenericThrottle {
// first timer
ClientInfo newClient = new ClientInfo();
newClient.hits = 1;
- newClient.id = clientId;
-
+
ExpiringCacheEntry newEntry = new ExpiringCacheEntry(newClient,
this.interval);
this.clientHistoryCache.put(clientId, newEntry);
}
@@ -169,7 +168,6 @@ public class GenericThrottle {
// just something to keep a few properties in
private class ClientInfo {
- public String id = null;
public int hits = 0;
public java.util.Date start = new java.util.Date();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
Thu Jul 18 11:34:56 2013
@@ -17,7 +17,6 @@
*/
package org.apache.roller.weblogger.util;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java
Thu Jul 18 11:34:56 2013
@@ -21,11 +21,8 @@ package org.apache.roller.weblogger.util
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import javax.mail.internet.ContentType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryManager;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java
Thu Jul 18 11:34:56 2013
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.util.cache;
import java.util.Map;
-import java.util.Set;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
Thu Jul 18 11:34:56 2013
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.util.cache;
-import java.util.Map;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java
Thu Jul 18 11:34:56 2013
@@ -25,9 +25,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.output.XMLOutputter;
-import org.jdom.output.Format;
import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
Thu Jul 18 11:34:56 2013
@@ -17,14 +17,12 @@
*/
package org.apache.roller.weblogger.webservices.adminprotocol;
-import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import org.jdom.Document;
-import org.jdom.JDOMException;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
Modified:
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
---
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
(original)
+++
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
Thu Jul 18 11:34:56 2013
@@ -57,8 +57,8 @@ public class LinkbackExtractorTest exten
{
// Second URL contains a link to the first
{
- "http://www.atomenabled.org";,
-
"http://rollerweblogger.org/roller/entry/wip_feed_based_integration";
+ "http://cassandra.apache.org/";,
+
"http://rollerweblogger.org/roller/entry/composite_keys_in_cassandra";
},
{
"http://rollermobile.blogspot.com/";,
@@ -67,7 +67,7 @@ public class LinkbackExtractorTest exten
};
LinkbackExtractor le = new
LinkbackExtractor(testrefs[0][0],testrefs[0][1]);
- assertEquals("AtomEnabled.org", le.getTitle());
+ assertEquals("The Apache Cassandra Project", le.getTitle());
le = new LinkbackExtractor(testrefs[1][0],testrefs[1][1]);
assertEquals("Apache Roller Mobile Platform", le.getTitle());
Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1504435&r1=1504434&r2=1504435&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Thu Jul 18
11:34:56 2013
@@ -1,4 +1,3 @@
-
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb
