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/06/28 22:49:31 UTC
svn commit: r417869 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller:
business/hibernate/ model/ pojos/ ui/core/ ui/core/pings/
ui/core/struts/actions/ ui/rendering/filters/ ui/rendering/model/
ui/rendering/velocity/deprecated/ webservi...
Author: agilliland
Date: Wed Jun 28 13:49:30 2006
New Revision: 417869
URL: http://svn.apache.org/viewvc?rev=417869&view=rev
Log:
first pass at cleaning up the way we construct urls.
- introduced new method getAbsoluteURL() in WebsiteData so we now how a method for getting the absolute or relative url to a weblog.
- searched and replaced various places where urls were manually being constructed using /page/ and replaced it will a call to the appropriate getURL() method in in WebsiteData.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogManager.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/core/RollerContext.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.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/filters/RefererFilter.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarHelper.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java Wed Jun 28 13:49:30 2006
@@ -574,7 +574,7 @@
if (weblogHandle == null)
return;
- String selfSiteFragment = "/page/"+weblogHandle;
+ String selfSiteFragment = "/"+weblogHandle;
WebsiteData weblog = null;
WeblogEntryData entry = null;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Wed Jun 28 13:49:30 2006
@@ -1121,16 +1121,6 @@
}
return entry;
}
-
- /**
- * Get absolute URL to this website.
- * @return Absolute URL to this website.
- */
- public String getUrl(WebsiteData site, String contextUrl) {
- String url =
- StringEscapeUtils.escapeHtml(contextUrl + "/page/" + site.getHandle());
- return url;
- }
public void release() {}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogManager.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogManager.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/model/WeblogManager.java Wed Jun 28 13:49:30 2006
@@ -361,17 +361,7 @@
* Returns true if ancestor is truly an ancestor of child.
*/
public boolean isDescendentOf(WeblogCategoryData child,
- WeblogCategoryData ancestor) throws RollerException;
-
- /**
- * Get the URL of a website.
- * @param website The website object
- * @param contextUrl The context url, this is prepended and can be absolute
- * or relative depending on what is desired.
- * @return The url of the user's weblog
- */
- public String getUrl(WebsiteData website, String contextUrl)
- throws RollerException;
+ WeblogCategoryData ancestor) throws RollerException;
/**
* Apply comment default settings from website to all of website's entries.
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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -1030,7 +1030,19 @@
public void setURL(String url) {
// noop
}
-
+
+ /**
+ * @roller.wrapPojoMethod type="simple"
+ */
+ public String getAbsoluteURL() {
+ // TODO: ATLAS reconcile entry.getPermaLink() with new URLs
+ String relPath = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ return relPath + "/" + getHandle();
+ }
+ public void setAbsoluteURL(String url) {
+ // noop
+ }
+
/**
* Comma-separated list of additional page models to be created when this
* weblog is rendered.
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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -446,11 +446,7 @@
* Returns the full url for the website of the specified username.
*/
public String getContextUrl(HttpServletRequest request, WebsiteData website) {
- String url = this.getContextUrl(request);
- if (website != null) {
- url = url + "/page/" + website.getHandle();
- }
- return url;
+ return website.getURL();
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java Wed Jun 28 13:49:30 2006
@@ -106,8 +106,7 @@
throws RollerException, IOException, XmlRpcException
{
// Figure out the url of the user's website.
- String websiteUrl =
- RollerFactory.getRoller().getWeblogManager().getUrl(website, absoluteContextUrl);
+ String websiteUrl = website.getAbsoluteURL();
// Set up the ping parameters.
Vector params = new Vector();
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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -244,7 +244,7 @@
themes = themeMgr.getEnabledThemesList();
if (wd != null) {
contextURL = rollerContext.getAbsoluteContextUrl(request);
- weblogURL = contextURL + "/page/" + wd.getHandle();
+ 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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -168,6 +168,7 @@
return createUser(mapping, actionForm, request, response);
} else {
// User registered, so go to welcome page
+ // TODO 3.0: this weblogURL doesn't make any sense
String weblogURL = rollerContext.getAbsoluteContextUrl(request)
+ "/page/"+ud.getUserName();
request.setAttribute("weblogURL",weblogURL);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/filters/RefererFilter.java Wed Jun 28 13:49:30 2006
@@ -117,7 +117,7 @@
// Base page URLs, with and without www.
String basePageUrlWWW =
- rctx.getAbsoluteContextUrl(request)+"/page/"+weblog.getHandle();
+ rctx.getAbsoluteContextUrl(request)+"/"+weblog.getHandle();
String basePageUrl = basePageUrlWWW;
if ( basePageUrlWWW.startsWith("http://www.") ) {
// chop off the http://www.
@@ -129,7 +129,7 @@
(!referrerUrl.startsWith(basePageUrl) &&
!referrerUrl.startsWith(basePageUrlWWW))) {
- String selfSiteFragment = "/page/"+weblog.getHandle();
+ String selfSiteFragment = "/"+weblog.getHandle();
// validate the referrer
if ( referrerUrl != null ) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarHelper.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarHelper.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarHelper.java Wed Jun 28 13:49:30 2006
@@ -63,10 +63,9 @@
try {
String selfUrl = null;
if (pageLink != null) {
- selfUrl = request.getContextPath() + "/page/"
- + weblog.getHandle() + "/"+pageLink;
+ selfUrl = weblog.getURL() + "/page/" + pageLink;
} else {
- selfUrl = request.getContextPath()+"/page/" + weblog.getHandle();
+ selfUrl = weblog.getURL();
}
CalendarModel model = null;
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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -303,6 +303,7 @@
ctx.put("siteShortName", siteShortName);
// add language of the session (using locale of viewer set by Struts)
+ // TODO 3.0: this will probably need tweaking for multi-lang support
ctx.put("viewLocale", LanguageUtil.getViewLocale(request));
mLogger.debug("context viewLocale = "+ctx.get( "viewLocale"));
@@ -480,9 +481,7 @@
String url = null;
if (website != null && !"zzz_none_zzz".equals(website.getHandle())) {
- url = OldUtilities.escapeHTML(
- rollerCtx.getAbsoluteContextUrl(request)
- + "/page/" + website.getHandle());
+ url = OldUtilities.escapeHTML(website.getAbsoluteURL());
} else {
url= OldUtilities.escapeHTML(rollerCtx.getAbsoluteContextUrl(request));
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?rev=417869&r1=417868&r2=417869&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java Wed Jun 28 13:49:30 2006
@@ -267,10 +267,9 @@
String selfUrl = null;
String pageLink = mPageName;
if ( pageLink != null ) {
- selfUrl = mRequest.getContextPath() + "/page/"
- + mWebsite.getHandle() + "/"+pageLink;
+ selfUrl = mWebsite.getURL() + "/" + pageLink;
} else {
- selfUrl = mRequest.getContextPath()+"/page/" + mWebsite.getHandle();
+ selfUrl = mWebsite.getURL();
}
// setup weblog calendar model
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=417869&r1=417868&r2=417869&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 Wed Jun 28 13:49:30 2006
@@ -245,6 +245,7 @@
Hashtable result = new Hashtable();
result.put("nickname", user.getUserName());
result.put("userid", user.getUserName());
+ // TODO 3.0: this url does not work!!
result.put("url", contextUrl+"/page/"+userid);
result.put("email", "");
result.put("lastname", lastname);
@@ -291,7 +292,7 @@
while (iter.hasNext()) {
WebsiteData website = (WebsiteData)iter.next();
Hashtable blog = new Hashtable(3);
- blog.put("url", contextUrl+"/page/"+website.getHandle());
+ blog.put("url", website.getURL());
blog.put("blogid", website.getHandle());
blog.put("blogName", website.getName());
result.add(blog);