-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
- Loading branch information
Showing
18 changed files
with
586 additions
and
293 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/invoker.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| invoker.goals = verify -V -e | ||
| #test-compile failsafe:integration-test |
140 changes: 140 additions & 0 deletions
140
jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>org.eclipse.jetty.its.jetty-deploy-war-mojo-it</groupId> | ||
| <artifactId>jetty-simple-project</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
|
|
||
| <name>Jetty :: Simple deploy war mojo test</name> | ||
|
|
||
| <properties> | ||
| <jetty.version>@project.version@</jetty.version> | ||
| <jetty.port.file>${project.build.directory}/jetty-run-war-port.txt</jetty.port.file> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-client</artifactId> | ||
| <version>@project.version@</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.12</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.5.1</version> | ||
| <configuration> | ||
| <target>1.8</target> | ||
| <source>1.8</source> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>@surefireVersion@</version> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| <systemPropertyVariables> | ||
| <jetty.port.file>${jetty.port.file}</jetty.port.file> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-failsafe-plugin</artifactId> | ||
| <version>@surefireVersion@</version> | ||
| <configuration> | ||
| <systemPropertyVariables> | ||
| <jetty.port.file>${jetty.port.file}</jetty.port.file> | ||
| </systemPropertyVariables> | ||
| <includes> | ||
| <include>**/*TestHelloServlet*</include> | ||
| </includes> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>integration-test</id> | ||
| <goals> | ||
| <goal>integration-test</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>verify</id> | ||
| <goals> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-maven-plugin</artifactId> | ||
| <version>@project.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <id>start-jetty</id> | ||
| <phase>test-compile</phase> | ||
| <goals> | ||
| <goal>deploy-war</goal> | ||
| </goals> | ||
| <configuration> | ||
| <war>${project.build.directory}/bean-validation-webapp-2.25.1.war</war> | ||
| <nonBlocking>true</nonBlocking> | ||
| <systemProperties> | ||
| <systemProperty> | ||
| <name>jetty.port.file</name> | ||
| <value>${jetty.port.file}</value> | ||
| </systemProperty> | ||
| </systemProperties> | ||
| <jettyXml>${basedir}/src/config/jetty.xml</jettyXml> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>3.0.2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>load-war</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.glassfish.jersey.examples</groupId> | ||
| <artifactId>bean-validation-webapp</artifactId> | ||
| <version>2.25.1</version> | ||
| <type>war</type> | ||
| <overWrite>true</overWrite> | ||
| <includes>**</includes> | ||
| <outputDirectory>${project.build.directory}</outputDirectory> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
40 changes: 40 additions & 0 deletions
40
jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/config/jetty.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> | ||
|
|
||
| <Configure id="Server" class="org.eclipse.jetty.server.Server"> | ||
| <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> | ||
| <Set name="secureScheme">https</Set> | ||
| <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set> | ||
| <Set name="outputBufferSize">32768</Set> | ||
| <Set name="requestHeaderSize">8192</Set> | ||
| <Set name="responseHeaderSize">8192</Set> | ||
| <Set name="headerCacheSize">512</Set> | ||
| </New> | ||
|
|
||
| <Call name="addConnector"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.ServerConnector"> | ||
| <Arg name="server"><Ref refid="Server" /></Arg> | ||
| <Arg name="factories"> | ||
| <Array type="org.eclipse.jetty.server.ConnectionFactory"> | ||
| <Item> | ||
| <New class="org.eclipse.jetty.server.HttpConnectionFactory"> | ||
| <Arg name="config"><Ref refid="httpConfig" /></Arg> | ||
| </New> | ||
| </Item> | ||
| </Array> | ||
| </Arg> | ||
| <Call name="addLifeCycleListener"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener"> | ||
| <Set name="fileName"><Property name="jetty.port.file" default="port.txt"/></Set> | ||
| </New> | ||
| </Arg> | ||
| </Call> | ||
| <Set name="host"><Property name="jetty.host" /></Set> | ||
| <Set name="port"><Property name="jetty.port" default="0" />0</Set> | ||
| <Set name="idleTimeout">30000</Set> | ||
| </New> | ||
| </Arg> | ||
| </Call> | ||
| </Configure> |
Oops, something went wrong.