Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 89456 invoked from network); 22 May 2007 15:45:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 May 2007 15:45:10 -0000 Received: (qmail 38390 invoked by uid 500); 22 May 2007 15:45:15 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 38360 invoked by uid 500); 22 May 2007 15:45:15 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 38351 invoked by uid 99); 22 May 2007 15:45:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2007 08:45:15 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Tue, 22 May 2007 08:45:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6094E1A981A; Tue, 22 May 2007 08:44:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r540611 - in /roller/trunk: apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java tests/org/apache/roller/ui/StrutsActionTestBase.java Date: Tue, 22 May 2007 15:44:49 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070522154449.6094E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Tue May 22 08:44:48 2007 New Revision: 540611 URL: http://svn.apache.org/viewvc?view=rev&rev=540611 Log: Removing unnecessary reference to InitialContext Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java?view=diff&rev=540611&r1=540610&r2=540611 ============================================================================== --- roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java (original) +++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java Tue May 22 08:44:48 2007 @@ -133,9 +133,7 @@ private void upgradeDatabaseIfNeeded() throws RollerException { // try { -// InitialContext ic = new InitialContext(); -// DataSource ds = (DataSource)ic.lookup("java:comp/env/jdbc/rollerdb"); -// Connection con = ds.getConnection(); +// Connection con = // get connection somehow // UpgradeDatabase.upgradeDatabase(con, RollerFactory.getRoller().getVersion()); // con.close(); // } catch (NamingException e) { Modified: roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java?view=diff&rev=540611&r1=540610&r2=540611 ============================================================================== --- roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java (original) +++ roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java Tue May 22 08:44:48 2007 @@ -29,7 +29,6 @@ import com.mockrunner.struts.MapMessageResources; import java.io.File; import java.io.FileInputStream; -import javax.naming.InitialContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper;