Author: kkolinko
Date: Sun Jan 17 21:15:16 2016
New Revision: 1725135
URL: http://svn.apache.org/viewvc?rev=1725135&view=rev
Log:
Simplify code by importing a more popular class. No functional change.
Backport of r1725132 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java?rev=1725135&r1=1725134&r2=1725135&view=diff
==============================================================================
---
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
Sun Jan 17 21:15:16 2016
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
@@ -47,6 +46,7 @@ import static org.junit.Assert.fail;
import org.junit.Test;
+import org.apache.catalina.Context;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -110,8 +110,9 @@ public class TestTomcat extends TomcatBa
// String name = null;
//
// try {
-// Context initCtx = new InitialContext();
-// Context envCtx = (Context) initCtx.lookup("java:comp/env");
+// javax.naming.Context initCtx = new InitialContext();
+// javax.naming.Context envCtx =
+// (javax.naming.Context)
initCtx.lookup("java:comp/env");
// name = (String) envCtx.lookup(JNDI_ENV_NAME);
// } catch (NamingException e) {
// throw new IOException(e);
@@ -251,7 +252,7 @@ public class TestTomcat extends TomcatBa
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
- org.apache.catalina.Context ctx = tomcat.addContext("", null);
+ Context ctx = tomcat.addContext("", null);
// You can customize the context by calling
// its API
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
