reenabled more ee9 modules
This commit is contained in:
parent
77825755cc
commit
6b1dfec971
|
@ -20,6 +20,17 @@ package org.eclipse.jetty.io;
|
|||
*/
|
||||
public interface QuietException
|
||||
{
|
||||
static boolean isQuiet(Throwable throwable)
|
||||
{
|
||||
while (throwable != null)
|
||||
{
|
||||
if (throwable instanceof QuietException)
|
||||
return true;
|
||||
throwable = throwable.getCause();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
class Exception extends java.lang.Exception implements QuietException
|
||||
{
|
||||
public Exception()
|
||||
|
|
|
@ -757,7 +757,7 @@ public class ServletRequestState
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!(failure instanceof QuietException))
|
||||
if (!QuietException.isQuiet(failure))
|
||||
LOG.warn(failure.toString());
|
||||
if (LOG.isDebugEnabled())
|
||||
LOG.debug("Async error", failure);
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<instructions>
|
||||
<Bundle-Description>Jetty-specific ServletContainerInitializer for Jasper</Bundle-Description>
|
||||
<Export-Package>
|
||||
org.eclipse.jetty.ee9.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
|
||||
org.eclipse.jetty.ee9.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee9.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
|
||||
</Export-Package>
|
||||
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
|
||||
</Require-Capability>
|
||||
|
|
|
@ -75,7 +75,7 @@ public class JettyJasperInitializer extends JasperInitializer
|
|||
@Override
|
||||
public TldScanner newTldScanner(ServletContext context, boolean namespaceAware, boolean validate, boolean blockExternal)
|
||||
{
|
||||
String tmp = context.getInitParameter("org.eclipse.jetty.jsp.precompiled");
|
||||
String tmp = context.getInitParameter("org.eclipse.jetty.ee9.jsp.precompiled");
|
||||
if (tmp != null && !tmp.equals("") && Boolean.valueOf(tmp))
|
||||
{
|
||||
if (LOG.isDebugEnabled())
|
||||
|
|
|
@ -58,36 +58,36 @@
|
|||
<scope>import</scope>
|
||||
</dependency>
|
||||
<!-- Jetty EE 9 Dependencies -->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-annotations</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-apache-jsp</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-cdi</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-glassfish-jstl</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-jaas</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-jaspi</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-annotations</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-apache-jsp</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-cdi</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-glassfish-jstl</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-jaas</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-jaspi</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-jspc-maven-plugin</artifactId>-->
|
||||
|
@ -103,11 +103,11 @@
|
|||
<!-- <artifactId>jetty-ee9-openid</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-plus</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.ee9</groupId>
|
||||
<artifactId>jetty-ee9-plus</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.eclipse.jetty.ee9</groupId>-->
|
||||
<!-- <artifactId>jetty-ee9-proxy</artifactId>-->
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
<servlet id="jsp">
|
||||
<servlet-name>jsp</servlet-name>
|
||||
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
|
||||
<servlet-class>org.eclipse.jetty.ee9.jsp.JettyJspServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>xpoweredBy</param-name>
|
||||
<param-value>false</param-value>
|
||||
|
|
|
@ -34,6 +34,7 @@ import jakarta.servlet.ServletResponse;
|
|||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
import org.eclipse.jetty.ee9.nested.Authentication;
|
||||
import org.eclipse.jetty.ee9.nested.UserIdentity;
|
||||
import org.eclipse.jetty.ee9.security.EmptyLoginService;
|
||||
import org.eclipse.jetty.ee9.security.IdentityService;
|
||||
|
@ -44,8 +45,6 @@ import org.eclipse.jetty.ee9.security.WrappedAuthConfiguration;
|
|||
import org.eclipse.jetty.ee9.security.authentication.DeferredAuthentication;
|
||||
import org.eclipse.jetty.ee9.security.authentication.LoginAuthenticator;
|
||||
import org.eclipse.jetty.ee9.security.authentication.SessionAuthentication;
|
||||
import org.eclipse.jetty.server.Authentication;
|
||||
import org.eclipse.jetty.server.Authentication.User;
|
||||
|
||||
import static org.eclipse.jetty.ee9.security.jaspi.JaspiAuthenticatorFactory.MESSAGE_LAYER;
|
||||
|
||||
|
@ -255,7 +254,7 @@ public class JaspiAuthenticator extends LoginAuthenticator
|
|||
|
||||
// most likely validatedUser is not needed here.
|
||||
@Override
|
||||
public boolean secureResponse(ServletRequest req, ServletResponse res, boolean mandatory, User validatedUser) throws ServerAuthException
|
||||
public boolean secureResponse(ServletRequest req, ServletResponse res, boolean mandatory, Authentication.User validatedUser) throws ServerAuthException
|
||||
{
|
||||
JaspiMessageInfo info = (JaspiMessageInfo)req.getAttribute("org.eclipse.jetty.security.jaspi.info");
|
||||
if (info == null)
|
||||
|
|
|
@ -40,7 +40,7 @@ public class BasicAuthenticationAuthModule extends BaseAuthModule
|
|||
|
||||
private String realmName;
|
||||
|
||||
private static final String REALM_KEY = "org.eclipse.jetty.security.jaspi.modules.RealmName";
|
||||
private static final String REALM_KEY = "org.eclipse.jetty.ee9.security.jaspi.modules.RealmName";
|
||||
|
||||
public BasicAuthenticationAuthModule()
|
||||
{
|
||||
|
|
|
@ -33,14 +33,14 @@ public class DefaultAuthConfigFactoryTest
|
|||
|
||||
private static final String MESSAGE_LAYER = "HttpServlet";
|
||||
|
||||
private final String jettyAuthConfigProvider = "org.eclipse.jetty.security.jaspi.provider.JaspiAuthConfigProvider";
|
||||
private final String jettyAuthConfigProvider = "org.eclipse.jetty.ee9.security.jaspi.provider.JaspiAuthConfigProvider";
|
||||
private final String appContext = "server /test";
|
||||
|
||||
private final Map<String, String> serverAuthModuleProperties = Map.of("ServerAuthModule",
|
||||
"org.eclipse.jetty.security.jaspi.modules.BasicAuthenticationAuthModule", "AppContextID", appContext,
|
||||
"org.eclipse.jetty.security.jaspi.modules.RealmName", "TestRealm");
|
||||
"org.eclipse.jetty.ee9.security.jaspi.modules.BasicAuthenticationAuthModule", "AppContextID", appContext,
|
||||
"org.eclipse.jetty.ee9.security.jaspi.modules.RealmName", "TestRealm");
|
||||
|
||||
private final String serverAuthModuleClassName = "org.eclipse.jetty.security.jaspi.modules.BasicAuthenticationAuthModule";
|
||||
private final String serverAuthModuleClassName = "org.eclipse.jetty.ee9.security.jaspi.modules.BasicAuthenticationAuthModule";
|
||||
|
||||
@Test
|
||||
public void testRegisterConfigProviderByClassName() throws Exception
|
||||
|
|
|
@ -25,16 +25,16 @@ import jakarta.security.auth.message.config.AuthConfigFactory;
|
|||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.eclipse.jetty.ee9.nested.AbstractHandler;
|
||||
import org.eclipse.jetty.ee9.nested.ContextHandler;
|
||||
import org.eclipse.jetty.ee9.nested.Request;
|
||||
import org.eclipse.jetty.ee9.security.AbstractLoginService;
|
||||
import org.eclipse.jetty.ee9.security.ConstraintMapping;
|
||||
import org.eclipse.jetty.ee9.security.ConstraintSecurityHandler;
|
||||
import org.eclipse.jetty.ee9.security.RolePrincipal;
|
||||
import org.eclipse.jetty.ee9.security.UserPrincipal;
|
||||
import org.eclipse.jetty.server.LocalConnector;
|
||||
import org.eclipse.jetty.server.Request;
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.handler.AbstractHandler;
|
||||
import org.eclipse.jetty.server.handler.ContextHandler;
|
||||
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
|
||||
import org.eclipse.jetty.util.security.Constraint;
|
||||
import org.eclipse.jetty.util.security.Credential;
|
||||
|
@ -94,14 +94,14 @@ public class JaspiTest
|
|||
{
|
||||
AuthConfigFactory factory = new DefaultAuthConfigFactory();
|
||||
|
||||
factory.registerConfigProvider("org.eclipse.jetty.security.jaspi.provider.JaspiAuthConfigProvider",
|
||||
Map.of("ServerAuthModule", "org.eclipse.jetty.security.jaspi.modules.BasicAuthenticationAuthModule",
|
||||
factory.registerConfigProvider("org.eclipse.jetty.ee9.security.jaspi.provider.JaspiAuthConfigProvider",
|
||||
Map.of("ServerAuthModule", "org.eclipse.jetty.ee9.security.jaspi.modules.BasicAuthenticationAuthModule",
|
||||
"AppContextID", "server /ctx",
|
||||
"org.eclipse.jetty.security.jaspi.modules.RealmName", "TestRealm"),
|
||||
"org.eclipse.jetty.ee9.security.jaspi.modules.RealmName", "TestRealm"),
|
||||
"HttpServlet", "server /ctx", "a test provider");
|
||||
|
||||
factory.registerConfigProvider("org.eclipse.jetty.security.jaspi.provider.JaspiAuthConfigProvider",
|
||||
Map.of("ServerAuthModule", "org.eclipse.jetty.security.jaspi.HttpHeaderAuthModule",
|
||||
factory.registerConfigProvider("org.eclipse.jetty.ee9.security.jaspi.provider.JaspiAuthConfigProvider",
|
||||
Map.of("ServerAuthModule", "org.eclipse.jetty.ee9.security.jaspi.HttpHeaderAuthModule",
|
||||
"AppContextID", "server /other"),
|
||||
"HttpServlet", "server /other", "another test provider");
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ import org.eclipse.jetty.util.resource.Resource;
|
|||
public class JspcMojo extends AbstractMojo
|
||||
{
|
||||
public static final String END_OF_WEBAPP = "</web-app>";
|
||||
public static final String PRECOMPILED_FLAG = "org.eclipse.jetty.jsp.precompiled";
|
||||
public static final String PRECOMPILED_FLAG = "org.eclipse.jetty.ee9.jsp.precompiled";
|
||||
|
||||
/**
|
||||
* JettyJspC
|
||||
|
|
|
@ -117,7 +117,7 @@ import org.slf4j.LoggerFactory;
|
|||
@ManagedObject("EE9 Context")
|
||||
public class ContextHandler extends ScopedHandler implements Attributes, Graceful, Supplier<Handler>
|
||||
{
|
||||
protected static final Environment __environment = Environment.ensure("ee9");
|
||||
public static final Environment ENVIRONMENT = Environment.ensure("ee9");
|
||||
public static final int SERVLET_MAJOR_VERSION = 5;
|
||||
public static final int SERVLET_MINOR_VERSION = 0;
|
||||
public static final Class<?>[] SERVLET_LISTENER_TYPES =
|
||||
|
@ -226,7 +226,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
public ContextHandler()
|
||||
{
|
||||
this(null, null, null);
|
||||
Objects.requireNonNull(__environment);
|
||||
Objects.requireNonNull(ENVIRONMENT);
|
||||
}
|
||||
|
||||
public ContextHandler(String contextPath)
|
||||
|
@ -607,6 +607,14 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
@Override
|
||||
protected void doStart() throws Exception
|
||||
{
|
||||
// If we are being started directly (rather than via a start of the CoreContextHandler), then
|
||||
// we need to run ourselves in the core context
|
||||
if (org.eclipse.jetty.server.handler.ContextHandler.getCurrentContext() != _coreContextHandler.getContext())
|
||||
{
|
||||
_coreContextHandler.getContext().call(this::doStart, null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (_logger == null)
|
||||
_logger = LoggerFactory.getLogger(ContextHandler.class.getName() + getLogNameSuffix());
|
||||
|
||||
|
@ -2481,7 +2489,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
protected void doStart() throws Exception
|
||||
{
|
||||
ClassLoader old = Thread.currentThread().getContextClassLoader();
|
||||
Thread.currentThread().setContextClassLoader(__environment.getClassLoader());
|
||||
Thread.currentThread().setContextClassLoader(ENVIRONMENT.getClassLoader());
|
||||
try
|
||||
{
|
||||
super.doStart();
|
||||
|
@ -2496,7 +2504,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
|
|||
protected void doStop() throws Exception
|
||||
{
|
||||
ClassLoader old = Thread.currentThread().getContextClassLoader();
|
||||
Thread.currentThread().setContextClassLoader(__environment.getClassLoader());
|
||||
Thread.currentThread().setContextClassLoader(ENVIRONMENT.getClassLoader());
|
||||
try
|
||||
{
|
||||
super.doStop();
|
||||
|
|
|
@ -837,7 +837,10 @@ public class HttpChannelState
|
|||
}
|
||||
else if (_requestState != RequestState.COMPLETE)
|
||||
{
|
||||
LOG.warn("unhandled in state {}", _requestState, new IllegalStateException(th));
|
||||
if (QuietException.isQuiet(th))
|
||||
LOG.debug("unhandled in state {}", _requestState, th);
|
||||
else
|
||||
LOG.warn("unhandled in state {}", _requestState, th);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,7 +18,8 @@ module org.eclipse.jetty.security.openid
|
|||
requires org.eclipse.jetty.util.ajax;
|
||||
|
||||
requires transitive org.eclipse.jetty.client;
|
||||
requires transitive org.eclipse.jetty.security;
|
||||
requires transitive org.eclipse.jetty.ee9.nested;
|
||||
requires transitive org.eclipse.jetty.ee9.security;
|
||||
|
||||
exports org.eclipse.jetty.ee9.security.openid;
|
||||
|
||||
|
|
|
@ -131,7 +131,7 @@
|
|||
org.apache.taglibs.standard.tei;version="2.0";resolution:=optional,
|
||||
org.apache.taglibs.standard.tlv;version="2.0";resolution:=optional,
|
||||
org.apache.tomcat;version="[10,11)";resolution:=optional,
|
||||
org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
|
||||
org.eclipse.jetty.ee9.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
|
||||
org.osgi.*,
|
||||
org.xml.*;resolution:=optional,
|
||||
org.xml.sax.*;resolution:=optional,
|
||||
|
@ -140,7 +140,7 @@
|
|||
org.w3c.dom.ls;resolution:=optional,
|
||||
javax.xml.parser;resolution:=optional
|
||||
</Import-Package>
|
||||
<DynamicImport-Package>org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",
|
||||
<DynamicImport-Package>org.eclipse.jetty.ee9.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",
|
||||
org.apache.jasper.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))",
|
||||
org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))"
|
||||
</DynamicImport-Package>
|
||||
|
|
|
@ -277,7 +277,7 @@
|
|||
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
<servlet id="jsp">
|
||||
<servlet-name>jsp</servlet-name>
|
||||
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
|
||||
<servlet-class>org.eclipse.jetty.ee9.jsp.JettyJspServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>logVerbosityLevel</param-name>
|
||||
<param-value>DEBUG</param-value>
|
||||
|
|
|
@ -277,7 +277,7 @@
|
|||
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
<servlet id="jsp">
|
||||
<servlet-name>jsp</servlet-name>
|
||||
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
|
||||
<servlet-class>org.eclipse.jetty.ee9.jsp.JettyJspServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>logVerbosityLevel</param-name>
|
||||
<param-value>DEBUG</param-value>
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
<servlet id="jsp">
|
||||
<servlet-name>jsp</servlet-name>
|
||||
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
|
||||
<servlet-class>org.eclipse.jetty.ee9.jsp.JettyJspServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>xpoweredBy</param-name>
|
||||
<param-value>false</param-value>
|
||||
|
|
|
@ -33,7 +33,7 @@ public class JaasConfiguration extends AbstractConfiguration
|
|||
{
|
||||
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
|
||||
addDependents(WebAppConfiguration.class);
|
||||
protectAndExpose("org.eclipse.jetty.jaas.");
|
||||
protectAndExpose("org.eclipse.jetty.ee9.jaas.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -41,7 +41,7 @@ public class JaasConfiguration extends AbstractConfiguration
|
|||
{
|
||||
try
|
||||
{
|
||||
return Loader.loadClass("org.eclipse.jetty.jaas.JAASLoginService") != null;
|
||||
return Loader.loadClass("org.eclipse.jetty.ee9.jaas.JAASLoginService") != null;
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
|
|
@ -39,7 +39,7 @@ public class JaspiConfiguration extends AbstractConfiguration
|
|||
{
|
||||
try
|
||||
{
|
||||
return Loader.loadClass("org.eclipse.jetty.security.jaspi.JaspiAuthenticator") != null;
|
||||
return Loader.loadClass("org.eclipse.jetty.ee9.security.jaspi.JaspiAuthenticator") != null;
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
|
|
@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
|
|||
/**
|
||||
* <p>JSP Configuration</p>
|
||||
* <p>This configuration configures the WebAppContext server/system classes to
|
||||
* be able to see the org.eclipse.jetty.jsp and org.eclipse.jetty.apache packages.
|
||||
* be able to see the org.eclipse.jetty.ee9.jsp and org.eclipse.jetty.apache packages.
|
||||
* This class is defined in the webapp package, as it implements the {@link Configuration} interface,
|
||||
* which is unknown to the jsp package.
|
||||
* </p>
|
||||
|
@ -33,8 +33,8 @@ public class JspConfiguration extends AbstractConfiguration
|
|||
{
|
||||
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
|
||||
addDependents(WebAppConfiguration.class);
|
||||
protectAndExpose("org.eclipse.jetty.jsp.");
|
||||
expose("org.eclipse.jetty.apache.");
|
||||
protectAndExpose("org.eclipse.jetty.ee9.jsp.");
|
||||
expose("org.eclipse.jetty.ee9.apache.");
|
||||
hide("org.eclipse.jdt.");
|
||||
}
|
||||
|
||||
|
@ -43,7 +43,7 @@ public class JspConfiguration extends AbstractConfiguration
|
|||
{
|
||||
try
|
||||
{
|
||||
return Loader.loadClass("org.eclipse.jetty.jsp.JettyJspServlet") != null;
|
||||
return Loader.loadClass("org.eclipse.jetty.ee9.jsp.JettyJspServlet") != null;
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
|
|
@ -524,6 +524,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
|
|||
@Override
|
||||
protected void doStart() throws Exception
|
||||
{
|
||||
ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
|
||||
try
|
||||
{
|
||||
_metadata.setAllowDuplicateFragmentNames(isAllowDuplicateFragmentNames());
|
||||
|
@ -531,6 +532,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
|
|||
_metadata.setValidateXml((validate != null && validate));
|
||||
wrapConfigurations();
|
||||
preConfigure();
|
||||
Thread.currentThread().setContextClassLoader(getClassLoader());
|
||||
super.doStart();
|
||||
postConfigure();
|
||||
|
||||
|
@ -546,6 +548,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
|
|||
if (isThrowUnavailableOnStartupException())
|
||||
throw t;
|
||||
}
|
||||
finally
|
||||
{
|
||||
Thread.currentThread().setContextClassLoader(oldLoader);
|
||||
}
|
||||
}
|
||||
|
||||
private void wrapConfigurations()
|
||||
|
@ -944,14 +950,14 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
|
|||
name = String.format("%s@%x", name, hashCode());
|
||||
|
||||
dumpObjects(out, indent,
|
||||
Dumpable.named("environment", __environment.getName()),
|
||||
Dumpable.named("environment", ENVIRONMENT.getName()),
|
||||
new ClassLoaderDump(getClassLoader()),
|
||||
new DumpableCollection("Systemclasses " + name, systemClasses),
|
||||
new DumpableCollection("Serverclasses " + name, serverClasses),
|
||||
new DumpableCollection("Configurations " + name, _configurations),
|
||||
new DumpableCollection("Handler attributes " + name, getAttributes().asAttributeMap().entrySet()),
|
||||
new DumpableCollection("Context attributes " + name, getServletContext().getContextHandler().asAttributeMap().entrySet()),
|
||||
new DumpableCollection("Environment attributes " + name, __environment.asAttributeMap().entrySet()),
|
||||
new DumpableCollection("Environment attributes " + name, ENVIRONMENT.asAttributeMap().entrySet()),
|
||||
new DumpableCollection("EventListeners " + this, getEventListeners()),
|
||||
new DumpableCollection("Initparams " + name, getInitParams().entrySet())
|
||||
);
|
||||
|
|
|
@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test;
|
|||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hamcrest.Matchers.is;
|
||||
import static org.hamcrest.Matchers.notNullValue;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
|
@ -298,8 +299,8 @@ public class ClassMatcherTest
|
|||
public void testJvmModule()
|
||||
{
|
||||
URI uri = TypeUtil.getLocationOfClass(String.class);
|
||||
System.err.println(uri);
|
||||
System.err.println(uri.toString().split("/")[0]);
|
||||
System.err.println(uri.toString().split("/")[1]);
|
||||
assertThat(uri, notNullValue());
|
||||
assertThat(uri.getScheme(), is("jrt"));
|
||||
assertThat(uri.getPath(), is("/java.base"));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,6 +18,8 @@ import java.util.concurrent.TimeUnit;
|
|||
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
@ -25,14 +27,28 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
|||
public class StandardDescriptorProcessorTest
|
||||
{
|
||||
//TODO add tests for other methods
|
||||
Server _server;
|
||||
|
||||
@BeforeEach
|
||||
public void beforeEach() throws Exception
|
||||
{
|
||||
_server = new Server();
|
||||
_server.start();
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
public void afterEach() throws Exception
|
||||
{
|
||||
_server.stop();
|
||||
Configurations.getKnown().forEach(System.err::println);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVisitSessionConfig() throws Exception
|
||||
{
|
||||
File webXml = MavenTestingUtils.getTargetFile("test-classes/web-session-config.xml");
|
||||
Server server = new Server();
|
||||
WebAppContext wac = new WebAppContext();
|
||||
wac.setServer(server);
|
||||
wac.setServer(_server);
|
||||
wac.setResourceBase(MavenTestingUtils.getTargetTestingDir("testSessionConfig").getAbsolutePath());
|
||||
wac.setDescriptor(webXml.toURI().toURL().toString());
|
||||
wac.start();
|
||||
|
|
|
@ -204,7 +204,7 @@ public class WebAppContextTest
|
|||
//test that explicit config instances override any from server
|
||||
String[] classNames = {"x.y.z"};
|
||||
Server server = newServer();
|
||||
server.setAttribute(Configuration.ATTR, classNames);
|
||||
server.setAttribute(Configurations.class.getName(), classNames);
|
||||
wac.setServer(server);
|
||||
assertThat(wac.getConfigurations(), Matchers.contains(configs));
|
||||
}
|
||||
|
|
|
@ -51,16 +51,15 @@
|
|||
<module>jetty-ee9-webapp</module>
|
||||
<module>jetty-ee9-servlets</module>
|
||||
<module>jetty-ee9-demos</module>
|
||||
<!-- <module>jetty-ee9-apache-jsp</module>-->
|
||||
<!-- <module>jetty-ee9-glassfish-jstl</module>-->
|
||||
<module>jetty-ee9-apache-jsp</module>
|
||||
<module>jetty-ee9-glassfish-jstl</module>
|
||||
<module>jetty-ee9-annotations</module>
|
||||
<!-- <module>jetty-ee9-ant</module>-->
|
||||
<!-- <module>jetty-ee9-cdi</module>-->
|
||||
<module>jetty-ee9-cdi</module>
|
||||
<!-- <module>jetty-ee9-fcgi-server-proxy</module>-->
|
||||
<!-- <module>jetty-ee9-http-spi</module>-->
|
||||
<module>jetty-ee9-jaas</module>
|
||||
<!-- <module>jetty-ee9-jaspi</module>-->
|
||||
<!-- <module>jetty-ee9-jspc-maven-plugin</module>-->
|
||||
<module>jetty-ee9-jaspi</module>
|
||||
<module>jetty-ee9-jspc-maven-plugin</module>
|
||||
<!-- <module>jetty-ee9-maven-plugin</module>-->
|
||||
<!-- <module>jetty-ee9-openid</module>-->
|
||||
<!-- <module>jetty-ee9-osgi</module>-->
|
||||
|
|
Loading…
Reference in New Issue