Browse Source

Don't scan classpath for any development servlet (#14604)

Change-Id: If3db4a35609260beff1079cbaafa8827643d9271
tags/7.4.0.beta1
Leif Åstrand 9 years ago
parent
commit
b914468e90

+ 0
- 28
WebContent/WEB-INF/web.xml View File

<param-name>application</param-name> <param-name>application</param-name>
<param-value>com.vaadin.tests.components.button.Buttons</param-value> <param-value>com.vaadin.tests.components.button.Buttons</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<async-supported>true</async-supported> <async-supported>true</async-supported>
</servlet> </servlet>
<servlet> <servlet>
<param-name>UI</param-name> <param-name>UI</param-name>
<param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<async-supported>true</async-supported> <async-supported>true</async-supported>
</servlet> </servlet>
<servlet> <servlet>
<param-name>UI</param-name> <param-name>UI</param-name>
<param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value> <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<async-supported>true</async-supported> <async-supported>true</async-supported>
</servlet> </servlet>


<param-name>legacyPropertyToString</param-name> <param-name>legacyPropertyToString</param-name>
<param-value>false</param-value> <param-value>false</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<init-param> <init-param>
<param-name>heartbeatInterval</param-name> <param-name>heartbeatInterval</param-name>
<param-value>301</param-value> <param-value>301</param-value>
because it modifies the VaadinService timeout parameters --> because it modifies the VaadinService timeout parameters -->
<servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
<servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
</servlet> </servlet>


<servlet> <servlet>
<param-name>pushmode</param-name> <param-name>pushmode</param-name>
<param-value>automatic</param-value> <param-value>automatic</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<async-supported>true</async-supported> <async-supported>true</async-supported>
</servlet> </servlet>


<param-name>UI</param-name> <param-name>UI</param-name>
<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
</init-param> </init-param>
<init-param>
<param-name>org.atmosphere.cpr.scanClassPath</param-name>
<param-value>false</param-value>
</init-param>
<async-supported>true</async-supported> <async-supported>true</async-supported>
</servlet> </servlet>



+ 14
- 0
uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java View File

import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector; import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.Scanner; import org.eclipse.jetty.util.Scanner;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
} }
} }


// Read web.xml to find all configured servlets
webappcontext.start();

// Reconfigure all servlets to avoid startup delay
for (ServletHolder servletHolder : webappcontext.getServletHandler()
.getServlets()) {
if (servletHolder
.getInitParameter("org.atmosphere.cpr.scanClassPath") == null) {
servletHolder.setInitParameter(
"org.atmosphere.cpr.scanClassPath", "false");
}
}

try { try {
server.start(); server.start();



Loading…
Cancel
Save