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

Issue #1743 WIP tests 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2019-09-19 09:00:03 +10:00
parent d029ae4dab
commit 881f17c6be
8 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/invoker.properties
View File

@ -1,2 +1,2 @@
invoker.goals = verify -fae
invoker.debug = true
#invoker.debug = true

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_distro_mojo_it/HelloServlet.java → jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_distro_mojo_it/HelloServlet.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.its.jetty_run_distro_mojo_it;
package org.eclipse.jetty.its.jetty_start_distro_mojo_it;
import java.io.IOException;
import javax.servlet.ServletException;

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_distro_mojo_it/PingServlet.java → jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_distro_mojo_it/PingServlet.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.its.jetty_run_distro_mojo_it;
package org.eclipse.jetty.its.jetty_start_distro_mojo_it;
import java.io.IOException;
import javax.servlet.ServletException;

4
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml
View File

@ -14,7 +14,7 @@
<servlet>
<servlet-name>Ping</servlet-name>
<servlet-class>org.eclipse.jetty.its.jetty_run_distro_mojo_it.PingServlet</servlet-class>
<servlet-class>org.eclipse.jetty.its.jetty_start_distro_mojo_it.PingServlet</servlet-class>
<load-on-startup>1</load-on-startup>
<init-param>
<param-name>extra1</param-name><param-value>123</param-value>
@ -30,4 +30,4 @@
</servlet-mapping>
</web-fragment>
</web-fragment>

6
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/pom.xml
View File

@ -95,9 +95,9 @@
<jettyBase>${basedir}/src/base</jettyBase>
<javaPath>${java.home}/bin/java</javaPath>
<jettyProperties>
<jettyProperty>jetty.server.dumpAfterStart=true</jettyProperty>
<jettyProperty>jetty.port.file=${jetty.port.file}</jettyProperty>
<jettyProperty>jetty.http.port=0</jettyProperty>
<jetty.server.dumpAfterStart>true</jetty.server.dumpAfterStart>
<jetty.port.file>${jetty.port.file}</jetty.port.file>
<jetty.http.port>0</jetty.http.port>
</jettyProperties>
<modules>jsp,jstl,testmod</modules>
</configuration>

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/postbuild.groovy
View File

@ -12,7 +12,7 @@ s.close()
File buildLog = new File( basedir, 'build.log' )
assert buildLog.text.contains( 'Started Server' )
assert buildLog.text.contains( 'Distro process starting' )
assert buildLog.text.contains( 'Running org.eclipse.jetty.maven.plugin.it.TestGetContent')
assert buildLog.text.contains( 'pingServlet ok')
assert buildLog.text.contains( 'helloServlet')

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

@ -391,11 +391,8 @@ public abstract class AbstractWebAppMojo extends AbstractMojo
/**
* The project's remote repositories to use for the resolution.
*
* @parameter default-value="${project.remoteArtifactRepositories}"
* @required
* @readonly
*/
@Parameter (defaultValue="${project.remoteArtifactRepositories}", readonly=true, required=true)
private List<ArtifactRepository> remoteRepositories;
/**

3
jetty-maven-plugin/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
View File

@ -1,3 +1,4 @@
org.eclipse.jetty.maven.plugin.MavenWebInfConfiguration
org.eclipse.jetty.maven.plugin.MavenMetaInfConfiguration
org.eclipse.jetty.maven.plugin.MavenQuickStartConfiguration
#Do not list this because Quickstart is not present for distro
#org.eclipse.jetty.maven.plugin.MavenQuickStartConfiguration