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 2005/11/28 21:04:53 UTC
svn commit: r349487 - in /incubator/roller/trunk/src/org/roller:
pojos/WeblogTemplate.java
presentation/website/actions/WeblogTemplateFormAction.java
Author: agilliland
Date: Mon Nov 28 12:04:48 2005
New Revision: 349487
URL: http://svn.apache.org/viewcvs?rev=349487&view=rev
Log:
more code for caching rewrite.
- invalidate changes to template pages
Modified:
incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java
incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
Modified: incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java?rev=349487&r1=349486&r2=349487&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java Mon Nov 28 12:04:48 2005
@@ -25,6 +25,8 @@
{
static final long serialVersionUID = -613737191638263428L;
+ public static final String DEFAULT_PAGE = "Weblog";
+
private java.lang.String id;
private java.lang.String name;
private java.lang.String description;
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=349487&r1=349486&r2=349487&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Mon Nov 28 12:04:48 2005
@@ -2,6 +2,9 @@
package org.roller.presentation.website.actions;
import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import javax.servlet.ServletException;
@@ -28,12 +31,10 @@
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
-import org.roller.presentation.pagecache.PageCacheFilter;
+import org.roller.presentation.cache.CacheManager;
import org.roller.presentation.forms.WeblogTemplateForm;
import org.roller.util.StringUtils;
import org.roller.util.Utilities;
-
-
/////////////////////////////////////////////////////////////////////////////
/**
* Page form action.
@@ -86,7 +87,8 @@
saveMessages(request, uiMessages);
UserData user = rses.getAuthenticatedUser();
- PageCacheFilter.removeFromCache( request, website );
+ //PageCacheFilter.removeFromCache( request, website );
+ //CacheManager.invalidate(data);
actionForm.reset(mapping,request);
@@ -131,7 +133,8 @@
WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
pf.copyFrom(pd, request.getLocale());
- PageCacheFilter.removeFromCache( request, pd.getWebsite() );
+ //PageCacheFilter.removeFromCache( request, pd.getWebsite() );
+ //CacheManager.invalidate(pd);
addModelObjects(request, response, mapping, pd.getWebsite());
}
@@ -215,7 +218,8 @@
RollerFactory.getRoller().commit();
UserData user = rses.getAuthenticatedUser();
- PageCacheFilter.removeFromCache(request, template.getWebsite());
+ //PageCacheFilter.removeFromCache(request, template.getWebsite());
+ CacheManager.invalidate(template);
addModelObjects(
request, response, mapping, template.getWebsite());
@@ -323,7 +327,8 @@
saveMessages(request, uiMessages);
UserData user = rses.getAuthenticatedUser();
- PageCacheFilter.removeFromCache(request, data.getWebsite());
+ //PageCacheFilter.removeFromCache(request, data.getWebsite());
+ CacheManager.invalidate(data);
BasePageModel pageModel = new BasePageModel(
"pageForm.title", request, response, mapping);