Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 74384 invoked from network); 14 Oct 2006 01:53:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Oct 2006 01:53:45 -0000 Received: (qmail 40446 invoked by uid 500); 14 Oct 2006 01:53:45 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 40413 invoked by uid 500); 14 Oct 2006 01:53:45 -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 40402 invoked by uid 99); 14 Oct 2006 01:53:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2006 18:53:45 -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; Fri, 13 Oct 2006 18:53:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A4EB21A981A; Fri, 13 Oct 2006 18:53:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463881 - in /incubator/roller/trunk/src/org/apache/roller: config/RollerConfig.java ui/core/RollerContext.java Date: Sat, 14 Oct 2006 01:53:24 -0000 To: roller-commits@incubator.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061014015324.A4EB21A981A@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: Fri Oct 13 18:53:23 2006 New Revision: 463881 URL: http://svn.apache.org/viewvc?view=rev&rev=463881 Log: remove setContextRealPath() and setPlanetCachePath() methods from RollerConfig, they are no longer needed. Modified: incubator/roller/trunk/src/org/apache/roller/config/RollerConfig.java incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Modified: incubator/roller/trunk/src/org/apache/roller/config/RollerConfig.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/config/RollerConfig.java?view=diff&rev=463881&r1=463880&r2=463881 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/config/RollerConfig.java (original) +++ incubator/roller/trunk/src/org/apache/roller/config/RollerConfig.java Fri Oct 13 18:53:23 2006 @@ -234,29 +234,5 @@ if("${webapp.context}".equals(mConfig.getProperty("themes.dir"))) mConfig.setProperty("themes.dir", path); } - - /** - * Set the "context.realPath" property at runtime. - *

- * Properties are meant to be read-only, but we make this exception because - * there are some classes which rely on having filesystem access to files - * in theRoller webapp context (and for unit testing). - *

- * This property is *not* persisted in any way. - */ - public static void setContextRealPath(String path) { - mConfig.setProperty("context.realPath", path); - } - /** - * Set the "context.realpath" property at runtime. - *

- * Properties are meant to be read-only, but we make this exception to make - * it possible for unit tests to control the cache directory. - *

- * This property is *not* persisted in any way. - */ - public static void setPlanetCachePath(String path) { - mConfig.setProperty("planet.aggregator.cache.dir", path); - } } Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java?view=diff&rev=463881&r1=463880&r2=463881 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java (original) +++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Fri Oct 13 18:53:23 2006 @@ -161,15 +161,6 @@ // is set to ${webapp.context} RollerConfig.setThemesDir(mContext.getRealPath("/")+File.separator+"themes"); - // set the roller context real path in RollerConfig - // NOTE: it seems that a few backend classes do actually need - // to know what the real path to the roller context is, - // so we set this property to give them the info they need. - // - // this is really not a best practice and we should try to - // remove these dependencies on the webapp context if possible - RollerConfig.setContextRealPath(mContext.getRealPath("/")); - try { // always upgrade database first upgradeDatabaseIfNeeded();