Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 59364 invoked from network); 26 Jul 2006 22:18:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Jul 2006 22:18:33 -0000 Received: (qmail 19273 invoked by uid 500); 26 Jul 2006 22:18:33 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 19248 invoked by uid 500); 26 Jul 2006 22:18:33 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 19234 invoked by uid 99); 26 Jul 2006 22:18:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 15:18:33 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 15:18:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 671E61A981A; Wed, 26 Jul 2006 15:18:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425877 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui: authoring/struts/actions/ToggleLinkbackDisplayAction.java authoring/struts/actions/WeblogEntryFormAction.java core/RollerContext.java Date: Wed, 26 Jul 2006 22:18:11 -0000 To: roller-commits@incubator.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060726221812.671E61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: agilliland Date: Wed Jul 26 15:18:10 2006 New Revision: 425877 URL: http://svn.apache.org/viewvc?rev=425877&view=rev Log: EOLing old createEntryPermalink() method from RollerContext. Modified: 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/WeblogEntryFormAction.java incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java 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=425877&r1=425876&r2=425877&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 Wed Jul 26 15:18:10 2006 @@ -93,7 +93,7 @@ { RollerContext rctx = RollerContext.getRollerContext(); if (entry != null) { - url = rctx.createEntryPermalink(entry, req, true); + url = entry.getPermalink(); } else { url = rreq.getWebsite().getURL(); } 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=425877&r1=425876&r2=425877&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 Wed Jul 26 15:18:10 2006 @@ -659,7 +659,7 @@ String title = entry.getTitle(); String excerpt = StringUtils.left( Utilities.removeHTML(content),255 ); - String url = rctx.createEntryPermalink(entry, request, true); + String url = entry.getPermalink(); String blog_name = entry.getWebsite().getName(); if (form.getTrackbackUrl() != null) { 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=425877&r1=425876&r2=425877&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 Jul 26 15:18:10 2006 @@ -439,27 +439,6 @@ } - public String createEntryPermalink( - WeblogEntryData entry, - HttpServletRequest request, - boolean absolute) { - String link = null; - try { - String baseUrl = null; - if (absolute) { - baseUrl = RollerRuntimeConfig.getAbsoluteContextURL(); - } else { - baseUrl = RollerRuntimeConfig.getRelativeContextURL(); - } - link = StringEscapeUtils.escapeHtml(baseUrl + entry.getPermaLink()); - } catch (Exception e) { - mLogger.error("Unexpected exception", e); - } - - return link; - } - - /** * Get the ServletContext. *