-
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.
Issue #5798 fix jetty runner startup error and add jsp support as well (
#6115) * Issue #5798 fix jetty runner startup error and add jsp support as well Signed-off-by: olivier lamy <[email protected]> * Add test to ensure jetty runner starts correctly Signed-off-by: olivier lamy <[email protected]> * remove unused imports Signed-off-by: olivier lamy <[email protected]> * fix help description Signed-off-by: olivier lamy <[email protected]> * improvement based on Joakim comment, add it test with the path Signed-off-by: olivier lamy <[email protected]>
- Loading branch information
Showing
8 changed files
with
397 additions
and
5 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
1 change: 1 addition & 0 deletions
1
jetty-runner/src/it/demo-simple-webapp-runner-with-path/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 @@ | ||
| invoker.goals = test |
139 changes: 139 additions & 0 deletions
139
jetty-runner/src/it/demo-simple-webapp-runner-with-path/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,139 @@ | ||
| <?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</groupId> | ||
| <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <packaging>war</packaging> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
|
|
||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| <classifier>tests</classifier> | ||
| <type>test-jar</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty.demos</groupId> | ||
| <artifactId>demo-simple-webapp</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-client</artifactId> | ||
| <version>@project.version@</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hamcrest</groupId> | ||
| <artifactId>hamcrest-core</artifactId> | ||
| <version>@hamcrest.version@</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>@maven.dependency.plugin.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-jetty-runner</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>jar</type> | ||
| <overWrite>false</overWrite> | ||
| <outputDirectory>${project.build.directory}/</outputDirectory> | ||
| <destFileName>jetty-runner.jar</destFileName> | ||
| </artifactItem> | ||
| <artifactItem> | ||
| <groupId>org.eclipse.jetty.demos</groupId> | ||
| <artifactId>demo-simple-webapp</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>war</type> | ||
| <overWrite>false</overWrite> | ||
| <outputDirectory>${project.build.directory}</outputDirectory> | ||
| <destFileName>demo-simple-webapp.war</destFileName> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| <overWriteReleases>false</overWriteReleases> | ||
| <overWriteSnapshots>true</overWriteSnapshots> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>@maven.exec.plugin.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <phase>generate-test-resources</phase> | ||
| <configuration> | ||
| <outputFile>${project.build.directory}/jetty-runner.log</outputFile> | ||
| <async>true</async> | ||
| <executable>${java.home}/bin/java</executable> | ||
| <arguments> | ||
| <argument>-jar</argument> | ||
| <argument>${project.build.directory}/jetty-runner.jar</argument> | ||
| <argument>--out</argument> | ||
| <argument>${project.build.directory}/jetty-runner.out</argument> | ||
| <argument>--port</argument> | ||
| <argument>0</argument> | ||
| <argument>--path</argument> | ||
| <argument>french-chocolate-rocks</argument> | ||
| <argument>--server-uri-file</argument> | ||
| <argument>${project.build.directory}/server-uri.txt</argument> | ||
| <argument>${project.build.directory}/demo-simple-webapp.war</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>@maven.surefire.version@</version> | ||
| <configuration> | ||
| <includes> | ||
| <include>IntegrationTest*.java</include> | ||
| </includes> | ||
| <systemPropertyVariables> | ||
| </systemPropertyVariables> | ||
| <dependenciesToScan> | ||
| <dependency>org.eclipse.jetty:jetty-runner</dependency> | ||
| </dependenciesToScan> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
1 change: 1 addition & 0 deletions
1
jetty-runner/src/it/demo-simple-webapp-runner/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 @@ | ||
| invoker.goals = test |
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,139 @@ | ||
| <?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</groupId> | ||
| <artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <packaging>war</packaging> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
|
|
||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| <classifier>tests</classifier> | ||
| <type>test-jar</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty.demos</groupId> | ||
| <artifactId>demo-simple-webapp</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>war</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-client</artifactId> | ||
| <version>@project.version@</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hamcrest</groupId> | ||
| <artifactId>hamcrest-core</artifactId> | ||
| <version>@hamcrest.version@</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>@maven.dependency.plugin.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-jetty-runner</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-runner</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>jar</type> | ||
| <overWrite>false</overWrite> | ||
| <outputDirectory>${project.build.directory}/</outputDirectory> | ||
| <destFileName>jetty-runner.jar</destFileName> | ||
| </artifactItem> | ||
| <artifactItem> | ||
| <groupId>org.eclipse.jetty.demos</groupId> | ||
| <artifactId>demo-simple-webapp</artifactId> | ||
| <version>@project.version@</version> | ||
| <type>war</type> | ||
| <overWrite>false</overWrite> | ||
| <outputDirectory>${project.build.directory}</outputDirectory> | ||
| <destFileName>demo-simple-webapp.war</destFileName> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| <overWriteReleases>false</overWriteReleases> | ||
| <overWriteSnapshots>true</overWriteSnapshots> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>@maven.exec.plugin.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <phase>generate-test-resources</phase> | ||
| <configuration> | ||
| <outputFile>${project.build.directory}/jetty-runner.log</outputFile> | ||
| <async>true</async> | ||
| <executable>${java.home}/bin/java</executable> | ||
| <arguments> | ||
| <!-- <argument>-Xdebug</argument>--> | ||
| <!-- <argument>-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</argument>--> | ||
| <argument>-jar</argument> | ||
| <argument>${project.build.directory}/jetty-runner.jar</argument> | ||
| <argument>--out</argument> | ||
| <argument>${project.build.directory}/jetty-runner.out</argument> | ||
| <argument>--port</argument> | ||
| <argument>0</argument> | ||
| <argument>--server-uri-file</argument> | ||
| <argument>${project.build.directory}/server-uri.txt</argument> | ||
| <argument>${project.build.directory}/demo-simple-webapp.war</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>@maven.surefire.version@</version> | ||
| <configuration> | ||
| <includes> | ||
| <include>IntegrationTest*.java</include> | ||
| </includes> | ||
| <systemPropertyVariables> | ||
| </systemPropertyVariables> | ||
| <dependenciesToScan> | ||
| <dependency>org.eclipse.jetty:jetty-runner</dependency> | ||
| </dependenciesToScan> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
Oops, something went wrong.