Author: kkolinko
Date: Sun Jan 17 21:02:02 2016
New Revision: 1725127
URL: http://svn.apache.org/viewvc?rev=1725127&view=rev
Log:
Simplify code by importing a more popular class.
javax.naming.Context vs. org.apache.catalina.Context
The first is used only twice, the second is used a dozen of times.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1725127&r1=1725126&r2=1725127&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Sun Jan 17
21:02:02 2016
@@ -25,7 +25,6 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
@@ -42,6 +41,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.core.StandardContext;
import org.apache.catalina.core.StandardHost;
@@ -99,8 +99,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);
@@ -186,7 +187,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);
Tomcat.addServlet(ctx, "myServlet", new HelloWorld());
ctx.addServletMapping("/", "myServlet");
@@ -203,7 +204,7 @@ public class TestTomcat extends TomcatBa
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
- org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ Context ctxt = tomcat.addWebapp(
null, "/examples", appDir.getAbsolutePath());
ctxt.addApplicationListener(WsContextListener.class.getName());
tomcat.start();
@@ -220,7 +221,7 @@ public class TestTomcat extends TomcatBa
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
- org.apache.catalina.Context ctxt = tomcat.addWebapp(
+ Context ctxt = tomcat.addWebapp(
null, "/examples", appDir.getAbsolutePath());
ctxt.addApplicationListener(WsContextListener.class.getName());
@@ -237,7 +238,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);
Tomcat.addServlet(ctx, "myServlet", new HelloWorldSession());
ctx.addServletMapping("/", "myServlet");
@@ -267,7 +268,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);
// Enable JNDI - it is disabled by default
tomcat.enableNaming();
@@ -295,7 +296,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);
// Enable JNDI - it is disabled by default
tomcat.enableNaming();
@@ -332,7 +333,7 @@ public class TestTomcat extends TomcatBa
File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
// app dir is relative to server home
- org.apache.catalina.Context ctx =
+ Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
ctx.addApplicationListener(WsContextListener.class.getName());
@@ -373,7 +374,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);
InitCount initCount = new InitCount();
Tomcat.addServlet(ctx, "initCount", initCount);
@@ -429,7 +430,7 @@ public class TestTomcat extends TomcatBa
Tomcat tomcat = getTomcatInstance();
File appFile = new File("test/deployment/context.war");
- org.apache.catalina.Context context = tomcat.addWebapp(null,
+ Context context = tomcat.addWebapp(null,
"/test", appFile.getAbsolutePath());
assertEquals(StandardContext.class.getName(), context.getClass()
@@ -463,7 +464,7 @@ public class TestTomcat extends TomcatBa
}
File appFile = new File("test/deployment/context.war");
- org.apache.catalina.Context context = tomcat.addWebapp(null, "/test",
+ Context context = tomcat.addWebapp(null, "/test",
appFile.getAbsolutePath());
assertEquals(ReplicatedContext.class.getName(), context.getClass()
@@ -480,7 +481,7 @@ public class TestTomcat extends TomcatBa
}
File appFile = new File("test/deployment/context.war");
- org.apache.catalina.Context context = tomcat.addWebapp(host, "/test",
+ Context context = tomcat.addWebapp(host, "/test",
appFile.getAbsolutePath());
assertEquals(ReplicatedContext.class.getName(), context.getClass()
@@ -492,7 +493,7 @@ public class TestTomcat extends TomcatBa
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
- org.apache.catalina.Context ctx = tomcat.addContext(null, "", null);
+ Context ctx = tomcat.addContext(null, "", null);
assertEquals(StandardContext.class.getName(),
ctx.getClass().getName());
}
@@ -523,7 +524,7 @@ public class TestTomcat extends TomcatBa
}
// No file system docBase required
- org.apache.catalina.Context ctx = tomcat.addContext(host, "", null);
+ Context ctx = tomcat.addContext(host, "", null);
assertEquals(ReplicatedContext.class.getName(), ctx.getClass()
.getName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
