Author: fschumacher
Date: Tue Jan 13 17:33:58 2015
New Revision: 1651420
URL: http://svn.apache.org/r1651420
Log:
Enable custom context class when using embedded tomcat
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 17:33:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1651420&r1=1651419&r2=1651420&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Jan
13 17:33:58 2015
@@ -18,6 +18,7 @@ package org.apache.catalina.startup;
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Principal;
@@ -496,7 +497,7 @@ public class Tomcat {
public Context addContext(Host host, String contextPath, String
contextName,
String dir) {
silence(host, contextPath);
- Context ctx = new StandardContext();
+ Context ctx = createContext(host, contextPath);
ctx.setName(contextName);
ctx.setPath(contextPath);
ctx.setDocBase(dir);
@@ -523,7 +524,7 @@ public class Tomcat {
public Context addWebapp(Host host, String url, String name, String path) {
silence(host, url);
- Context ctx = new StandardContext();
+ Context ctx = createContext(host, url);
ctx.setName(name);
ctx.setPath(url);
ctx.setDocBase(path);
@@ -689,6 +690,40 @@ public class Tomcat {
}
/**
+ * Create the configured {@link Context} for the given <code>host</code>.
+ * The default constructor of the class that was configured with
+ * {@link StandardHost#setContextClass(String)} will be used
+ *
+ * @param host
+ * host for which the {@link Context} should be created, or
+ * <code>null</code> if default host should be used
+ * @param url
+ * path of the webapp which should get the {@link Context}
+ * @return newly created {@link Context}
+ */
+ private Context createContext(Host host, String url) {
+ String contextClass = StandardContext.class.getName();
+ if (host == null) {
+ host = this.getHost();
+ }
+ if (host instanceof StandardHost) {
+ contextClass = ((StandardHost) host).getContextClass();
+ }
+ try {
+ return (Context) Class.forName(contextClass).getConstructor()
+ .newInstance();
+ } catch (InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException
+ | ClassNotFoundException e) {
+ throw new IllegalArgumentException(
+ "Can't instantiate context-class " + contextClass
+ + " for host " + host + " and url "
+ + url, e);
+ }
+ }
+
+ /**
* Enables JNDI naming which is disabled by default. Server must implement
* {@link Lifecycle} in order for the {@link NamingContextListener} to be
* used.
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1651420&r1=1651419&r2=1651420&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue
Jan 13 17:33:58 2015
@@ -38,10 +38,13 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
-
+import org.apache.catalina.Host;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.ha.context.ReplicatedContext;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
@@ -417,4 +420,109 @@ public class TestTomcat extends TomcatBa
assertEquals("WAR_CONTEXT", context.getSessionCookieName());
}
+
+ @Test
+ public void testGetDefaultContextPerAddWebapp() {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appFile = new File("test/deployment/context.war");
+ org.apache.catalina.Context context = tomcat.addWebapp(null,
+ "/test", appFile.getAbsolutePath());
+
+ assertEquals(StandardContext.class.getName(), context.getClass()
+ .getName());
+ }
+
+ @Test
+ public void testGetBrokenContextPerAddWepapp() {
+ Tomcat tomcat = getTomcatInstance();
+ Host host = tomcat.getHost();
+ if (host instanceof StandardHost) {
+ ((StandardHost) host).setContextClass("InvalidContextClassName");
+ }
+
+ try {
+ File appFile = new File("test/deployment/context.war");
+ tomcat.addWebapp(null, "/test", appFile.getAbsolutePath());
+ fail();
+ } catch (IllegalArgumentException e) {
+ // OK
+ }
+ }
+
+ @Test
+ public void testGetCustomContextPerAddWebappWithNullHost() {
+ Tomcat tomcat = getTomcatInstance();
+ Host host = tomcat.getHost();
+ if (host instanceof StandardHost) {
+ ((StandardHost) host).setContextClass(ReplicatedContext.class
+ .getName());
+ }
+
+ File appFile = new File("test/deployment/context.war");
+ org.apache.catalina.Context context = tomcat.addWebapp(null, "/test",
+ appFile.getAbsolutePath());
+
+ assertEquals(ReplicatedContext.class.getName(), context.getClass()
+ .getName());
+ }
+
+ @Test
+ public void testGetCustomContextPerAddWebappWithHost() {
+ Tomcat tomcat = getTomcatInstance();
+ Host host = tomcat.getHost();
+ if (host instanceof StandardHost) {
+ ((StandardHost) host).setContextClass(ReplicatedContext.class
+ .getName());
+ }
+
+ File appFile = new File("test/deployment/context.war");
+ org.apache.catalina.Context context = tomcat.addWebapp(host, "/test",
+ appFile.getAbsolutePath());
+
+ assertEquals(ReplicatedContext.class.getName(), context.getClass()
+ .getName());
+ }
+
+ @Test
+ public void testGetDefaultContextPerAddContext() {
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ org.apache.catalina.Context ctx = tomcat.addContext(null, "", null);
+ assertEquals(StandardContext.class.getName(),
ctx.getClass().getName());
+ }
+
+ @Test
+ public void testGetBrokenContextPerAddContext() {
+ Tomcat tomcat = getTomcatInstance();
+ Host host = tomcat.getHost();
+ if (host instanceof StandardHost) {
+ ((StandardHost) host).setContextClass("InvalidContextClassName");
+ }
+
+ // No file system docBase required
+ try {
+ tomcat.addContext(null, "", null);
+ fail();
+ } catch (IllegalArgumentException e) {
+ // OK
+ }
+ }
+
+ @Test
+ public void testGetCustomContextPerAddContextWithHost() {
+ Tomcat tomcat = getTomcatInstance();
+ Host host = tomcat.getHost();
+ if (host instanceof StandardHost) {
+ ((StandardHost) host).setContextClass(ReplicatedContext.class
+ .getName());
+ }
+
+ // No file system docBase required
+ org.apache.catalina.Context ctx = tomcat.addContext(host, "", null);
+ assertEquals(ReplicatedContext.class.getName(), ctx.getClass()
+ .getName());
+ }
+
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1651420&r1=1651419&r2=1651420&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jan 13 17:33:58 2015
@@ -45,6 +45,13 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.18 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <add>
+ <bug>57431</bug> Enable usage of custom class for context creation
when using embedded tomcat. (fschumacher)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.17 (markt)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
