Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java Thu Jul 5 12:36:21 2007 @@ -31,9 +31,8 @@ import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.util.DateUtil; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.util.I18nMessages; -import org.apache.roller.weblogger.util.URLUtilities; - /** * An abstract implementation of a WeblogEntriesPager. @@ -237,12 +236,12 @@ int pageNum = page + pageAdd; if (pageLink != null) { - return URLUtilities.getWeblogPageURL(website, locale, pageLink, entryAnchor, catPath, dateString, tags, pageNum, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogPageURL(website, locale, pageLink, entryAnchor, catPath, dateString, tags, pageNum, false); } else if (entryAnchor != null) { - return URLUtilities.getWeblogEntryURL(website, locale, entryAnchor, true); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogEntryURL(website, locale, entryAnchor, true); } - return URLUtilities.getWeblogCollectionURL(website, locale, catPath, dateString, tags, pageNum, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCollectionURL(website, locale, catPath, dateString, tags, pageNum, false); } }
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java Thu Jul 5 12:36:21 2007 @@ -22,6 +22,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.rendering.util.WeblogFeedRequest; import org.apache.roller.weblogger.util.I18nMessages; @@ -88,7 +89,7 @@ } public String getHomeLink() { - return URLUtilities.getWeblogURL(weblog, weblog.getLocale(), false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(weblog, weblog.getLocale(), false); } public String getHomeName() { Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsPager.java Thu Jul 5 12:36:21 2007 @@ -20,11 +20,10 @@ import java.util.Locale; import java.util.Map; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.rendering.util.WeblogSearchRequest; import org.apache.roller.weblogger.util.I18nMessages; -import org.apache.roller.weblogger.util.URLUtilities; - /** * Pager for navigating through search results. @@ -83,7 +82,7 @@ public String getHomeLink() { - return URLUtilities.getWeblogURL(weblog, locale, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(weblog, locale, false); } public String getHomeName() { @@ -93,7 +92,7 @@ public String getNextLink() { if(moreResults) { - return URLUtilities.getWeblogSearchURL(weblog, locale, query, category, page + 1, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogSearchURL(weblog, locale, query, category, page + 1, false); } return null; } @@ -107,7 +106,7 @@ public String getPrevLink() { if(page > 0) { - return URLUtilities.getWeblogSearchURL(weblog, locale, query, category, page - 1, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogSearchURL(weblog, locale, query, category, page - 1, false); } return null; } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Thu Jul 5 12:36:21 2007 @@ -31,7 +31,7 @@ import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.ui.rendering.util.*; import org.apache.roller.weblogger.util.RollerMessages; -import org.apache.roller.weblogger.util.URLUtilities; + /** * Check against Akismet service. Expects to a valid Akismet API key in the @@ -56,7 +56,7 @@ public int validate(WeblogEntryComment comment, RollerMessages messages) { StringBuffer sb = new StringBuffer(); sb.append("blog=").append( - URLUtilities.getWeblogURL(comment.getWeblogEntry().getWebsite(), null, true)).append("&"); + WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(comment.getWeblogEntry().getWebsite(), null, true)).append("&"); sb.append("user_ip=" ).append(comment.getRemoteHost()).append("&"); sb.append("user_agent=" ).append(comment.getUserAgent()).append("&"); sb.append("referrer=" ).append(comment.getReferrer()).append("&"); Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java Thu Jul 5 12:36:21 2007 @@ -21,12 +21,11 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.ResourceBundle; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.util.LinkbackExtractor; import org.apache.roller.weblogger.util.RollerMessages; -import org.apache.roller.weblogger.util.URLUtilities; - /** * Validates comment if comment's URL links back to the comment's entry, @@ -53,7 +52,7 @@ try { linkback = new LinkbackExtractor( comment.getUrl(), - URLUtilities.getWeblogEntryURL( + WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogEntryURL( comment.getWeblogEntry().getWebsite(), null, comment.getWeblogEntry().getAnchor(), Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Thu Jul 5 12:36:21 2007 @@ -49,7 +49,7 @@ import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest; import org.apache.roller.util.DateUtil; import org.apache.roller.util.RegexUtil; -import org.apache.roller.weblogger.util.URLUtilities; + /** * Load Velocity Context with Weblogger objects, values, and custom plugins. @@ -402,7 +402,7 @@ String url = null; if (website != null && !"zzz_none_zzz".equals(website.getHandle())) { - url = URLUtilities.getWeblogURL(website, locale, true); + url = WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(website, locale, true); } else { url= WebloggerRuntimeConfig.getAbsoluteContextURL(); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Thu Jul 5 12:36:21 2007 @@ -46,7 +46,7 @@ import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel; import org.apache.roller.weblogger.ui.core.tags.calendar.WeblogCalendarModel; import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest; -import org.apache.roller.weblogger.util.URLUtilities; + /** * Provides assistance to VelociMacros, filling in where Velocity falls. @@ -125,7 +125,7 @@ /** Build the URL for editing an WeblogEntry **/ public String getEntryEditUrl(WeblogEntryWrapper entry) { - return URLUtilities.getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), false); } @@ -279,9 +279,9 @@ // a little hacky, but hopefully nobody is really using this anymore return WebloggerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/weblogConfig.rol?weblog="+val1; } else if("logout-redirect".equals(path)) { - return URLUtilities.getLogoutURL(false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getLogoutURL(false); } else if("login-redirect".equals(path)) { - return URLUtilities.getLoginURL(false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getLoginURL(false); } else { return "<span class=\"error\">ERROR generating link</span>"; } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java Thu Jul 5 12:36:21 2007 @@ -19,8 +19,6 @@ package org.apache.roller.weblogger.ui.rendering.velocity.deprecated; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; import javax.servlet.ServletException; @@ -29,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.util.URLUtilities; @@ -374,7 +373,7 @@ // redirect to new xmlrpc location private String figureXmlrpcRedirect(HttpServletRequest request) { - return URLUtilities.getXmlrpcURL(true); + return WebloggerFactory.getWeblogger().getUrlStrategy().getXmlrpcURL(true); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Thu Jul 5 12:36:21 2007 @@ -36,7 +36,6 @@ import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.roller.weblogger.util.URLUtilities; import org.apache.roller.weblogger.util.Utilities; @@ -144,7 +143,7 @@ params.put("bean.spamString", getBean().getSpamString()); } - return URLUtilities.getActionURL("globalCommentManagement", "/roller-ui/admin", + return WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL("globalCommentManagement", "/roller-ui/admin", null, params, false); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Thu Jul 5 12:36:21 2007 @@ -37,7 +37,6 @@ import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.roller.weblogger.util.URLUtilities; import org.apache.roller.weblogger.util.Utilities; @@ -152,7 +151,7 @@ params.put("bean.spamString", getBean().getSpamString()); } - return URLUtilities.getActionURL("comments", "/roller-ui/authoring", + return WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL("comments", "/roller-ui/authoring", getActionWeblog().getHandle(), params, false); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Thu Jul 5 12:36:21 2007 @@ -35,7 +35,6 @@ import org.apache.roller.weblogger.ui.struts2.pagers.EntriesPager; import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.roller.weblogger.util.URLUtilities; /** @@ -154,7 +153,7 @@ params.put("bean.sortBy", getBean().getSortBy()); } - return URLUtilities.getActionURL("entries", "/roller-ui/authoring", + return WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL("entries", "/roller-ui/authoring", getActionWeblog().getHandle(), params, false); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Thu Jul 5 12:36:21 2007 @@ -35,7 +35,6 @@ import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager; import org.apache.roller.weblogger.ui.core.plugins.WeblogEntryEditor; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.roller.weblogger.util.URLUtilities; /** @@ -208,7 +207,7 @@ public String getJsonAutocompleteUrl() { - return URLUtilities.getWeblogTagsJsonURL(getActionWeblog(), false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogTagsJsonURL(getActionWeblog(), false); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Thu Jul 5 12:36:21 2007 @@ -39,7 +39,6 @@ import org.apache.roller.weblogger.util.RollerMessages.RollerMessage; import org.apache.roller.weblogger.util.Trackback; import org.apache.roller.weblogger.util.TrackbackNotAllowedException; -import org.apache.roller.weblogger.util.URLUtilities; import org.apache.struts2.interceptor.validation.SkipValidation; @@ -272,7 +271,7 @@ } public String getPreviewURL() { - return URLUtilities.getPreviewWeblogEntryURL(getEntry().getAnchor(), getActionWeblog(), null, true); + return WebloggerFactory.getWeblogger().getUrlStrategy().getPreviewURLStrategy(null).getWeblogEntryURL(getActionWeblog(), null, getEntry().getAnchor(), true); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java Thu Jul 5 12:36:21 2007 @@ -36,7 +36,6 @@ import org.apache.roller.weblogger.pojos.WeblogPermission; import org.apache.roller.weblogger.pojos.ThemeResource; import org.apache.roller.weblogger.ui.struts2.util.UIAction; -import org.apache.roller.weblogger.util.URLUtilities; /** @@ -249,7 +248,7 @@ for(String upload : uploaded) { addMessage("uploadFiles.uploadedFile", - URLUtilities.getWeblogResourceURL(getActionWeblog(), upload, true)); + WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogResourceURL(getActionWeblog(), upload, true)); } } @@ -300,7 +299,7 @@ public String getResourceURL(String path) { - return URLUtilities.getWeblogResourceURL(getActionWeblog(), path, false); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogResourceURL(getActionWeblog(), path, false); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/StrutsRedirectServlet.java Thu Jul 5 12:36:21 2007 @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.roller.weblogger.util.URLUtilities; +import org.apache.roller.weblogger.business.WebloggerFactory; /** @@ -45,11 +45,11 @@ Map<String, String> params = new HashMap(); params.put("weblog", request.getParameter("weblog")); params.put("bean.entryId", request.getParameter("entryId")); - redirectUrl = URLUtilities.getActionURL("comments", "/roller-ui/authoring", null, params, true); + redirectUrl = WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL("comments", "/roller-ui/authoring", null, params, true); } else if(servlet != null && "/roller-ui/yourWebsites.do".equals(servlet)) { // redirect to new main menu action - redirectUrl = URLUtilities.getActionURL("menu", "/roller-ui", null, null, true); + redirectUrl = WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL("menu", "/roller-ui", null, null, true); } if(redirectUrl != null) { Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Thu Jul 5 12:36:21 2007 @@ -113,7 +113,7 @@ to = (String[])reviewers.toArray(new String[reviewers.size()]); // Figure URL to entry edit page - String editURL = URLUtilities.getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), true); + String editURL = WebloggerFactory.getWeblogger().getUrlStrategy().getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), true); ResourceBundle resources = ResourceBundle.getBundle( "ApplicationResources", entry.getWebsite().getLocaleInstance()); @@ -351,7 +351,7 @@ msg.append((escapeHtml) ? "\n" : "<br />"); // Build link back to comment - String commentURL = URLUtilities.getWeblogCommentsURL(weblog, null, entry.getAnchor(), true); + String commentURL = WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCommentsURL(weblog, null, entry.getAnchor(), true); if (escapeHtml) { msg.append(commentURL); @@ -405,7 +405,7 @@ Map<String, String> parameters = new HashMap(); parameters.put("bean.entryId", entry.getId()); - String deleteURL = URLUtilities.getActionURL( + String deleteURL = WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL( "comments", "/roller-ui/authoring", weblog.getHandle(), parameters, true); if (escapeHtml) { @@ -520,7 +520,7 @@ StringBuffer msg = new StringBuffer(); msg.append(resources.getString("email.comment.commentApproved")); msg.append("\n\n"); - msg.append(URLUtilities.getWeblogCommentsURL(weblog, null, entry.getAnchor(), true)); + msg.append(WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCommentsURL(weblog, null, entry.getAnchor(), true)); // send message to author of approved comment try { Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java Thu Jul 5 12:36:21 2007 @@ -21,626 +21,18 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogTheme; -import org.apache.roller.weblogger.pojos.Weblog; /** - * Utilities class for building urls. This class is meant to centralize the - * logic behind building urls so that logic isn't duplicated throughout the - * code. + * Some utility methods used when dealing with urls. */ public final class URLUtilities { // non-intantiable private URLUtilities() {} - - - public static final String getXmlrpcURL(boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-services/xmlrpc"); - - return url.toString(); - } - - public static final String getAtomProtocolURL(boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-services/app"); - - return url.toString(); - } - - - /** - * Get root url for a given weblog. Optionally for a certain locale. - */ - public static final String getWeblogURL(Weblog weblog, - String locale, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/").append(weblog.getHandle()).append("/"); - - if(locale != null) { - url.append(locale).append("/"); - } - - return url.toString(); - } - - - /** - * Get url for a single weblog entry on a given weblog. - */ - public static final String getWeblogEntryURL(Weblog weblog, - String locale, - String entryAnchor, - boolean absolute) { - - if(weblog == null || entryAnchor == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - url.append(getWeblogURL(weblog, locale, absolute)); - url.append("entry/").append(encode(entryAnchor)); - - return url.toString(); - } - - - /** - * Get url for a single weblog entry comments on a given weblog. - */ - public static final String getWeblogCommentsURL(Weblog weblog, - String locale, - String entryAnchor, - boolean absolute) { - - return getWeblogEntryURL(weblog, locale, entryAnchor, absolute)+"#comments"; - } - - - /** - * Get url for a single weblog entry comment on a given weblog. - */ - public static final String getWeblogCommentURL(Weblog weblog, - String locale, - String entryAnchor, - String timeStamp, - boolean absolute) { - - return getWeblogEntryURL(weblog, locale, entryAnchor, absolute)+"#comment-"+timeStamp; - } - - - /** - * Get url for a collection of entries on a given weblog. - */ - public static final String getWeblogCollectionURL(Weblog weblog, - String locale, - String category, - String dateString, - List tags, - int pageNum, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer pathinfo = new StringBuffer(); - Map params = new HashMap(); - - pathinfo.append(getWeblogURL(weblog, locale, absolute)); - - String cat = null; - if(category != null && "/".equals(category)) { - cat = null; - } else if(category != null && category.startsWith("/")) { - cat = category.substring(1); - } - - if(cat != null && dateString == null) { - pathinfo.append("category/").append(encode(cat)); - - } else if(dateString != null && cat == null) { - pathinfo.append("date/").append(dateString); - - } else if(tags != null && tags.size() > 0) { - pathinfo.append("tags/").append(getEncodedTagsString(tags)); - } else { - if(dateString != null) params.put("date", dateString); - if(cat != null) params.put("cat", encode(cat)); - } - - if(pageNum > 0) { - params.put("page", Integer.toString(pageNum)); - } - - return pathinfo.toString() + getQueryString(params); - } - - - /** - * Get url for a custom page on a given weblog. - */ - public static final String getWeblogPageURL(Weblog weblog, - String locale, - String pageLink, - String entryAnchor, - String category, - String dateString, - List tags, - int pageNum, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer pathinfo = new StringBuffer(); - Map params = new HashMap(); - - pathinfo.append(getWeblogURL(weblog, locale, absolute)); - - if(pageLink != null) { - pathinfo.append("page/").append(pageLink); - - // for custom pages we only allow query params - if(dateString != null) { - params.put("date", dateString); - } - if(category != null) { - params.put("cat", encode(category)); - } - if(tags != null && tags.size() > 0) { - params.put("tags", getEncodedTagsString(tags)); - } - if(pageNum > 0) { - params.put("page", Integer.toString(pageNum)); - } - } else { - // if there is no page link then this is just a typical collection url - return getWeblogCollectionURL(weblog, locale, category, dateString, tags, pageNum, absolute); - } - - return pathinfo.toString() + getQueryString(params); - } - - - /** - * Get url for a feed on a given weblog. - */ - public static final String getWeblogFeedURL(Weblog weblog, - String locale, - String type, - String format, - String category, - String term, - List tags, - boolean excerpts, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - url.append(getWeblogURL(weblog, locale, absolute)); - url.append("feed/").append(type).append("/").append(format); - - Map params = new HashMap(); - if(category != null && category.trim().length() > 0) { - params.put("cat", encode(category)); - } - if(tags != null && tags.size() > 0) { - params.put("tags", getEncodedTagsString(tags)); - } - if(term != null && term.trim().length() > 0) { - params.put("q", encode(term.trim())); - } - if(excerpts) { - params.put("excerpts", "true"); - } - - return url.toString() + getQueryString(params); - } - - - /** - * Get url to search endpoint on a given weblog. - */ - public static final String getWeblogSearchURL(Weblog weblog, - String locale, - String query, - String category, - int pageNum, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - url.append(getWeblogURL(weblog, locale, absolute)); - url.append("search"); - - Map params = new HashMap(); - if(query != null) { - params.put("q", encode(query)); - - // other stuff only makes sense if there is a query - if(category != null) { - params.put("cat", encode(category)); - } - if(pageNum > 0) { - params.put("page", Integer.toString(pageNum)); - } - } - - return url.toString() + getQueryString(params); - } - - - /** - * Get url to a resource on a given weblog. - */ - public static final String getWeblogResourceURL(Weblog weblog, - String filePath, - boolean absolute) { - - if(weblog == null || StringUtils.isEmpty(filePath)) { - return null; - } - - StringBuffer url = new StringBuffer(); - - url.append(getWeblogURL(weblog, null, absolute)); - url.append("resource/"); - - if(filePath.startsWith("/")) { - url.append(filePath.substring(1)); - } else { - url.append(filePath); - } - - return url.toString(); - } - - - /** - * Get url to rsd file on a given weblog. - */ - public static final String getWeblogRsdURL(Weblog weblog, - boolean absolute) { - - if(weblog == null) { - return null; - } - - return getWeblogURL(weblog, null, absolute)+"rsd"; - } - - - /** - * Get url to JSON tags service url, optionally for a given weblog. - */ - public static final String getWeblogTagsJsonURL(Weblog weblog, - boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - // json tags service base - url.append("/roller-services/json/tags/"); - - // is this for a specific weblog or site-wide? - if(weblog != null) { - url.append(weblog.getHandle()).append("/"); - } - - return url.toString(); - } - - - /** - * Url to login page. - */ - public static final String getLoginURL(boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/login-redirect.rol"); - - return url.toString(); - } - - - /** - * Url to logout page. - */ - public static final String getLogoutURL(boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/logout.rol"); - - return url.toString(); - } - - - /** - * Get a url to a UI action in a given namespace, optionally specifying - * a weblogHandle parameter if that is needed by the action. - */ - public static final String getActionURL(String action, - String namespace, - String weblogHandle, - Map<String, String> parameters, - boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append(namespace); - url.append("/").append(action).append(".rol"); - - // put weblog handle parameter, if necessary - Map<String, String> params = new HashMap(); - if(weblogHandle != null) { - params.put("weblog", weblogHandle); - } - - // add custom parameters if they exist - if(parameters != null) { - params.putAll(parameters); - } - - if(!params.isEmpty()) { - return url.toString() + getQueryString(params); - } else { - return url.toString(); - } - } - - - /** - * Get a url to add a new weblog entry. - */ - public static final String getEntryAddURL(String weblogHandle, - boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/entryAdd.rol"); - - Map params = new HashMap(); - params.put("weblog", weblogHandle); - - return url.toString() + getQueryString(params); - } - - - /** - * Get a url to edit a specific weblog entry. - */ - public static final String getEntryEditURL(String weblogHandle, - String entryId, - boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/entryEdit.rol"); - - Map params = new HashMap(); - params.put("weblog", weblogHandle); - params.put("bean.id", entryId); - - return url.toString() + getQueryString(params); - } - - - /** - * Get a url to weblog config page. - */ - public static final String getWeblogConfigURL(String weblogHandle, - boolean absolute) { - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/weblogConfig.rol"); - - Map params = new HashMap(); - params.put("weblog", weblogHandle); - - return url.toString() + getQueryString(params); - } - - - /** - * Get root url for a given *preview* weblog. - * Optionally for a certain locale. - */ - public static final String getPreviewWeblogURL(String previewTheme, - Weblog weblog, - String locale, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/preview/").append(weblog.getHandle()).append("/"); - - if(locale != null) { - url.append(locale).append("/"); - } - - Map params = new HashMap(); - if(previewTheme != null) { - params.put("theme", encode(previewTheme)); - } - - return url.toString() + getQueryString(params); - } - - - /** - * Get url for a given *preview* weblog entry. - * Optionally for a certain locale. - */ - public static final String getPreviewWeblogEntryURL(String previewAnchor, - Weblog weblog, - String locale, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/preview/").append(weblog.getHandle()).append("/"); - - if(locale != null) { - url.append(locale).append("/"); - } - - Map params = new HashMap(); - if(previewAnchor != null) { - params.put("previewEntry", encode(previewAnchor)); - } - - return url.toString() + getQueryString(params); - } - - - /** - * Get a url to a *preview* resource on a given weblog. - */ - public static final String getPreviewWeblogResourceURL(String previewTheme, - Weblog weblog, - String filePath, - boolean absolute) { - - if(weblog == null) { - return null; - } - - StringBuffer url = new StringBuffer(); - - if(absolute) { - url.append(WebloggerRuntimeConfig.getAbsoluteContextURL()); - } else { - url.append(WebloggerRuntimeConfig.getRelativeContextURL()); - } - - url.append("/roller-ui/authoring/previewresource/").append(weblog.getHandle()).append("/"); - - if(filePath.startsWith("/")) { - url.append(filePath.substring(1)); - } else { - url.append(filePath); - } - - Map params = new HashMap(); - if(previewTheme != null && !WeblogTheme.CUSTOM.equals(previewTheme)) { - params.put("theme", encode(previewTheme)); - } - - return url.toString() + getQueryString(params); - } /** Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Thu Jul 5 12:36:21 2007 @@ -67,7 +67,6 @@ import org.apache.roller.weblogger.pojos.RuntimeConfigProperty; import org.apache.roller.weblogger.pojos.WeblogEntryTag; import org.apache.roller.weblogger.pojos.ThemeResource; -import org.apache.roller.weblogger.util.URLUtilities; import org.apache.roller.weblogger.util.cache.CacheManager; /** @@ -114,6 +113,8 @@ private User user; private int maxEntries = 20; + private final String atomURL; + private static boolean throttle = true; private static Log log = @@ -144,6 +145,8 @@ log.debug("Getting user", neverHappen); } } + + atomURL = WebloggerFactory.getWeblogger().getUrlStrategy().getAtomProtocolURL(true); } /** @@ -190,7 +193,7 @@ // Create collection for entries within that workspace Collection entryCol = new Collection("Weblog Entries", "text", - URLUtilities.getAtomProtocolURL(true)+"/"+handle+"/entries"); + atomURL+"/"+handle+"/entries"); entryCol.setAccept("application/atom+xml;type=entry"); try { // Add fixed categories using scheme that points to @@ -221,7 +224,7 @@ // Add media collection for upload dir Collection uploadCol = new Collection("Media Files", "text", - URLUtilities.getAtomProtocolURL(true)+"/"+handle+"/resources/"); + atomURL+"/"+handle+"/resources/"); uploadCol.setAccept(accept); workspace.addCollection(uploadCol); @@ -232,7 +235,7 @@ for (int i=0; i<dirs.length; i++) { Collection uploadSubCol = new Collection( "Media Files: " + dirs[i].getPath(), "text", - URLUtilities.getAtomProtocolURL(true)+"/"+handle+"/resources/" + dirs[i].getPath()); + atomURL+"/"+handle+"/resources/" + dirs[i].getPath()); uploadSubCol.setAccept(accept); workspace.addCollection(uploadSubCol); } @@ -329,7 +332,7 @@ start, // offset (for range paging) max + 1); // maxEntries Feed feed = new Feed(); - feed.setId(URLUtilities.getAtomProtocolURL(true) + feed.setId(atomURL +"/"+website.getHandle() + "/entries/" + start); feed.setTitle(website.getName()); @@ -353,7 +356,7 @@ List links = new ArrayList(); if (entries.size() > max) { // add next link int nextOffset = start + max; - String url = URLUtilities.getAtomProtocolURL(true)+"/" + String url = atomURL+"/" + website.getHandle() + "/entries/" + nextOffset; Link nextLink = new Link(); nextLink.setRel("next"); @@ -362,7 +365,7 @@ } if (start > 0) { // add previous link int prevOffset = start > max ? start - max : 0; - String url = URLUtilities.getAtomProtocolURL(true)+"/" + String url = atomURL+"/" +website.getHandle() + "/entries/" + prevOffset; Link prevLink = new Link(); prevLink.setRel("previous"); @@ -415,7 +418,7 @@ } Feed feed = new Feed(); - feed.setId(URLUtilities.getAtomProtocolURL(true) + feed.setId(atomURL +"/"+website.getHandle() + "/resources/" + path + start); feed.setTitle(website.getName()); @@ -460,7 +463,7 @@ List otherLinks = new ArrayList(); if (start + count < files.length) { // add next link int nextOffset = start + max; - String url = URLUtilities.getAtomProtocolURL(true) + String url = atomURL +"/"+ website.getHandle() + "/resources/" + path + nextOffset; Link nextLink = new Link(); nextLink.setRel("next"); @@ -469,7 +472,7 @@ } if (start > 0) { // add previous link int prevOffset = start > max ? start - max : 0; - String url = URLUtilities.getAtomProtocolURL(true) + String url = atomURL +"/"+website.getHandle() + "/resources/" + path + prevOffset; Link prevLink = new Link(); prevLink.setRel("previous"); @@ -1037,7 +1040,7 @@ Link editlink = new Link(); editlink.setRel("edit"); editlink.setHref( - URLUtilities.getAtomProtocolURL(true) + atomURL +"/"+entry.getWebsite().getHandle() + "/entry/" + entry.getId()); List otherlinks = new ArrayList(); otherlinks.add(editlink); @@ -1056,10 +1059,10 @@ private Entry createAtomResourceEntry(Weblog website, ThemeResource file) { String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL(); String editURI = - URLUtilities.getAtomProtocolURL(true)+"/"+website.getHandle() + atomURL+"/"+website.getHandle() + "/resource/" + file.getPath() + ".media-link"; String editMediaURI = - URLUtilities.getAtomProtocolURL(true)+"/"+ website.getHandle() + atomURL+"/"+ website.getHandle() + "/resource/" + file.getPath(); String viewURI = absUrl + "/resources/" + website.getHandle() @@ -1184,7 +1187,7 @@ } private String getWeblogCategoryScheme(Weblog website) { - return URLUtilities.getWeblogURL(website, null, true); + return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(website, null, true); } private String filePathFromPathInfo(String[] pathInfo) { Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=553618&r1=553617&r2=553618 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Thu Jul 5 12:36:21 2007 @@ -39,7 +39,6 @@ import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.util.RollerMessages; -import org.apache.roller.weblogger.util.URLUtilities; import org.apache.roller.weblogger.util.Utilities; import org.apache.xmlrpc.XmlRpcException; @@ -360,7 +359,7 @@ // Try to save file fmgr.saveFile(website, name, type, bits.length, new ByteArrayInputStream(bits)); - String fileLink = URLUtilities.getWeblogResourceURL(website, name, true); + String fileLink = WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogResourceURL(website, name, true); Hashtable returnStruct = new Hashtable(1); returnStruct.put("url", fileLink);
