Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 28252 invoked from network); 8 Jan 2007 20:17:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jan 2007 20:17:24 -0000 Received: (qmail 90501 invoked by uid 500); 8 Jan 2007 20:17:30 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 90467 invoked by uid 500); 8 Jan 2007 20:17:30 -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 90456 invoked by uid 99); 8 Jan 2007 20:17:30 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jan 2007 12:17:30 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jan 2007 12:17:23 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2FE711A981A; Mon, 8 Jan 2007 12:16:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r494185 - /incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Date: Mon, 08 Jan 2007 20:16:23 -0000 To: roller-commits@incubator.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070108201624.2FE711A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Mon Jan 8 12:16:21 2007 New Revision: 494185 URL: http://svn.apache.org/viewvc?view=rev&rev=494185 Log: Fixing get of media-link entry Modified: incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Modified: incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=494185&r1=494184&r2=494185 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original) +++ incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Mon Jan 8 12:16:21 2007 @@ -503,16 +503,10 @@ pathInfo[2].substring(0, pathInfo[2].length() - ".media-link".length()); String handle = pathInfo[0]; WebsiteData website = - mRoller.getUserManager().getWebsiteByHandle(handle); - - // TODO: this must have broken with 3.0, but i don't know - // how it's supposed to work so i can't really fix it - // it's unlikely this was working properly before because - // it was using an invalid path -// File resource = -// new File("/resources" + File.separator + fileName); -// return createAtomResourceEntry(website, resource); - return null; + mRoller.getUserManager().getWebsiteByHandle(handle); + WeblogResource resource = + mRoller.getFileManager().getFile(website, fileName); + return createAtomResourceEntry(website, resource); } } throw new AtomNotFoundException(