From 7355c6f8f50c6e41a1c6c82e4ec8cb825060a119 Mon Sep 17 00:00:00 2001 From: David Woldie Woldrich Date: Thu, 22 Feb 2018 15:34:17 -0800 Subject: [PATCH] Remove the isServletApi checks --- .../groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy | 8 ++------ .../groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy | 8 ++------ .../groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy | 8 ++------ .../groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy | 8 ++------ .../groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy | 8 ++------ .../groovy/org/akhikhl/gretty/TomcatConfigurerImpl.groovy | 6 +----- 6 files changed, 11 insertions(+), 35 deletions(-) diff --git a/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy index 42a690f38..c9e9f7f65 100644 --- a/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy +++ b/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy @@ -36,10 +36,6 @@ class JettyConfigurerImpl implements JettyConfigurer { private static final Logger log = LoggerFactory.getLogger(JettyConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - private SSOAuthenticatorFactory ssoAuthenticatorFactory private HashSessionManager sharedSessionManager @@ -201,8 +197,8 @@ class JettyConfigurerImpl implements JettyConfigurer { def createWebAppContext(Map serverParams, Map webappParams) { List webappClassPath = webappParams.webappClassPath JettyWebAppContext context = new JettyWebAppContext() - context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect { new File(it) }) - context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.findAll { !isServletApi(it) }.join(';')) + context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') }.collect { new File(it) }) + context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.join(';')) if (webappParams.webXml != null) context.setDescriptor(webappParams.webXml); FilteringClassLoader classLoader = new FilteringClassLoader(context) classLoader.addServerClass('ch.qos.logback.') diff --git a/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy index 3ef10e223..9129a1167 100644 --- a/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy +++ b/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy @@ -36,10 +36,6 @@ class JettyConfigurerImpl implements JettyConfigurer { private static final Logger log = LoggerFactory.getLogger(JettyConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - private SSOAuthenticatorFactory ssoAuthenticatorFactory private HashSessionManager sharedSessionManager @@ -201,8 +197,8 @@ class JettyConfigurerImpl implements JettyConfigurer { def createWebAppContext(Map serverParams, Map webappParams) { List webappClassPath = webappParams.webappClassPath JettyWebAppContext context = new JettyWebAppContext() - context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect { new File(it) }) - context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.findAll { !isServletApi(it) }.join(';')) + context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') }.collect { new File(it) }) + context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.join(';')) if (webappParams.webXml != null) context.setDescriptor(webappParams.webXml); FilteringClassLoader classLoader = new FilteringClassLoader(context) classLoader.addServerClass('ch.qos.logback.') diff --git a/libs/gretty-runner-jetty9/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty9/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy index 1589614f1..42e8ae344 100644 --- a/libs/gretty-runner-jetty9/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy +++ b/libs/gretty-runner-jetty9/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy @@ -33,10 +33,6 @@ class JettyConfigurerImpl implements JettyConfigurer { private static final Logger log = LoggerFactory.getLogger(JettyConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - private SSOAuthenticatorFactory ssoAuthenticatorFactory private HashSessionManager sharedSessionManager @@ -207,8 +203,8 @@ class JettyConfigurerImpl implements JettyConfigurer { String webappClasspathScanPattern = webappParams.webInfIncludeJarPattern JettyWebAppContext context = new JettyWebAppContext() context.setAttribute("org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern", webappClasspathScanPattern) - context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect { new File(it) }) - context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.findAll { !isServletApi(it) }.join(';')) + context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') }.collect { new File(it) }) + context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.join(';')) context.setInitParameter('org.eclipse.jetty.servlet.Default.useFileMappedBuffer', serverParams.productMode ? 'true' : 'false') if (webappParams.webXml != null) context.setDescriptor(webappParams.webXml); FilteringClassLoader classLoader = new FilteringClassLoader(context) diff --git a/libs/gretty-runner-jetty93/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty93/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy index 469947b83..8568f15f2 100644 --- a/libs/gretty-runner-jetty93/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy +++ b/libs/gretty-runner-jetty93/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy @@ -33,10 +33,6 @@ class JettyConfigurerImpl implements JettyConfigurer { private static final Logger log = LoggerFactory.getLogger(JettyConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - private SSOAuthenticatorFactory ssoAuthenticatorFactory private HashSessionManager sharedSessionManager @@ -205,8 +201,8 @@ class JettyConfigurerImpl implements JettyConfigurer { def createWebAppContext(Map serverParams, Map webappParams) { List webappClassPath = webappParams.webappClassPath JettyWebAppContext context = new JettyWebAppContext() - context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect { new File(it) }) - context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.findAll { !isServletApi(it) }.join(';')) + context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') }.collect { new File(it) }) + context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.join(';')) context.setInitParameter('org.eclipse.jetty.servlet.Default.useFileMappedBuffer', serverParams.productMode ? 'true' : 'false') context.setAttribute('org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern', '.*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$'); diff --git a/libs/gretty-runner-jetty94/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty94/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy index 06f3b17a7..7dc3cb160 100644 --- a/libs/gretty-runner-jetty94/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy +++ b/libs/gretty-runner-jetty94/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy @@ -32,10 +32,6 @@ class JettyConfigurerImpl implements JettyConfigurer { private static final Logger log = LoggerFactory.getLogger(JettyConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - private SSOAuthenticatorFactory ssoAuthenticatorFactory private SessionHandler sharedSessionHandler @@ -204,8 +200,8 @@ class JettyConfigurerImpl implements JettyConfigurer { def createWebAppContext(Map serverParams, Map webappParams) { List webappClassPath = webappParams.webappClassPath JettyWebAppContext context = new JettyWebAppContext() - context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect { new File(it) }) - context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.findAll { !isServletApi(it) }.join(';')) + context.setWebInfLib(webappClassPath.findAll { it.endsWith('.jar') }.collect { new File(it) }) + context.setExtraClasspath(webappClassPath.collect { it.endsWith('.jar') ? it : (it.endsWith('/') ? it : it + '/') }.join(';')) context.setInitParameter('org.eclipse.jetty.servlet.Default.useFileMappedBuffer', serverParams.productMode ? 'true' : 'false') context.setAttribute('org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern', '.*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$'); diff --git a/libs/gretty-runner-tomcat8/src/main/groovy/org/akhikhl/gretty/TomcatConfigurerImpl.groovy b/libs/gretty-runner-tomcat8/src/main/groovy/org/akhikhl/gretty/TomcatConfigurerImpl.groovy index 71d8909a6..ea584e813 100644 --- a/libs/gretty-runner-tomcat8/src/main/groovy/org/akhikhl/gretty/TomcatConfigurerImpl.groovy +++ b/libs/gretty-runner-tomcat8/src/main/groovy/org/akhikhl/gretty/TomcatConfigurerImpl.groovy @@ -24,10 +24,6 @@ class TomcatConfigurerImpl implements TomcatConfigurer { private static final Logger log = LoggerFactory.getLogger(TomcatConfigurerImpl) - protected static boolean isServletApi(String filePath) { - filePath.matches(/^.*servlet-api.*\.jar$/) - } - @Override ContextConfig createContextConfig(URL[] classpathUrls) { @@ -75,7 +71,7 @@ class TomcatConfigurerImpl implements TomcatConfigurer { if (webappParams.webXml) context.setAltDDName(webappParams.webXml); - Set classpathJarParentDirs = webappParams.webappClassPath.findAll { it.endsWith('.jar') && !isServletApi(it) }.collect({ + Set classpathJarParentDirs = webappParams.webappClassPath.findAll { it.endsWith('.jar') }.collect({ File jarFile = it.startsWith('file:') ? new File(new URI(it)) : new File(it) jarFile }) as Set