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/21 01:23:18 UTC
svn commit: r424109 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering:
model/SearchResultsPager.java servlets/TrackbackServlet.java
velocity/deprecated/ContextLoader.java velocity/deprecated/OldPageHelper.java
Author: agilliland
Date: Thu Jul 20 16:23:18 2006
New Revision: 424109
URL: http://svn.apache.org/viewvc?rev=424109&view=rev
Log:
more cleanup of url building, updating classes to use URLUtilities.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.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/ui/rendering/velocity/deprecated/OldPageHelper.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java?rev=424109&r1=424108&r2=424109&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java Thu Jul 20 16:23:18 2006
@@ -68,8 +68,7 @@
public String getHomeLink() {
- // TODO 3.0: url construction logic
- return weblog.getURL();
+ return URLUtilities.getWeblogURL(weblog, locale, false);
}
public String getHomeName() {
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=424109&r1=424108&r2=424109&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 Thu Jul 20 16:23:18 2006
@@ -39,6 +39,7 @@
import org.apache.roller.ui.rendering.util.WeblogTrackbackRequest;
import org.apache.roller.util.LinkbackExtractor;
import org.apache.roller.util.SpamChecker;
+import org.apache.roller.util.URLUtilities;
import org.apache.roller.util.cache.CacheManager;
import org.apache.struts.util.RequestUtils;
@@ -158,9 +159,8 @@
"site.trackbackVerification.enabled")) {
// ...ensure trackbacker actually links to us
- String absurl = RollerRuntimeConfig.getAbsoluteContextURL();
LinkbackExtractor linkback = new LinkbackExtractor(
- comment.getUrl(), absurl + entry.getPermaLink());
+ comment.getUrl(), URLUtilities.getWeblogEntryURL(weblog, null, entry.getAnchor(), true));
if (linkback.getExcerpt() == null) {
comment.setPending(Boolean.TRUE);
comment.setApproved(Boolean.FALSE);
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=424109&r1=424108&r2=424109&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 Thu Jul 20 16:23:18 2006
@@ -61,6 +61,7 @@
import org.apache.roller.ui.rendering.util.WeblogSearchRequest;
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.RegexUtil;
+import org.apache.roller.util.URLUtilities;
import org.apache.struts.util.RequestUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.tools.view.context.ChainedContext;
@@ -438,9 +439,10 @@
String url = null;
if (website != null && !"zzz_none_zzz".equals(website.getHandle())) {
- url = OldUtilities.escapeHTML(website.getAbsoluteURL());
+ // TODO 3.0: this should probably include locale from request
+ url = URLUtilities.getWeblogURL(website, null, true);
} else {
- url= OldUtilities.escapeHTML(RollerRuntimeConfig.getAbsoluteContextURL());
+ url= RollerRuntimeConfig.getAbsoluteContextURL();
}
ctx.put("websiteURL", url);
ctx.put("baseURL", RollerRuntimeConfig.getRelativeContextURL() );
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=424109&r1=424108&r2=424109&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 Thu Jul 20 16:23:18 2006
@@ -262,19 +262,8 @@
if (OldWeblogPageModel.VELOCITY_NULL.equals(cat)) cat = null;
String ret = null;
try {
- HttpServletResponse response = mResponse;
-
- String selfUrl = null;
- String pageLink = mPageName;
- if ( pageLink != null ) {
- selfUrl = mWebsite.getURL() + "/" + pageLink;
- } else {
- selfUrl = mWebsite.getURL();
- }
-
// setup weblog calendar model
CalendarModel model = null;
- Date date = mDate;
if ( big ) {
model = new BigWeblogCalendarModel(mPageRequest, cat);
} else {
@@ -282,7 +271,7 @@
}
// save model in JSP page context so CalendarTag can find it
- mPageContext.setAttribute("calendarModel",model);
+ mPageContext.setAttribute("calendarModel", model);
// Create and setup calendar tag
CalendarTag calTag = new CalendarTag();
@@ -408,6 +397,8 @@
* So, if English and Dutch are supported, and the current Locale is Dutch,
* only English is returned. If the current Locale is Spanish, both English and Dutch are
* returned.
+ *
+ * TODO 3.0: decide what to do with this method
*
* @return
*/