You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/05/17 00:56:39 UTC
svn commit: r407098 [3/4] - in /incubator/roller/trunk: ./ metadata/xdoclet/
src/org/apache/roller/presentation/ src/org/apache/roller/ui/
src/org/apache/roller/ui/admin/ src/org/apache/roller/ui/admin/struts/
src/org/apache/roller/ui/admin/struts/acti...
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/BasePageModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/BasePageModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/BasePageModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/BasePageModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/BasePageModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/BasePageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/BasePageModel.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Mar 10, 2004
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -30,7 +30,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.util.StrutsUtil;
+import org.apache.roller.ui.core.util.StrutsUtil;
/**
* Re-usable base for page models.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/DefaultAuthenticator.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/DefaultAuthenticator.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/DefaultAuthenticator.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java Tue May 16 15:54:47 2006
@@ -16,12 +16,11 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.security.Principal;
import javax.servlet.http.HttpServletRequest;
-
/** Class used by Roller to check user authentication and role */
public class DefaultAuthenticator implements Authenticator
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/InvalidRequestException.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/InvalidRequestException.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/InvalidRequestException.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/InvalidRequestException.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/InvalidRequestException.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/InvalidRequestException.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/InvalidRequestException.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on December 12, 2005, 9:49 AM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
/**
* An InvalidRequestException is thrown by the ParsedRequest class or any of
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/LanguageUtil.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/LanguageUtil.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/LanguageUtil.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/LanguageUtil.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/LanguageUtil.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/LanguageUtil.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/LanguageUtil.java Tue May 16 15:54:47 2006
@@ -20,7 +20,7 @@
*
* Created on 04-May-04
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.security.Principal;
import java.util.Arrays;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/MainPageAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/MainPageAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/MainPageAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/MainPageAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/MainPageAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/MainPageAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/MainPageAction.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.util.Date;
import java.util.List;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/ParsedRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ParsedRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/ParsedRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/ParsedRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/ParsedRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/ParsedRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/ParsedRequest.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 7, 2005, 12:29 PM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/PlanetRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/PlanetRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/PlanetRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/PlanetRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/PlanetRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/PlanetRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/PlanetRequest.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on December 12, 2005, 9:47 AM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerContext.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/RollerContext.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/RollerContext.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.io.File;
import java.io.IOException;
@@ -60,7 +60,7 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.pings.PingQueueTask;
+import org.apache.roller.ui.core.pings.PingQueueTask;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
import org.springframework.context.ApplicationContext;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/RollerRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/RollerRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerSession.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/RollerSession.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/RollerSession.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.io.Serializable;
import java.security.Principal;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogFeedRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogFeedRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogFeedRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogFeedRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/WeblogFeedRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/WeblogFeedRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogFeedRequest.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 7, 2005, 1:59 PM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.util.HashSet;
import java.util.Set;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogPageRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogPageRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogPageRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogPageRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/WeblogPageRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/WeblogPageRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogPageRequest.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 5, 2005, 12:05 PM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import java.util.Enumeration;
import java.util.HashSet;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogRequest.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogRequest.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogRequest.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/WeblogRequest.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/WeblogRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogRequest.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on December 14, 2005, 6:14 PM
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import javax.servlet.http.HttpServletRequest;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/BreadCrumbFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/BreadCrumbFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/BreadCrumbFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/CharEncodingFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/CharEncodingFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/CharEncodingFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/CompressionFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/CompressionFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/CompressionFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -30,6 +30,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.core.util.ByteArrayOutputStreamWrapper;
+import org.apache.roller.ui.core.util.ByteArrayResponseWrapper;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/DebugFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/DebugFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/DebugFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/DebugFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/DebugFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/DebugFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/DebugFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on April 17, 2006, 10:30 AM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import javax.servlet.Filter;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/IPBanFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IPBanFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/IPBanFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/IPBanFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/IPBanFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/IPBanFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/IPBanFilter.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import javax.servlet.Filter;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/PersistenceSessionFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/PersistenceSessionFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/PersistenceSessionFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import javax.servlet.Filter;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/RequestFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/RequestFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/RequestFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -41,9 +41,9 @@
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.util.RequestUtil;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.util.RequestUtil;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/SchemeEnforcementFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/SchemeEnforcementFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/SchemeEnforcementFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/filters/SchemeEnforcementFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/SchemeEnforcementFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/SchemeEnforcementFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/SchemeEnforcementFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on September 16, 2005, 3:17 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.filters;
import java.io.IOException;
import java.util.HashSet;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueProcessor.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueProcessor.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueProcessor.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java Tue May 16 15:54:47 2006
@@ -17,7 +17,7 @@
*/
-package org.apache.roller.presentation.pings;
+package org.apache.roller.ui.core.pings;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -28,7 +28,7 @@
import org.apache.roller.pojos.PingQueueEntryData;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import java.util.Iterator;
import java.util.List;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueTask.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueTask.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueTask.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueTask.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueTask.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueTask.java Tue May 16 15:54:47 2006
@@ -16,14 +16,14 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.pings;
+package org.apache.roller.ui.core.pings;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import java.util.TimerTask;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/WeblogUpdatePinger.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/pings/WeblogUpdatePinger.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/pings/WeblogUpdatePinger.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.pings;
+package org.apache.roller.ui.core.pings;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/DateTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/DateTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/DateTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/DateTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/DateTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/DateTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/DateTag.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/HybridTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/HybridTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/HybridTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/HybridTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/HybridTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/HybridTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/HybridTag.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on February 10, 2002, 11:12 PM
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkParamTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkParamTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkParamTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkParamTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkParamTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkParamTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkParamTag.java Tue May 16 15:54:47 2006
@@ -7,7 +7,7 @@
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import org.apache.log4j.Category;
import org.apache.struts.util.RequestUtils;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkTag.java Tue May 16 15:54:47 2006
@@ -5,7 +5,7 @@
*
* ====================================================================
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URLEncoder;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/RowTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/RowTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/RowTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/RowTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/RowTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/RowTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/RowTag.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/StatusMessageTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/StatusMessageTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/StatusMessageTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java Tue May 16 15:54:47 2006
@@ -15,11 +15,11 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerSession;
import java.io.IOException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/VelocityTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/VelocityTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/VelocityTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/VelocityTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/VelocityTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/VelocityTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/VelocityTag.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags;
+package org.apache.roller.ui.core.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.calendar;
+package org.apache.roller.ui.core.tags.calendar;
import java.util.Calendar;
import java.util.Date;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.calendar;
+package org.apache.roller.ui.core.tags.calendar;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
@@ -25,7 +25,7 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
-import org.apache.roller.presentation.tags.HybridTag;
+import org.apache.roller.ui.core.tags.HybridTag;
import org.apache.roller.util.DateUtil;
import java.io.PrintWriter;
@@ -39,7 +39,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/BaseRollerMenu.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/BaseRollerMenu.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/BaseRollerMenu.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,9 +33,9 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.util.Utilities;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/EditorNavigationBarTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/EditorNavigationBarTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/EditorNavigationBarTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/EditorNavigationBarTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/EditorNavigationBarTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/EditorNavigationBarTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/EditorNavigationBarTag.java Tue May 16 15:54:47 2006
@@ -16,15 +16,15 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/Menu.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/Menu.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/Menu.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/Menu.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/Menu.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/Menu.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/Menu.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import javax.servlet.http.HttpServletRequest;
import org.apache.roller.RollerException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuImpl.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuImpl.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuImpl.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuImpl.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuImpl.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import java.util.ArrayList;
import java.util.Iterator;
@@ -34,7 +34,7 @@
import org.apache.struts.util.RequestUtils;
import org.apache.roller.RollerException;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
/////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItem.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItem.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItem.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItem.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItem.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItem.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItem.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItemImpl.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItemImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItemImpl.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItemImpl.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItemImpl.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItemImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItemImpl.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import java.util.ArrayList;
import java.util.Iterator;
@@ -31,7 +31,7 @@
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.RequestUtils;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
/////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import javax.servlet.http.HttpServletRequest;
import org.apache.roller.RollerException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -25,9 +25,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.VelocityContext;
import org.apache.roller.RollerException;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.tags.VelocityTag;
-import org.apache.roller.presentation.velocity.ContextLoader;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.tags.VelocityTag;
+import org.apache.roller.ui.rendering.velocity.ContextLoader;
//import javax.servlet.jsp.tagext.*;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/RollerMenuModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/RollerMenuModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/RollerMenuModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/RollerMenuModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/RollerMenuModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/RollerMenuModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/RollerMenuModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.tags.menu;
+package org.apache.roller.ui.core.tags.menu;
import java.io.InputStream;
import java.util.Hashtable;
@@ -30,8 +30,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
import org.xml.sax.SAXException;
//////////////////////////////////////////////////////////////////////////////
@@ -74,16 +74,16 @@
String menuItemPath = "menu-bar/menu/menu-item";
digester.addObjectCreate( menuPath,
- "org.apache.roller.presentation.tags.menu.MenuImpl");
+ "org.apache.roller.ui.core.tags.menu.MenuImpl");
digester.addSetProperties( menuPath );
digester.addSetNext( menuPath,"addMenu",
- "org.apache.roller.presentation.tags.menu.Menu");
+ "org.apache.roller.ui.core.tags.menu.Menu");
digester.addObjectCreate( menuItemPath,
- "org.apache.roller.presentation.tags.menu.MenuItemImpl");
+ "org.apache.roller.ui.core.tags.menu.MenuItemImpl");
digester.addSetProperties( menuItemPath );
digester.addSetNext( menuItemPath, "addItem",
- "org.apache.roller.presentation.tags.menu.MenuItemImpl");
+ "org.apache.roller.ui.core.tags.menu.MenuItemImpl");
InputStream input = ctx.getResourceAsStream(config);
try
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/BlacklistUpdateTask.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/BlacklistUpdateTask.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/BlacklistUpdateTask.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/BlacklistUpdateTask.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/BlacklistUpdateTask.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/BlacklistUpdateTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/BlacklistUpdateTask.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Mar 10, 2004
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core.tasks;
import java.util.TimerTask;
import org.apache.commons.logging.Log;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/TurnoverReferersTask.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/TurnoverReferersTask.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/TurnoverReferersTask.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/TurnoverReferersTask.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/TurnoverReferersTask.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/TurnoverReferersTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/TurnoverReferersTask.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Aug 16, 2003
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core.tasks;
import java.util.TimerTask;
import org.apache.commons.logging.Log;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayOutputStreamWrapper.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayOutputStreamWrapper.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayOutputStreamWrapper.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayOutputStreamWrapper.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayOutputStreamWrapper.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayOutputStreamWrapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayOutputStreamWrapper.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.util;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayResponseWrapper.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayResponseWrapper.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayResponseWrapper.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayResponseWrapper.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayResponseWrapper.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayResponseWrapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayResponseWrapper.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.core.util;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/CacheHttpServletResponseWrapper.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/CacheHttpServletResponseWrapper.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/CacheHttpServletResponseWrapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java Tue May 16 15:54:47 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/RequestUtil.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/RequestUtil.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/RequestUtil.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/RequestUtil.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/RequestUtil.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/RequestUtil.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/RequestUtil.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import java.util.Enumeration;
import java.util.HashMap;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/ResponseContent.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/ResponseContent.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/ResponseContent.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/ResponseContent.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/ResponseContent.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/ResponseContent.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/ResponseContent.java Tue May 16 15:54:47 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import java.io.*;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitPrintWriter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitPrintWriter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitPrintWriter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitPrintWriter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitPrintWriter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitPrintWriter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitPrintWriter.java Tue May 16 15:54:47 2006
@@ -1,4 +1,4 @@
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import java.io.PrintWriter;
import java.io.Writer;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitServletOutputStream.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitServletOutputStream.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitServletOutputStream.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitServletOutputStream.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitServletOutputStream.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitServletOutputStream.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitServletOutputStream.java Tue May 16 15:54:47 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import java.io.IOException;
import java.io.OutputStream;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/util/StrutsUtil.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/StrutsUtil.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/util/StrutsUtil.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/util/StrutsUtil.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/util/StrutsUtil.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/util/StrutsUtil.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/util/StrutsUtil.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.util;
+package org.apache.roller.ui.core.util;
import java.util.ArrayList;
import java.util.Date;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/FeedCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/FeedCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/FeedCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/FeedCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/FeedCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/FeedCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/FeedCacheFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 5, 2005, 6:32 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.util.Date;
@@ -51,13 +51,13 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.WeblogFeedRequest;
+import org.apache.roller.ui.core.WeblogFeedRequest;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
import org.apache.roller.util.cache.LazyExpiringCacheEntry;
-import org.apache.roller.presentation.util.CacheHttpServletResponseWrapper;
-import org.apache.roller.presentation.util.ResponseContent;
+import org.apache.roller.ui.core.util.CacheHttpServletResponseWrapper;
+import org.apache.roller.ui.core.util.ResponseContent;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedFeedCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedFeedCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedFeedCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedFeedCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedFeedCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedFeedCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedFeedCacheFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 9, 2005, 2:47 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -57,7 +57,7 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.WeblogFeedRequest;
+import org.apache.roller.ui.core.WeblogFeedRequest;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedWeblogPageCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedWeblogPageCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedWeblogPageCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedWeblogPageCacheFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on November 9, 2005, 9:02 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -49,7 +49,7 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.WeblogPageRequest;
+import org.apache.roller.ui.core.WeblogPageRequest;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfPlanetModifiedFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfPlanetModifiedFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfPlanetModifiedFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -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.presentation.PlanetRequest;
+import org.apache.roller.ui.core.PlanetRequest;
import org.apache.roller.util.cache.ExpiringCacheEntry;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/MainPageCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/MainPageCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/MainPageCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/MainPageCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/MainPageCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/MainPageCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/MainPageCacheFilter.java Tue May 16 15:54:47 2006
@@ -20,7 +20,7 @@
*
* Created on November 7, 2005, 2:32 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.security.Principal;
@@ -49,12 +49,12 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.LanguageUtil;
+import org.apache.roller.ui.core.LanguageUtil;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.util.CacheHttpServletResponseWrapper;
-import org.apache.roller.presentation.util.ResponseContent;
+import org.apache.roller.ui.core.util.CacheHttpServletResponseWrapper;
+import org.apache.roller.ui.core.util.ResponseContent;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/PlanetCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/PlanetCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/PlanetCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on December 12, 2005, 10:03 AM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.util.Date;
@@ -48,12 +48,12 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.PlanetRequest;
+import org.apache.roller.ui.core.PlanetRequest;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.util.CacheHttpServletResponseWrapper;
-import org.apache.roller.presentation.util.ResponseContent;
+import org.apache.roller.ui.core.util.CacheHttpServletResponseWrapper;
+import org.apache.roller.ui.core.util.ResponseContent;
/**
* A cache filter for Planet Roller items ... /planet.do, /planetrss
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/RefererFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/RefererFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/RefererFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/RefererFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/RefererFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/RefererFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/RefererFilter.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.util.regex.Pattern;
@@ -32,12 +32,12 @@
import org.apache.roller.business.referrers.IncomingReferrer;
import org.apache.roller.business.referrers.ReferrerQueueManager;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.InvalidRequestException;
-import org.apache.roller.presentation.WeblogPageRequest;
+import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.core.WeblogPageRequest;
import org.apache.roller.util.SpamChecker;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/WeblogPageCacheFilter.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/WeblogPageCacheFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/WeblogPageCacheFilter.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/WeblogPageCacheFilter.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/filters/WeblogPageCacheFilter.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/filters/WeblogPageCacheFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/WeblogPageCacheFilter.java Tue May 16 15:54:47 2006
@@ -20,7 +20,7 @@
*
* Created on October 27, 2005, 12:19 PM
*/
-package org.apache.roller.presentation.filters;
+package org.apache.roller.ui.rendering.filters;
import java.io.IOException;
import java.util.Date;
@@ -47,13 +47,13 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.WeblogPageRequest;
+import org.apache.roller.ui.core.WeblogPageRequest;
import org.apache.roller.util.cache.Cache;
import org.apache.roller.util.cache.CacheHandler;
import org.apache.roller.util.cache.CacheManager;
import org.apache.roller.util.cache.LazyExpiringCacheEntry;
-import org.apache.roller.presentation.util.CacheHttpServletResponseWrapper;
-import org.apache.roller.presentation.util.ResponseContent;
+import org.apache.roller.ui.core.util.CacheHttpServletResponseWrapper;
+import org.apache.roller.ui.core.util.ResponseContent;
import org.apache.roller.util.Utilities;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/NewsfeedCache.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/newsfeeds/NewsfeedCache.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/NewsfeedCache.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/NewsfeedCache.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/newsfeeds/NewsfeedCache.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/newsfeeds/NewsfeedCache.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/NewsfeedCache.java Tue May 16 15:54:47 2006
@@ -1 +1 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. The ASF licenses this file to You
* under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License. For additional information regarding
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
package org.apache.roller.presentation.newsfeeds;
import java.io.InputStreamReader;
import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.com
mons.logging.LogFactory;
import org.apache.roller.util.LRUCache2;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedInput;
import java.io.UnsupportedEncodingException;
import java.net.URLConnection;
import org.apache.roller.config.RollerConfig;
/**
* Returns parsed RSS feed by pulling one from a cache or by retrieving and
* parging the specified feed using the Flock RSS parser.
* <br />
* TODO: use PlanetRoller to implement NewsfeedCache instead.
* <br />
* @author Lance Lavandowska
* @author Dave Johnson
*/
public class NewsfeedCache
{
private static Log mLogger = LogFactory.getFactory().getInstance(
NewsfeedCache.class);
/** Static singleton * */
private static NewsfeedCache mInstance = null;
/** Instance vars * */
private boolean aggregator_enabled = true;
private boolean aggregator_cache_enabled = true;
private int aggregator_cache_timeout = 14400;
/** LRU cache */
LRUCache2 m
Cache = null;
/** Constructor */
private NewsfeedCache()
{
// lookup the props we need
String enabled = RollerConfig.getProperty("aggregator.enabled");
String usecache = RollerConfig.getProperty("aggregator.cache.enabled");
String cachetime = RollerConfig.getProperty("aggregator.cache.timeout");
if("true".equalsIgnoreCase(enabled))
this.aggregator_enabled = true;
if("true".equalsIgnoreCase(usecache))
this.aggregator_cache_enabled = true;
try {
this.aggregator_cache_timeout = Integer.parseInt(cachetime);
} catch(Exception e) { mLogger.warn(e); }
// finally ... create the cache
this.mCache = new LRUCache2(100, 1000 * this.aggregator_cache_timeout);
}
/** static singleton retriever */
public static NewsfeedCache getInstance()
{
synchronized (NewsfeedCache.class)
{
if (mIn
stance == null)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Instantiating new NewsfeedCache");
}
mInstance = new NewsfeedCache();
}
}
return mInstance;
}
/**
* Returns a Channel object for the supplied RSS newsfeed URL.
*
* @param feedUrl
* RSS newsfeed URL.
* @return FlockFeedI for specified RSS newsfeed URL.
*/
public SyndFeed getChannel(String feedUrl)
{
SyndFeed feed = null;
try
{
// If aggregator has been disable return null
if (!aggregator_enabled)
{
return null;
}
if (aggregator_cache_enabled)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: use Cache for " + feedUrl);
}
// Get p
re-parsed feed from the cache
feed = (SyndFeed) mCache.get(feedUrl);
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: got from Cache");
}
if (feed == null)
{
try
{
// Parse the feed
SyndFeedInput feedInput = new SyndFeedInput();
feed = feedInput.build(new InputStreamReader(
new URL(feedUrl).openStream()));
}
catch (Exception e1)
{
mLogger.info("Error parsing RSS: " + feedUrl);
}
}
// Store parsed feed in the cache
mCache.put(feedUrl, feed);
mLogger.debug("Newsfeed: not in Cache");
}
else
{
if (m
Logger.isDebugEnabled())
{
mLogger.debug("Newsfeed: not using Cache for " + feedUrl);
}
try
{
// charset fix from Jason Rumney (see ROL-766)
URLConnection connection = new URL(feedUrl).openConnection();
connection.connect();
String contentType = connection.getContentType();
// Default charset to UTF-8, since we are expecting XML
String charset = "UTF-8";
if (contentType != null) {
int charsetStart = contentType.indexOf("charset=");
if (charsetStart >= 0) {
int charsetEnd = contentType.indexOf(";", charsetStart);
if (charsetEnd == -1) charsetEnd = contentType.length();
charsetSta
rt += "charset=".length();
charset = contentType.substring(charsetStart, charsetEnd);
// Check that charset is recognized by Java
try {
byte[] test = "test".getBytes(charset);
}
catch (UnsupportedEncodingException codingEx) {
// default to UTF-8
charset = "UTF-8";
}
}
}
// Parse the feed
SyndFeedInput feedInput = new SyndFeedInput();
feed = feedInput.build(new InputStreamReader(
connection.getInputStream(), charset));
}
catch (Exception e1)
{
mLogger.info("Error pars
ing RSS: " + feedUrl);
}
}
}
catch (Exception ioe)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: Unexpected exception", ioe);
}
}
return feed;
}
}
\ No newline at end of file
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. The ASF licenses this file to You
* under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License. For additional information regarding
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
package org.apache.roller.ui.rendering.newsfeeds;
import java.io.InputStreamReader;
import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.com
mons.logging.LogFactory;
import org.apache.roller.util.LRUCache2;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedInput;
import java.io.UnsupportedEncodingException;
import java.net.URLConnection;
import org.apache.roller.config.RollerConfig;
/**
* Returns parsed RSS feed by pulling one from a cache or by retrieving and
* parging the specified feed using the Flock RSS parser.
* <br />
* TODO: use PlanetRoller to implement NewsfeedCache instead.
* <br />
* @author Lance Lavandowska
* @author Dave Johnson
*/
public class NewsfeedCache
{
private static Log mLogger = LogFactory.getFactory().getInstance(
NewsfeedCache.class);
/** Static singleton * */
private static NewsfeedCache mInstance = null;
/** Instance vars * */
private boolean aggregator_enabled = true;
private boolean aggregator_cache_enabled = true;
private int aggregator_cache_timeout = 14400;
/** LRU cache */
LRUCache2 m
Cache = null;
/** Constructor */
private NewsfeedCache()
{
// lookup the props we need
String enabled = RollerConfig.getProperty("aggregator.enabled");
String usecache = RollerConfig.getProperty("aggregator.cache.enabled");
String cachetime = RollerConfig.getProperty("aggregator.cache.timeout");
if("true".equalsIgnoreCase(enabled))
this.aggregator_enabled = true;
if("true".equalsIgnoreCase(usecache))
this.aggregator_cache_enabled = true;
try {
this.aggregator_cache_timeout = Integer.parseInt(cachetime);
} catch(Exception e) { mLogger.warn(e); }
// finally ... create the cache
this.mCache = new LRUCache2(100, 1000 * this.aggregator_cache_timeout);
}
/** static singleton retriever */
public static NewsfeedCache getInstance()
{
synchronized (NewsfeedCache.class)
{
if (mIn
stance == null)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Instantiating new NewsfeedCache");
}
mInstance = new NewsfeedCache();
}
}
return mInstance;
}
/**
* Returns a Channel object for the supplied RSS newsfeed URL.
*
* @param feedUrl
* RSS newsfeed URL.
* @return FlockFeedI for specified RSS newsfeed URL.
*/
public SyndFeed getChannel(String feedUrl)
{
SyndFeed feed = null;
try
{
// If aggregator has been disable return null
if (!aggregator_enabled)
{
return null;
}
if (aggregator_cache_enabled)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: use Cache for " + feedUrl);
}
// Get p
re-parsed feed from the cache
feed = (SyndFeed) mCache.get(feedUrl);
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: got from Cache");
}
if (feed == null)
{
try
{
// Parse the feed
SyndFeedInput feedInput = new SyndFeedInput();
feed = feedInput.build(new InputStreamReader(
new URL(feedUrl).openStream()));
}
catch (Exception e1)
{
mLogger.info("Error parsing RSS: " + feedUrl);
}
}
// Store parsed feed in the cache
mCache.put(feedUrl, feed);
mLogger.debug("Newsfeed: not in Cache");
}
else
{
if (m
Logger.isDebugEnabled())
{
mLogger.debug("Newsfeed: not using Cache for " + feedUrl);
}
try
{
// charset fix from Jason Rumney (see ROL-766)
URLConnection connection = new URL(feedUrl).openConnection();
connection.connect();
String contentType = connection.getContentType();
// Default charset to UTF-8, since we are expecting XML
String charset = "UTF-8";
if (contentType != null) {
int charsetStart = contentType.indexOf("charset=");
if (charsetStart >= 0) {
int charsetEnd = contentType.indexOf(";", charsetStart);
if (charsetEnd == -1) charsetEnd = contentType.length();
charsetSta
rt += "charset=".length();
charset = contentType.substring(charsetStart, charsetEnd);
// Check that charset is recognized by Java
try {
byte[] test = "test".getBytes(charset);
}
catch (UnsupportedEncodingException codingEx) {
// default to UTF-8
charset = "UTF-8";
}
}
}
// Parse the feed
SyndFeedInput feedInput = new SyndFeedInput();
feed = feedInput.build(new InputStreamReader(
connection.getInputStream(), charset));
}
catch (Exception e1)
{
mLogger.info("Error pars
ing RSS: " + feedUrl);
}
}
}
catch (Exception ioe)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("Newsfeed: Unexpected exception", ioe);
}
}
return feed;
}
}
\ No newline at end of file