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

[snoopdave]

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;