roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r415888 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui: core/ rendering/filters/ rendering/servlets/ rendering/util/ rendering/velocity/deprecated/
Date Wed, 21 Jun 2006 03:28:17 GMT
Author: agilliland
Date: Tue Jun 20 20:28:16 2006
New Revision: 415888

URL: http://svn.apache.org/viewvc?rev=415888&view=rev
Log:
moving all the various parsed request util objects into ui.rendering.util since they are specific
to the rendering system.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/InvalidRequestException.java
      - copied, changed from r415884, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/InvalidRequestException.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java
      - copied, changed from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/ParsedRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java
      - copied, changed from r415885, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/PlanetRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java
      - copied, changed from r415882, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogFeedRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
      - copied, changed from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogPageRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
      - copied, changed from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogRequest.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/InvalidRequestException.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/ParsedRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/PlanetRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogFeedRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogPageRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogRequest.java
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java
Tue Jun 20 20:28:16 2006
@@ -33,7 +33,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.model.RollerFactory;
-import org.apache.roller.ui.core.PlanetRequest;
+import org.apache.roller.ui.rendering.util.PlanetRequest;
 import org.apache.roller.util.cache.ExpiringCacheEntry;
 
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java
Tue Jun 20 20:28:16 2006
@@ -48,7 +48,7 @@
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.PlanetRequest;
+import org.apache.roller.ui.rendering.util.PlanetRequest;
 import org.apache.roller.util.cache.Cache;
 import org.apache.roller.util.cache.CacheHandler;
 import org.apache.roller.util.cache.CacheManager;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
Tue Jun 20 20:28:16 2006
@@ -36,8 +36,8 @@
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.model.UserManager;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.InvalidRequestException;
-import org.apache.roller.ui.core.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.InvalidRequestException;
+import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.util.SpamChecker;
 
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
Tue Jun 20 20:28:16 2006
@@ -46,7 +46,7 @@
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.RollerContext;
-import org.apache.roller.ui.core.WeblogFeedRequest;
+import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
 import org.apache.roller.util.cache.CachedContent;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
Tue Jun 20 20:28:16 2006
@@ -44,10 +44,10 @@
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.rendering.util.InvalidRequestException;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.ui.core.RollerRequest;
-import org.apache.roller.ui.core.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.util.cache.CachedContent;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
Tue Jun 20 20:28:16 2006
@@ -38,7 +38,7 @@
 import org.apache.roller.pojos.Template;
 import org.apache.roller.pojos.Theme;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.rendering.util.InvalidRequestException;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.ui.core.RollerRequest;
 import org.apache.roller.ui.rendering.velocity.deprecated.ContextLoader;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
Tue Jun 20 20:28:16 2006
@@ -31,9 +31,9 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.model.UserManager;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.rendering.util.InvalidRequestException;
 import org.apache.roller.ui.core.RollerContext;
-import org.apache.roller.ui.core.WeblogRequest;
+import org.apache.roller.ui.rendering.util.WeblogRequest;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;
 import org.apache.roller.util.cache.CachedContent;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/InvalidRequestException.java
(from r415884, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/InvalidRequestException.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/InvalidRequestException.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/InvalidRequestException.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/InvalidRequestException.java&r1=415884&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/InvalidRequestException.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/InvalidRequestException.java
Tue Jun 20 20:28:16 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
 
 /**

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java
(from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/ParsedRequest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/ParsedRequest.java&r1=415883&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/ParsedRequest.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java
Tue Jun 20 20:28:16 2006
@@ -16,10 +16,11 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
 import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
+import org.apache.roller.ui.core.LanguageUtil;
 
 
 /**

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java
(from r415885, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/PlanetRequest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/PlanetRequest.java&r1=415885&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/PlanetRequest.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java
Tue Jun 20 20:28:16 2006
@@ -16,13 +16,11 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.ui.rendering.util.InvalidRequestException;
-import org.apache.roller.ui.rendering.util.ParsedRequest;
 
 
 /**

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java
(from r415882, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogFeedRequest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogFeedRequest.java&r1=415882&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogFeedRequest.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogFeedRequest.java
Tue Jun 20 20:28:16 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
(from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogPageRequest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogPageRequest.java&r1=415883&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogPageRequest.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
Tue Jun 20 20:28:16 2006
@@ -16,19 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
-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.RollerException;
 import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.ui.rendering.util.InvalidRequestException;
 
 
 /**

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
(from r415883, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogRequest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogRequest.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogRequest.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogRequest.java&r1=415883&r2=415888&rev=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/WeblogRequest.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
Tue Jun 20 20:28:16 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.core;
+package org.apache.roller.ui.rendering.util;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
Tue Jun 20 20:28:16 2006
@@ -57,7 +57,7 @@
 import org.apache.roller.ui.rendering.model.PlanetPageModel;
 import org.apache.roller.ui.rendering.model.SitePageModel;
 import org.apache.roller.ui.rendering.newsfeeds.NewsfeedCache;
-import org.apache.roller.ui.core.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.util.RegexUtil;
 import org.apache.struts.util.RequestUtils;
 import org.apache.velocity.VelocityContext;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?rev=415888&r1=415887&r2=415888&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
Tue Jun 20 20:28:16 2006
@@ -51,7 +51,7 @@
 import org.apache.roller.ui.core.tags.menu.MenuTag;
 import org.apache.roller.ui.authoring.tags.BigWeblogCalendarModel;
 import org.apache.roller.ui.authoring.tags.WeblogCalendarModel;
-import org.apache.roller.ui.core.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 
 
 /**



Mime
View raw message