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

Issue #4363 Restore contextXml config for jetty maven plugin (#4367) 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2019-11-27 14:56:59 +11:00 committed by GitHub
parent cfd21864cf
commit c440a3f972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml
View File

@ -88,6 +88,7 @@
<configuration>
<systemPropertyVariables>
<jetty.port.file>${jetty.port.file}</jetty.port.file>
<context.path>/setbycontextxml</context.path>
<pingServlet>true</pingServlet>
<helloServlet>true</helloServlet>
<helloTestServlet>true</helloTestServlet>
@ -117,6 +118,7 @@
</systemProperties>
<nonBlocking>true</nonBlocking>
<jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
<contextXml>${basedir}/src/config/context.xml</contextXml>
<useTestScope>true</useTestScope>
</configuration>
</execution>

7
jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/config/context.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/setbycontextxml</Set>
</Configure>

5
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
View File

@ -539,9 +539,10 @@ public abstract class AbstractJettyMojo extends AbstractMojo
path = workDir.resolve(path);
contextXml = path.toFile().getAbsolutePath();
}
XmlConfiguration xmlConfiguration = new XmlConfiguration(Resource.toURL(path.toFile()));
getLog().info("Applying context xml file " + contextXml);
XmlConfiguration xmlConfiguration = new XmlConfiguration(Resource.toURL(path.toFile()));
xmlConfiguration.configure(webApp);
}
//If no contextPath was specified, go with default of project artifactid

22
jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
View File

@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*
*/
public class TestGetContent
{
@ -42,6 +42,9 @@ public class TestGetContent
throws Exception
{
int port = getPort();
String contextPath = getContextPath();
if (contextPath.endsWith("/"))
contextPath = contextPath.substring(0, contextPath.lastIndexOf('/'));
assertTrue(port > 0);
HttpClient httpClient = new HttpClient();
try
@ -50,16 +53,16 @@ public class TestGetContent
if (Boolean.getBoolean("helloServlet"))
{
String response = httpClient.GET("http://localhost:" + port + "/hello?name=beer").getContentAsString();
String response = httpClient.GET("http://localhost:" + port + contextPath + "/hello?name=beer").getContentAsString();
assertEquals("Hello beer", response.trim(), "it test " + System.getProperty("maven.it.name"));
response = httpClient.GET("http://localhost:" + port + "/hello?name=foo").getContentAsString();
response = httpClient.GET("http://localhost:" + port + contextPath + "/hello?name=foo").getContentAsString();
assertEquals("Hello foo", response.trim(), "it test " + System.getProperty("maven.it.name"));
System.out.println("helloServlet");
}
if (Boolean.getBoolean("pingServlet"))
{
System.out.println("pingServlet");
String response = httpClient.GET("http://localhost:" + port + "/ping?name=beer").getContentAsString();
String response = httpClient.GET("http://localhost:" + port + contextPath + "/ping?name=beer").getContentAsString();
assertEquals("pong beer", response.trim(), "it test " + System.getProperty("maven.it.name"));
System.out.println("pingServlet ok");
}
@ -67,7 +70,7 @@ public class TestGetContent
String pathToCheck = System.getProperty("pathToCheck");
if (StringUtils.isNotBlank(contentCheck))
{
String url = "http://localhost:" + port;
String url = "http://localhost:" + port + contextPath;
if (pathToCheck != null)
{
url += pathToCheck;
@ -79,9 +82,9 @@ public class TestGetContent
}
if (Boolean.getBoolean("helloTestServlet"))
{
String response = httpClient.GET("http://localhost:" + port + "/testhello?name=beer").getContentAsString();
String response = httpClient.GET("http://localhost:" + port + contextPath + "/testhello?name=beer").getContentAsString();
assertEquals("Hello from test beer", response.trim(), "it test " + System.getProperty("maven.it.name"));
response = httpClient.GET("http://localhost:" + port + "/testhello?name=foo").getContentAsString();
response = httpClient.GET("http://localhost:" + port + contextPath + "/testhello?name=foo").getContentAsString();
assertEquals("Hello from test foo", response.trim(), "it test " + System.getProperty("maven.it.name"));
System.out.println("helloServlet");
}
@ -92,6 +95,11 @@ public class TestGetContent
}
}
public static String getContextPath()
{
return System.getProperty("context.path", "/");
}
public static int getPort()
throws Exception
{