Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work in progress

This commit is contained in:
Greg Wilkins 2016-04-23 09:38:00 +10:00
parent 4e286266c0
commit a50e8825a3
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
View File

@ -358,7 +358,7 @@ public class JettyWebAppContext extends WebAppContext
try try
{ {
//inject configurations with config from maven plugin //inject configurations with config from maven plugin
for (Configuration c:getConfigurations()) for (Configuration c:getWebAppConfigurations())
{ {
if (c instanceof EnvConfiguration && getJettyEnvXml() != null) if (c instanceof EnvConfiguration && getJettyEnvXml() != null)
((EnvConfiguration)c).setJettyEnvXml(Resource.toURL(new File(getJettyEnvXml()))); ((EnvConfiguration)c).setJettyEnvXml(Resource.toURL(new File(getJettyEnvXml())));

2
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartConfiguration.java
View File

@ -128,7 +128,7 @@ public class QuickStartConfiguration extends AbstractConfiguration implements Co
throws Exception throws Exception
{ {
_quickStart=true; _quickStart=true;
context.setConfigurations(Arrays.stream(context.getConfigurations()) context.setConfigurations(context.getWebAppConfigurations().stream()
.filter(c->!__replacedConfigurations.contains(c.replaces())&&!__replacedConfigurations.contains(c.getClass())) .filter(c->!__replacedConfigurations.contains(c.replaces())&&!__replacedConfigurations.contains(c.getClass()))
.collect(Collectors.toList()).toArray(new Configuration[]{})); .collect(Collectors.toList()).toArray(new Configuration[]{}));
context.getMetaData().setWebXml(quickStartWebXml); context.getMetaData().setWebXml(quickStartWebXml);

9
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
View File

@ -65,7 +65,7 @@ public class WebAppContextTest
//test if no classnames set, its the defaults //test if no classnames set, its the defaults
WebAppContext wac = new WebAppContext(); WebAppContext wac = new WebAppContext();
assertThat(Arrays.asList(wac.getConfigurations()).stream().map(c->{return c.getClass().getName();}).collect(Collectors.toList()),Matchers.containsInAnyOrder(known_and_enabled)); assertThat(wac.getWebAppConfigurations().stream().map(c->{return c.getClass().getName();}).collect(Collectors.toList()),Matchers.containsInAnyOrder(known_and_enabled));
String[] classNames = wac.getConfigurationClasses(); String[] classNames = wac.getConfigurationClasses();
assertNotNull(classNames); assertNotNull(classNames);
@ -79,8 +79,7 @@ public class WebAppContextTest
{ {
WebAppContext wac = new WebAppContext(); WebAppContext wac = new WebAppContext();
wac.setServer(new Server()); wac.setServer(new Server());
System.err.println(Arrays.asList(wac.getConfigurations())); Assert.assertThat(wac.getWebAppConfigurations().stream().map(c->c.getClass().getName()).collect(Collectors.toList()),
Assert.assertThat(Arrays.asList(wac.getConfigurations()).stream().map(c->c.getClass().getName()).collect(Collectors.toList()),
Matchers.contains( Matchers.contains(
"org.eclipse.jetty.webapp.JmxConfiguration", "org.eclipse.jetty.webapp.JmxConfiguration",
"org.eclipse.jetty.webapp.WebInfConfiguration", "org.eclipse.jetty.webapp.WebInfConfiguration",
@ -97,14 +96,14 @@ public class WebAppContextTest
Configuration[] configs = {new WebInfConfiguration()}; Configuration[] configs = {new WebInfConfiguration()};
WebAppContext wac = new WebAppContext(); WebAppContext wac = new WebAppContext();
wac.setConfigurations(configs); wac.setConfigurations(configs);
assertTrue(Arrays.equals(configs, wac.getConfigurations())); Assert.assertThat(wac.getWebAppConfigurations(),Matchers.contains(configs));
//test that explicit config instances override any from server //test that explicit config instances override any from server
String[] classNames = {"x.y.z"}; String[] classNames = {"x.y.z"};
Server server = new Server(); Server server = new Server();
server.setAttribute(Configuration.ATTR, classNames); server.setAttribute(Configuration.ATTR, classNames);
wac.setServer(server); wac.setServer(server);
assertTrue(Arrays.equals(configs,wac.getConfigurations())); Assert.assertThat(wac.getWebAppConfigurations(),Matchers.contains(configs));
} }
@Test @Test