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 2007/07/07 22:26:16 UTC
svn commit: r554254 - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering:
model/ servlets/
Author: agilliland
Date: Sat Jul 7 13:26:15 2007
New Revision: 554254
URL: http://svn.apache.org/viewvc?view=rev&rev=554254
Log:
updating model classes to remove dependency on http request object. now if we can just remove the CalendarModel and its dependency on a PageContext then we'll really be set.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java Sat Jul 7 13:26:15 2007
@@ -57,7 +57,7 @@
this.pageContext = (PageContext) initData.get("pageContext");
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Sat Jul 7 13:26:15 2007
@@ -54,7 +54,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java Sat Jul 7 13:26:15 2007
@@ -50,7 +50,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java Sat Jul 7 13:26:15 2007
@@ -44,7 +44,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Sat Jul 7 13:26:15 2007
@@ -78,7 +78,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java Sat Jul 7 13:26:15 2007
@@ -60,7 +60,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ this.weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(this.weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java Sat Jul 7 13:26:15 2007
@@ -45,7 +45,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java Sat Jul 7 13:26:15 2007
@@ -42,7 +42,7 @@
public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("Expected 'weblogRequest' init param!");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java Sat Jul 7 13:26:15 2007
@@ -89,7 +89,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Sat Jul 7 13:26:15 2007
@@ -78,7 +78,7 @@
public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
- this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ this.weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(this.weblogRequest == null) {
throw new WebloggerException("expected weblogRequest from init data");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java Sat Jul 7 13:26:15 2007
@@ -56,9 +56,6 @@
private URLStrategy urlStrategy = null;
- /** TODO: remove dependency on pageContext */
- private PageContext pageContext = null;
-
public URLModel() {}
@@ -69,7 +66,7 @@
public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
- WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
+ WeblogRequest weblogRequest = (WeblogRequest) initData.get("parsedRequest");
if(weblogRequest == null) {
throw new WebloggerException("Expected 'weblogRequest' init param!");
}
@@ -82,9 +79,6 @@
if(urlStrategy == null) {
urlStrategy = WebloggerFactory.getWeblogger().getUrlStrategy();
}
-
- // need page context as well :(
- pageContext = (PageContext) initData.get("pageContext");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Sat Jul 7 13:26:15 2007
@@ -24,7 +24,6 @@
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -36,6 +35,8 @@
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.RegexUtil;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.ui.rendering.util.ParsedRequest;
import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -89,8 +90,8 @@
private static final Pattern QUOTE_PATTERN =
Pattern.compile(""", Pattern.CASE_INSENSITIVE);
- private HttpServletRequest request = null;
- private TimeZone tz = null;
+ private ParsedRequest parsedRequest = null;
+ private Weblog weblog = null;
/** Template context name to be used for model */
@@ -100,15 +101,18 @@
/** Init page model based on request */
- public void init(Map initData) throws WebloggerException {
+ public void init(Map initData) throws WebloggerException {
- // extract request object
- this.request = (HttpServletRequest) initData.get("request");
-
- // extract timezone if available
- WeblogRequest weblogRequest = (WeblogRequest)initData.get("weblogRequest");
- if (weblogRequest != null && weblogRequest.getWeblog() != null) {
- tz = weblogRequest.getWeblog().getTimeZoneInstance();
+ // we expect the init data to contain a parsedRequest object
+ parsedRequest = (ParsedRequest) initData.get("parsedRequest");
+ if(parsedRequest == null) {
+ throw new WebloggerException("expected parsedRequest from init data");
+ }
+
+ // extract weblog object if possible
+ if(parsedRequest instanceof WeblogRequest) {
+ WeblogRequest weblogRequest = (WeblogRequest) parsedRequest;
+ weblog = weblogRequest.getWeblog();
}
}
@@ -117,10 +121,9 @@
public boolean isUserAuthorizedToAuthor(WeblogWrapper weblog) {
try {
- RollerSession rses = RollerSession.getRollerSession(request);
- if (rses != null && rses.getAuthenticatedUser() != null) {
+ if (parsedRequest.getAuthenticUser() != null) {
return weblog.getPojo().hasUserPermissions(
- rses.getAuthenticatedUser(), WeblogPermission.AUTHOR);
+ parsedRequest.getUser(), WeblogPermission.AUTHOR);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
@@ -130,10 +133,9 @@
public boolean isUserAuthorizedToAdmin(WeblogWrapper weblog) {
try {
- RollerSession rses = RollerSession.getRollerSession(request);
- if (rses != null && rses.getAuthenticatedUser() != null) {
+ if (parsedRequest.getAuthenticUser() != null) {
return weblog.getPojo().hasUserPermissions(
- rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
+ parsedRequest.getUser(), WeblogPermission.ADMIN);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
@@ -142,7 +144,7 @@
}
public boolean isUserAuthenticated() {
- return (request.getUserPrincipal() != null);
+ return (parsedRequest.getAuthenticUser() != null);
}
//-------------------------------------------------------------- Date utils
@@ -161,8 +163,8 @@
return fmt;
SimpleDateFormat format = new SimpleDateFormat(fmt);
- if (tz != null) {
- format.setTimeZone(tz);
+ if (weblog != null) {
+ format.setTimeZone(weblog.getTimeZoneInstance());
}
return format.format(d);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Sat Jul 7 13:26:15 2007
@@ -224,8 +224,7 @@
// populate the rendering model
Map initData = new HashMap();
- initData.put("request", request);
- initData.put("weblogRequest", feedRequest);
+ initData.put("parsedRequest", feedRequest);
// define url strategy
initData.put("urlStrategy", WebloggerFactory.getWeblogger().getUrlStrategy());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Sat Jul 7 13:26:15 2007
@@ -382,9 +382,8 @@
// populate the rendering model
Map initData = new HashMap();
- initData.put("request", request);
initData.put("requestParameters", request.getParameterMap());
- initData.put("weblogRequest", pageRequest);
+ initData.put("parsedRequest", pageRequest);
initData.put("pageContext", pageContext);
// define url strategy
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Sat Jul 7 13:26:15 2007
@@ -198,8 +198,7 @@
// populate the rendering model
Map initData = new HashMap();
- initData.put("request", request);
- initData.put("weblogRequest", previewRequest);
+ initData.put("parsedRequest", previewRequest);
initData.put("pageContext", pageContext);
// define url strategy
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=554254&r1=554253&r2=554254
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Sat Jul 7 13:26:15 2007
@@ -140,7 +140,7 @@
WeblogPageRequest pageRequest = new WeblogPageRequest();
pageRequest.setWeblogHandle(searchRequest.getWeblogHandle());
pageRequest.setWeblogCategoryName(searchRequest.getWeblogCategoryName());
- initData.put("weblogRequest", pageRequest);
+ initData.put("parsedRequest", pageRequest);
initData.put("searchRequest", searchRequest);
// define url strategy