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/07/15 08:46:03 UTC
svn commit: r422153 - in /incubator/roller/branches/roller_3.0:
contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/
src/org/apache/roller/config/ src/org/apache/roller/pojos/
src/org/apache/roller/ui/admin/struts/actions/ src/o...
Author: agilliland
Date: Fri Jul 14 23:46:01 2006
New Revision: 422153
URL: http://svn.apache.org/viewvc?rev=422153&view=rev
Log:
more cleanup work with absolute and relative url handling.
- reworked the way absolute and relative url are set as non-persisted runtime property.
- consolidated access to absolute and relative url to runtime config methods getRelativeContextURL() and getAbsoluteContextURL()
- removed old RollerContext methods to access absolute and relative context path.
- also moved isFrontPageWeblog() and isSiteWideWeblog() convenience methods from RollerContext to RollerRuntimeConfig.
Modified:
incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/config/RollerRuntimeConfig.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/BasePageModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/InitFilter.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ConfigModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/Handler.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp
Modified: incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java (original)
+++ incubator/roller/branches/roller_3.0/contrib/plugins/src/org/apache/roller/presentation/velocity/plugins/smileys/SmileysPlugin.java Fri Jul 14 23:46:01 2006
@@ -27,11 +27,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.WeblogEntryPlugin;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
-
/**
* Converts ascii emoticons into HTML image tags.
@@ -81,7 +80,7 @@
public synchronized void init(WebsiteData website, Map model) throws RollerException {
// don't do this work if Smileys already loaded
if (SmileysPlugin.smileyPatterns.length < 1) {
- String baseURL = RollerContext.getRollerContext().getAbsoluteContextUrl(null);
+ String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();
Pattern[] tempP = new Pattern[SmileysPlugin.smileyDefs.size()];
String[] tempS = new String[SmileysPlugin.smileyDefs.size()];
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/config/RollerRuntimeConfig.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/config/RollerRuntimeConfig.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/config/RollerRuntimeConfig.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/config/RollerRuntimeConfig.java Fri Jul 14 23:46:01 2006
@@ -45,8 +45,9 @@
private static String runtime_config = "/rollerRuntimeConfigDefs.xml";
private static RuntimeConfigDefs configDefs = null;
- // for properties that we are storing locally which aren't persisted
- private static Properties localConfig = new Properties();
+ // special case for our context urls
+ private static String relativeContextURL = null;
+ private static String absoluteContextURL = null;
// prevent instantiations
@@ -61,24 +62,15 @@
String value = null;
- // try local config first
- value = localConfig.getProperty(name);
-
- // next try db
- // i don't like this special case for the absoluteurl, but right now
- // i can't seem to see a better way. at some point we should come
- // back to this and see if there is a cleaner way to handle this -- AG
- if(value == null || "site.absoluteurl".equals(name)) {
- try {
- PropertiesManager pmgr = RollerFactory.getRoller().getPropertiesManager();
- value = pmgr.getProperty(name).getValue();
- } catch(Exception e) {
- log.warn("Trouble accessing property: "+name, e);
- }
+ try {
+ PropertiesManager pmgr = RollerFactory.getRoller().getPropertiesManager();
+ value = pmgr.getProperty(name).getValue();
+ } catch(Exception e) {
+ log.warn("Trouble accessing property: "+name, e);
}
log.debug("fetched property ["+name+"="+value+"]");
-
+
return value;
}
@@ -177,30 +169,71 @@
/**
- * Set the "site.absoluteurl" property locally.
- *
- * Local properties are a kind of bastardized attempt to maintain some
- * properties which can only be determined at runtime but which should
- * not be persisted.
+ * Special method which sets the non-persisted absolute url to this site.
*
* This property is *not* persisted in any way.
*/
- public static void setAbsoluteContextPath(String path) {
- localConfig.setProperty("site.absoluteurl", path);
+ public static void setAbsoluteContextURL(String url) {
+ absoluteContextURL = url;
}
/**
- * Set the "site.relativeurl" property locally.
+ * Get the absolute url to this site.
*
- * Local properties are a kind of bastardized attempt to maintain some
- * properties which can only be determined at runtime but which should
- * not be persisted.
+ * This method will just return the value of the "site.absoluteurl"
+ * property if it is set, otherwise it will return the non-persisted
+ * value which is set by the InitFilter.
+ */
+ public static String getAbsoluteContextURL() {
+
+ // db prop takes priority if it exists
+ String absURL = getProperty("site.absoluteurl");
+ if(absURL != null && absURL.trim().length() > 0) {
+ return absURL;
+ }
+
+ return absoluteContextURL;
+ }
+
+
+ /**
+ * Special method which sets the non-persisted relative url to this site.
*
* This property is *not* persisted in any way.
*/
- public static void setRelativeContextPath(String path) {
- localConfig.setProperty("site.relativeurl", path);
+ public static void setRelativeContextURL(String url) {
+ relativeContextURL = url;
+ }
+
+
+ public static String getRelativeContextURL() {
+ return relativeContextURL;
+ }
+
+
+ /**
+ * Convenience method for Roller classes trying to determine if a given
+ * weblog handle represents the front page blog.
+ */
+ public static boolean isFrontPageWeblog(String weblogHandle) {
+
+ String frontPageHandle = getProperty("site.frontpage.weblog.handle");
+
+ return (frontPageHandle.equals(weblogHandle));
+ }
+
+
+ /**
+ * Convenience method for Roller classes trying to determine if a given
+ * weblog handle represents the front page blog configured to render
+ * site-wide data.
+ */
+ public static boolean isSiteWideWeblog(String weblogHandle) {
+
+ boolean siteWide = getBooleanProperty("site.frontpage.weblog.aggregated");
+
+ return (isFrontPageWeblog(weblogHandle) && siteWide);
}
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java Fri Jul 14 23:46:01 2006
@@ -752,7 +752,7 @@
* @roller.wrapPojoMethod type="simple"
*/
public String getPermalink() {
- String absPath = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ String absPath = RollerRuntimeConfig.getAbsoluteContextURL();
return absPath + getPermaLink();
}
@@ -792,7 +792,7 @@
* @roller.wrapPojoMethod type="simple"
*/
public String getCommentLink() {
- String absPath = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ String absPath = RollerRuntimeConfig.getAbsoluteContextURL();
return absPath + getCommentsLink();
}
/** to please XDoclet */
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java Fri Jul 14 23:46:01 2006
@@ -1042,7 +1042,7 @@
*/
public String getURL() {
// TODO: ATLAS reconcile entry.getPermaLink() with new URLs
- String relPath = RollerRuntimeConfig.getProperty("site.relativeurl");
+ String relPath = RollerRuntimeConfig.getRelativeContextURL();
return relPath + "/" + getHandle();
}
public void setURL(String url) {
@@ -1054,7 +1054,7 @@
*/
public String getAbsoluteURL() {
// TODO: ATLAS reconcile entry.getPermaLink() with new URLs
- String relPath = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ String relPath = RollerRuntimeConfig.getAbsoluteContextURL();
return relPath + "/" + getHandle();
}
public void setAbsoluteURL(String url) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java Fri Jul 14 23:46:01 2006
@@ -60,7 +60,7 @@
RollerContext rctx = RollerContext.getRollerContext();
req.setAttribute("version",rctx.getRollerVersion());
req.setAttribute("buildTime",rctx.getRollerBuildTime());
- req.setAttribute("baseURL", rctx.getContextUrl(req));
+ req.setAttribute("baseURL", RollerRuntimeConfig.getRelativeContextURL());
req.setAttribute("data", new PlanetPageData(req));
boolean allowNewUsers =
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java Fri Jul 14 23:46:01 2006
@@ -38,6 +38,7 @@
import org.apache.struts.actions.DispatchAction;
import org.apache.struts.util.RequestUtils;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.WeblogManager;
@@ -227,7 +228,7 @@
HttpServletRequest req, List comments) throws RollerException {
RollerContext rc = RollerContext.getRollerContext();
- String rootURL = rc.getAbsoluteContextUrl(req);
+ String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
try {
if (rootURL == null || rootURL.trim().length()==0) {
rootURL = RequestUtils.serverURL(req) + req.getContextPath();
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java Fri Jul 14 23:46:01 2006
@@ -17,7 +17,6 @@
*/
package org.apache.roller.ui.authoring.struts.actions;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.text.MessageFormat;
import java.util.ResourceBundle;
@@ -25,8 +24,6 @@
import javax.mail.Session;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -43,6 +40,7 @@
import org.apache.struts.util.RequestUtils;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
@@ -232,7 +230,7 @@
// Figure URL to entry edit page
RollerContext rc = RollerContext.getRollerContext();
- String rootURL = rc.getAbsoluteContextUrl(request);
+ String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
if (rootURL == null || rootURL.trim().length()==0)
{
rootURL = RequestUtils.serverURL(request)
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java Fri Jul 14 23:46:01 2006
@@ -42,6 +42,7 @@
import org.apache.xmlrpc.XmlRpcException;
import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.AutoPingManager;
import org.apache.roller.model.PingTargetManager;
import org.apache.roller.model.RollerFactory;
@@ -50,7 +51,6 @@
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.core.BasePageModel;
import org.apache.roller.ui.core.RequestConstants;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.ui.core.pings.WeblogUpdatePinger;
@@ -244,7 +244,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(req);
- String absoluteUrl = RollerContext.getRollerContext().getAbsoluteContextUrl(req);
+ String absoluteUrl = RollerRuntimeConfig.getAbsoluteContextURL();
PingTargetData pingTarget = select(rreq);
WebsiteData website = rreq.getWebsite();
try
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java Fri Jul 14 23:46:01 2006
@@ -95,7 +95,7 @@
if (entry != null) {
url = rctx.createEntryPermalink(entry, req, true);
} else {
- url = rctx.getContextUrl(req, rreq.getWebsite());
+ url = rreq.getWebsite().getURL();
}
res.sendRedirect(url);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Fri Jul 14 23:46:01 2006
@@ -173,7 +173,7 @@
pageModel.setWebsite(website);
RollerContext rctx = RollerContext.getRollerContext();
- String baseURL = rctx.getAbsoluteContextUrl(request);
+ String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();
String resourcesBaseURL = baseURL + fmgr.getUploadUrl() + "/" + website.getHandle();
Iterator uploads = lastUploads.iterator();
if (uploads.hasNext()) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java Fri Jul 14 23:46:01 2006
@@ -77,6 +77,7 @@
import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx;
import org.apache.roller.util.MailUtil;
import org.apache.commons.lang.StringUtils;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.ui.core.RequestConstants;
import org.apache.roller.util.Utilities;
@@ -423,7 +424,7 @@
// Figure URL to entry edit page
RollerContext rc = RollerContext.getRollerContext();
- String rootURL = rc.getAbsoluteContextUrl(request);
+ String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
if (rootURL == null || rootURL.trim().length()==0) {
rootURL = RequestUtils.serverURL(request)
+ request.getContextPath();
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java Fri Jul 14 23:46:01 2006
@@ -28,17 +28,14 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.roller.RollerException;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.ui.core.BasePageModel;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.ui.core.RollerSession;
-import org.apache.roller.ui.core.tags.calendar.CalendarModel;
import org.apache.roller.ui.authoring.struts.actions.WeblogEntryPageModel.PageMode;
import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx;
import org.apache.commons.lang.StringUtils;
@@ -47,9 +44,9 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.PluginManager;
import org.apache.roller.model.Roller;
-import org.apache.roller.ui.core.tags.calendar.WeblogCalendarModel;
/**
* All data needed to render the edit-weblog page.
@@ -287,9 +284,7 @@
public String getPermaLink() throws RollerException
{
- String context = RollerContext
- .getRollerContext()
- .getAbsoluteContextUrl(rollerRequest.getRequest());
+ String context = RollerRuntimeConfig.getAbsoluteContextURL();
return context + getWeblogEntry().getPermaLink();
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/BasePageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/BasePageModel.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/BasePageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/BasePageModel.java Fri Jul 14 23:46:01 2006
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.struts.action.ActionMapping;
import org.apache.roller.pojos.WebsiteData;
@@ -80,8 +81,7 @@
public String getBaseURL()
{
- RollerContext rctx = RollerContext.getRollerContext();
- return rctx.getAbsoluteContextUrl(request);
+ return RollerRuntimeConfig.getAbsoluteContextURL();
}
public String getShortDateFormat()
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java Fri Jul 14 23:46:01 2006
@@ -1,25 +1,24 @@
/*
-* 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.core;
+ * 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.core;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -29,7 +28,6 @@
import java.sql.SQLException;
import java.util.Properties;
import java.util.TimerTask;
-
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletContext;
@@ -38,7 +36,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSessionEvent;
import javax.sql.DataSource;
-
import org.acegisecurity.providers.ProviderManager;
import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
@@ -67,6 +64,7 @@
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.support.WebApplicationContextUtils;
+
/**
* Responds to app init/destroy events and holds Roller instance.
*
@@ -441,65 +439,6 @@
}
return mAuthenticator;
}
-
- /**
- * Returns the full url for the website of the specified username.
- */
- public String getContextUrl(HttpServletRequest request, WebsiteData website) {
- return website.getURL();
- }
-
- /** Get context path of Roller, drops trailing slash */
- public String getContextUrl(HttpServletRequest request) {
- String url = request.getContextPath();
- if (url.endsWith("/")) {
- url = url.substring(0, url.length() - 1);
- }
- return url;
- }
-
-
- /** Get absolute URL of Roller context */
- public String getAbsoluteContextUrl(HttpServletRequest request) {
- return RollerRuntimeConfig.getProperty("site.absoluteurl");
- }
-
-
- /**
- * For use by MetaWeblog API.
- *
- * @return Context URL or null if not initialized yet.
- */
- public String getAbsoluteContextUrl() {
- return RollerRuntimeConfig.getProperty("site.absoluteurl");
- }
-
-
- /**
- * Convenience method for Roller classes trying to determine if a given
- * weblog handle represents the front page blog.
- */
- public boolean isFrontPageWeblog(String weblogHandle) {
-
- String frontPageHandle = RollerRuntimeConfig.getProperty(
- "site.frontpage.weblog.handle");
-
- return (frontPageHandle.equals(weblogHandle));
- }
-
-
- /**
- * Convenience method for Roller classes trying to determine if a given
- * weblog handle represents the front page blog configured to render
- * site-wide data.
- */
- public boolean isSiteWideWeblog(String weblogHandle) {
-
- boolean siteWide = RollerRuntimeConfig.getBooleanProperty(
- "site.frontpage.weblog.aggregated");
-
- return (isFrontPageWeblog(weblogHandle) && siteWide);
- }
public String createEntryPermalink(
@@ -510,9 +449,9 @@
try {
String baseUrl = null;
if (absolute) {
- baseUrl = getAbsoluteContextUrl(request);
+ baseUrl = RollerRuntimeConfig.getAbsoluteContextURL();
} else {
- baseUrl = getContextUrl(request);
+ baseUrl = RollerRuntimeConfig.getRelativeContextURL();
}
link = StringEscapeUtils.escapeHtml(baseUrl + entry.getPermaLink());
} catch (Exception e) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/InitFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/InitFilter.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/InitFilter.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/InitFilter.java Fri Jul 14 23:46:01 2006
@@ -59,8 +59,8 @@
String absPath = this.getAbsoluteUrl(request);
// set them in our config
- RollerRuntimeConfig.setAbsoluteContextPath(absPath);
- RollerRuntimeConfig.setRelativeContextPath(relPath);
+ RollerRuntimeConfig.setAbsoluteContextURL(absPath);
+ RollerRuntimeConfig.setRelativeContextURL(relPath);
log.debug("relPath = "+relPath);
log.debug("absPath = "+absPath);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java Fri Jul 14 23:46:01 2006
@@ -32,6 +32,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.roller.config.RollerRuntimeConfig;
/**
* Ping Queue Processor. Singleton encapsulating logic for processing the weblog update ping queue.
@@ -88,7 +89,7 @@
return;
}
- String absoluteContextUrl = rollerContext.getAbsoluteContextUrl();
+ String absoluteContextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
if (absoluteContextUrl == null)
{
logger.warn("WARNING: Skipping current ping queue processing round because we cannot yet determine the site's absolute context url.");
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java Fri Jul 14 23:46:01 2006
@@ -243,7 +243,7 @@
ThemeManager themeMgr = roller.getThemeManager();
themes = themeMgr.getEnabledThemesList();
if (wd != null) {
- contextURL = rollerContext.getAbsoluteContextUrl(request);
+ contextURL = RollerRuntimeConfig.getAbsoluteContextURL();
weblogURL = wd.getURL();
rssURL = contextURL + "/rss/" + wd.getHandle();
website = wd;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java Fri Jul 14 23:46:01 2006
@@ -169,14 +169,14 @@
} else {
// User registered, so go to welcome page
// TODO 3.0: this weblogURL doesn't make any sense
- String weblogURL = rollerContext.getAbsoluteContextUrl(request)
+ String weblogURL = RollerRuntimeConfig.getAbsoluteContextURL()
+ "/page/"+ud.getUserName();
request.setAttribute("weblogURL",weblogURL);
- String rssURL = rollerContext.getAbsoluteContextUrl(request)
+ String rssURL = RollerRuntimeConfig.getAbsoluteContextURL()
+ "/rss/"+ud.getUserName();
request.setAttribute("rssURL",rssURL);
request.setAttribute("contextURL",
- rollerContext.getAbsoluteContextUrl(request));
+ RollerRuntimeConfig.getAbsoluteContextURL());
return mapping.findForward("welcome.page");
}
} catch (RollerException e) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ConfigModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ConfigModel.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ConfigModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ConfigModel.java Fri Jul 14 23:46:01 2006
@@ -42,8 +42,7 @@
private static Log log = LogFactory.getLog(ConfigModel.class);
- /** TODO 3.0: remove dependency on request and pageContext */
- private HttpServletRequest request = null;
+ /** TODO 3.0: remove dependency on pageContext */
private PageContext pageContext = null;
/** Hand-picked list of runtime properties to be made available */
@@ -72,23 +71,21 @@
}
- /** Init page model based on request */
+ /** Init model */
public void init(Map map) throws RollerException {
- request = (HttpServletRequest)map.get("request");
pageContext = (PageContext)map.get("pageContext");
}
/** Relative URL of Roller, e.g. /roller */
public String getContextURL() {
- // TODO 3.0: fix getContextUrl() to not require request object
- return RollerContext.getRollerContext().getContextUrl(request);
+ return RollerRuntimeConfig.getRelativeContextURL();
}
/** Absolute URL of Roller, e.g. http://localhost:8080/roller */
public String getAbsoluteContextURL() {
- return RollerContext.getRollerContext().getAbsoluteContextUrl();
+ return RollerRuntimeConfig.getAbsoluteContextURL();
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java Fri Jul 14 23:46:01 2006
@@ -32,6 +32,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.operations.SearchOperation;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.IndexManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
@@ -39,8 +40,6 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogEntryWrapperComparator;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.ui.core.RollerContext;
-import org.apache.roller.ui.rendering.util.WeblogPageRequest;
import org.apache.roller.ui.rendering.util.WeblogSearchRequest;
import org.apache.roller.util.DateUtil;
@@ -92,8 +91,7 @@
SearchOperation search = new SearchOperation(indexMgr);
search.setTerm(searchRequest.getQuery());
- RollerContext rollerContext = RollerContext.getRollerContext();
- if(rollerContext.isSiteWideWeblog(searchRequest.getWeblogHandle())) {
+ if(RollerRuntimeConfig.isSiteWideWeblog(searchRequest.getWeblogHandle())) {
this.websiteSpecificSearch = false;
} else {
search.setWebsiteHandle(searchRequest.getWeblogHandle());
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Fri Jul 14 23:46:01 2006
@@ -53,7 +53,6 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.authoring.struts.formbeans.CommentFormEx;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.ui.rendering.model.UtilitiesModel;
import org.apache.roller.ui.rendering.util.CommentAuthenticator;
@@ -317,8 +316,7 @@
CacheManager.invalidate(comment);
// Send email notifications
- RollerContext rc = RollerContext.getRollerContext();
- String rootURL = rc.getAbsoluteContextUrl(request);
+ String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
if (rootURL == null || rootURL.trim().length()==0) {
rootURL = RequestUtils.serverURL(request) + request.getContextPath();
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Fri Jul 14 23:46:01 2006
@@ -34,6 +34,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.BookmarkData;
@@ -189,10 +190,8 @@
HashMap model = new HashMap();
String pageId = null;
try {
- RollerContext rollerContext = RollerContext.getRollerContext();
-
// determine what template to render with
- if (rollerContext.isSiteWideWeblog(weblog.getHandle())) {
+ if (RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
pageId = "templates/feeds/site-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
} else {
pageId = "templates/feeds/weblog-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
@@ -207,7 +206,7 @@
ModelLoader.loadFeedModels(model, initData);
// special handling for site wide feed
- if (rollerContext.isSiteWideWeblog(weblog.getHandle())) {
+ if (RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
ModelLoader.loadSiteModels(model, initData);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Fri Jul 14 23:46:01 2006
@@ -34,8 +34,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.RollerFactory;
-import org.apache.roller.model.UserManager;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.CommentData;
import org.apache.roller.pojos.FolderData;
@@ -271,7 +270,6 @@
// looks like we need to render content
HashMap model = new HashMap();
try {
- RollerContext rollerContext = RollerContext.getRollerContext();
PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
this, request, response,"", true, 8192, true);
@@ -288,7 +286,7 @@
ModelLoader.loadPageModels(model, initData);
// special handling for site wide weblog
- if (rollerContext.isSiteWideWeblog(weblog.getHandle())) {
+ if (RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
ModelLoader.loadSiteModels(model, initData);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Fri Jul 14 23:46:01 2006
@@ -31,10 +31,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.pojos.Template;
import org.apache.roller.pojos.Theme;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.cache.CachedContent;
import org.apache.roller.ui.rendering.Renderer;
import org.apache.roller.ui.rendering.RendererManager;
@@ -133,7 +133,6 @@
// looks like we need to render content
Map model = new HashMap();
try {
- RollerContext rollerContext = RollerContext.getRollerContext();
PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
this, request, response,"", true, 8192, true);
@@ -150,7 +149,7 @@
ModelLoader.loadPageModels(model, initData);
// special handling for site wide weblog
- if (rollerContext.isSiteWideWeblog(tmpWebsite.getHandle())) {
+ if (RollerRuntimeConfig.isSiteWideWeblog(tmpWebsite.getHandle())) {
ModelLoader.loadSiteModels(model, initData);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Fri Jul 14 23:46:01 2006
@@ -27,12 +27,10 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.rendering.util.InvalidRequestException;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.rendering.util.WeblogRequest;
import org.apache.roller.ui.rendering.Renderer;
import org.apache.roller.ui.rendering.RendererManager;
@@ -110,9 +108,7 @@
// populate the model
model.put("website", weblog);
-
- RollerContext rollerContext = new RollerContext();
- model.put("absBaseURL", rollerContext.getAbsoluteContextUrl(request));
+ model.put("absBaseURL", RollerRuntimeConfig.getAbsoluteContextURL());
// lookup Renderer we are going to use
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java Fri Jul 14 23:46:01 2006
@@ -31,11 +31,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.Template;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.rendering.Renderer;
import org.apache.roller.ui.rendering.RendererManager;
import org.apache.roller.ui.rendering.model.Model;
@@ -112,7 +112,6 @@
// looks like we need to render content
Map model = new HashMap();
try {
- RollerContext rollerContext = RollerContext.getRollerContext();
PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
this, request, response,"", true, 8192, true);
@@ -133,7 +132,7 @@
ModelLoader.loadSearchModels(model, initData);
// special site wide models
- if (rollerContext.isSiteWideWeblog(weblog.getHandle())) {
+ if (RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
ModelLoader.loadSiteModels(model, initData);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java Fri Jul 14 23:46:01 2006
@@ -36,7 +36,6 @@
import org.apache.roller.pojos.CommentData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.rendering.util.WeblogTrackbackRequest;
import org.apache.roller.util.LinkbackExtractor;
import org.apache.roller.util.SpamChecker;
@@ -159,8 +158,7 @@
"site.trackbackVerification.enabled")) {
// ...ensure trackbacker actually links to us
- RollerContext rctx= RollerContext.getRollerContext();
- String absurl = rctx.getAbsoluteContextUrl(request);
+ String absurl = RollerRuntimeConfig.getAbsoluteContextURL();
LinkbackExtractor linkback = new LinkbackExtractor(
comment.getUrl(), absurl + entry.getPermaLink());
if (linkback.getExcerpt() == null) {
@@ -192,8 +190,7 @@
CacheManager.invalidate(comment);
// Send email notifications
- RollerContext rc = RollerContext.getRollerContext();
- String rootURL = rc.getAbsoluteContextUrl(request);
+ String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
if (rootURL == null || rootURL.trim().length()==0) {
rootURL = RequestUtils.serverURL(request) + request.getContextPath();
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Fri Jul 14 23:46:01 2006
@@ -440,11 +440,11 @@
if (website != null && !"zzz_none_zzz".equals(website.getHandle())) {
url = OldUtilities.escapeHTML(website.getAbsoluteURL());
} else {
- url= OldUtilities.escapeHTML(rollerCtx.getAbsoluteContextUrl(request));
+ url= OldUtilities.escapeHTML(RollerRuntimeConfig.getAbsoluteContextURL());
}
ctx.put("websiteURL", url);
- ctx.put("baseURL", rollerCtx.getContextUrl( request ) );
- ctx.put("absBaseURL", rollerCtx.getAbsoluteContextUrl( request ) );
+ ctx.put("baseURL", RollerRuntimeConfig.getRelativeContextURL() );
+ ctx.put("absBaseURL", RollerRuntimeConfig.getAbsoluteContextURL() );
ctx.put("ctxPath", request.getContextPath() );
ctx.put("uploadPath", ContextLoader.figureResourcePath());
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/Handler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/Handler.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/Handler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/Handler.java Fri Jul 14 23:46:01 2006
@@ -30,6 +30,7 @@
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.webservices.adminapi.sdk.MissingElementException;
import org.apache.roller.webservices.adminapi.sdk.UnexpectedRootElementException;
import org.jdom.Document;
@@ -132,7 +133,7 @@
this.uri = new URI(request);
this.rollerContext = RollerContext.getRollerContext();
this.roller = RollerFactory.getRoller();
- this.urlPrefix = getRollerContext().getAbsoluteContextUrl(getRequest()) + ENDPOINT;
+ this.urlPrefix = RollerRuntimeConfig.getAbsoluteContextURL() + ENDPOINT;
// TODO: decide what to do about authentication, is WSSE going to fly?
//Authenticator auth = new WSSEAuthenticator(request);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java Fri Jul 14 23:46:01 2006
@@ -17,7 +17,6 @@
*/
package org.apache.roller.webservices.adminapi;
-import java.io.IOException;
import java.io.Reader;
import java.net.MalformedURLException;
import java.util.ArrayList;
@@ -30,7 +29,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jdom.Document;
-import org.jdom.JDOMException;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.UserManager;
@@ -305,7 +303,7 @@
we.setEmailAddress(wd.getEmailAddress());
we.setDateCreated(wd.getDateCreated());
try {
- AppUrl appUrl = new AppUrl(getRollerContext().getAbsoluteContextUrl(getRequest()), wd.getHandle());
+ AppUrl appUrl = new AppUrl(RollerRuntimeConfig.getAbsoluteContextURL(), wd.getHandle());
we.setAppEntriesUrl(appUrl.getEntryUrl().toString());
we.setAppResourcesUrl(appUrl.getResourceUrl().toString());
} catch (MalformedURLException mfue) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Fri Jul 14 23:46:01 2006
@@ -53,6 +53,7 @@
import javax.activation.FileTypeMap;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.util.cache.CacheManager;
@@ -132,7 +133,7 @@
*/
public AtomService getIntrospection(String[] pathInfo) throws Exception {
if (pathInfo.length == 0) {
- String absUrl = mRollerContext.getAbsoluteContextUrl(mRequest);
+ String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
AtomService service = new AtomService();
List perms = mRoller.getUserManager().getAllPermissions(user);
if (perms != null) {
@@ -197,7 +198,7 @@
public Feed getCollectionOfEntries(
String[] pathInfo, int start, int max) throws Exception {
String handle = pathInfo[0];
- String absUrl = mRollerContext.getAbsoluteContextUrl(mRequest);
+ String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
WebsiteData website = mRoller.getUserManager().getWebsiteByHandle(handle);
List entries = null;
if (canView(website)) {
@@ -249,7 +250,7 @@
public Feed getCollectionOfResources(
String[] pathInfo, int start, int max) throws Exception {
String handle = pathInfo[0];
- String absUrl = mRollerContext.getAbsoluteContextUrl(mRequest);
+ String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
WebsiteData website = mRoller.getUserManager().getWebsiteByHandle(handle);
FileManager fmgr = mRoller.getFileManager();
File[] files = fmgr.getFiles(website.getHandle());
@@ -704,7 +705,7 @@
List contents = new ArrayList();
contents.add(content);
- String absUrl = mRollerContext.getAbsoluteContextUrl(mRequest);
+ String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
atomEntry.setId( absUrl + entry.getPermaLink());
atomEntry.setTitle( entry.getTitle());
atomEntry.setContents( contents);
@@ -749,7 +750,7 @@
}
private Entry createAtomResourceEntry(WebsiteData website, File file) {
- String absUrl = mRollerContext.getAbsoluteContextUrl(mRequest);
+ String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
String editURI = absUrl
+ "/app/" + website.getHandle()
+ "/resource/" + file.getName();
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java Fri Jul 14 23:46:01 2006
@@ -34,6 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
@@ -42,7 +43,6 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.Utilities;
import org.apache.xmlrpc.XmlRpcException;
@@ -238,8 +238,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
HttpServletRequest req = rreq.getRequest();
- String contextUrl =
- RollerContext.getRollerContext().getAbsoluteContextUrl(req);
+ String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
// populates user information to return as a result
Hashtable result = new Hashtable();
@@ -281,8 +280,7 @@
try {
RollerRequest rreq = RollerRequest.getRollerRequest();
HttpServletRequest req = rreq.getRequest();
- String contextUrl =
- RollerContext.getRollerContext().getAbsoluteContextUrl(req);
+ String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
UserManager umgr = RollerFactory.getRoller().getUserManager();
UserData user = umgr.getUserByUserName(userid);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java Fri Jul 14 23:46:01 2006
@@ -32,6 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.FileManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
@@ -444,7 +445,7 @@
HttpServletRequest request = rreq.getRequest();
RollerContext rollerCtx = RollerContext.getRollerContext();
String permalink =
- rollerCtx.getAbsoluteContextUrl(request) + entry.getPermaLink();
+ RollerRuntimeConfig.getAbsoluteContextURL() + entry.getPermaLink();
Hashtable struct = new Hashtable();
struct.put("title", entry.getTitle());
@@ -473,7 +474,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
HttpServletRequest req = rreq.getRequest();
- String contextUrl = RollerContext.getRollerContext().getAbsoluteContextUrl(req);
+ String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
Hashtable struct = new Hashtable();
struct.put("description", category.getPath());
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp?rev=422153&r1=422152&r2=422153&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp Fri Jul 14 23:46:01 2006
@@ -27,7 +27,7 @@
Roller roller = RollerFactory.getRoller();
website = roller.getUserManager().getWebsiteByHandle(handle);
}
-String absURL = rctx.getAbsoluteContextUrl(request);
+String absURL = RollerRuntimeConfig.getAbsoluteContextURL();
boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
String customRegUrl = RollerRuntimeConfig.getProperty("users.registration.url");
if(customRegUrl != null && customRegUrl.trim().equals(""))