Issue #1743 WIP tests

Signed-off-by: Jan Bartel <janb@webtide.com>

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/invoker.properties

@@ -1,2 +0,0 @@
-invoker.goals = verify -V
-#test-compile failsafe:integration-test

jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/invoker.properties

@@ -0,0 +1,2 @@
+invoker.goals = verify -V -X
+#test-compile failsafe:integration-test

jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-base/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+    <groupId>org.eclipse.jetty.its.jetty-start-war-distro-mojo-it</groupId>
     <artifactId>jetty-simple-project</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>

jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+    <groupId>org.eclipse.jetty.its.jetty-start-war-distro-mojo-it</groupId>
     <artifactId>jetty-simple-project</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
@@ -14,12 +14,12 @@
   <name>Jetty :: Simple :: Webapp</name>
 
   <properties>
-    <jetty.port.file>${project.build.directory}/jetty-run-war-port.txt</jetty.port.file>
-    <jetty.runType>EMBED</jetty.runType>
+    <jetty.port.file>${project.build.directory}/jetty-start-war-distro-port.txt</jetty.port.file>
+    <jetty.runType>DISTRO</jetty.runType>
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+      <groupId>org.eclipse.jetty.its.jetty-start-war-distro-mojo-it</groupId>
       <artifactId>jetty-simple-base</artifactId>
     </dependency>
     <dependency>
@@ -100,15 +100,17 @@
         <executions>
           <execution>
             <id>start-jetty</id>
-            <phase>test-compile</phase>
+            <phase>pre-integration-test</phase>
             <goals>
-              <goal>newrun-war</goal>
+              <goal>newstart-war</goal>
             </goals>
             <configuration>
-              <nonBlocking>true</nonBlocking>
-              <systemProperties>
+              <webApp>
+                   <war>${project.build.directory}/${project.artifactId}-${project.version}</war>
+              </webApp>
+              <jettyProperties>
                   <jetty.port.file>${jetty.port.file}</jetty.port.file>
-              </systemProperties>
+              </jettyProperties>
               <jettyXmls>
                   <jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
               </jettyXmls>

jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/pom.xml

@@ -8,7 +8,7 @@
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+  <groupId>org.eclipse.jetty.its.jetty-start-war-distro-mojo-it</groupId>
   <artifactId>jetty-simple-project</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -30,7 +30,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+        <groupId>org.eclipse.jetty.its.jetty-start-war-distro-mojo-it</groupId>
         <artifactId>jetty-simple-base</artifactId>
         <version>${project.version}</version>
       </dependency>

jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/postbuild.groovy

@@ -17,7 +17,7 @@
  * under the License.
  */
 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')

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDistroForker.java

@@ -229,6 +229,8 @@ public class JettyDistroForker extends AbstractForker
         ProcessBuilder builder = new ProcessBuilder(cmd);
         builder.directory(workDir);
         
+        PluginLog.getLog().info("Distro process starting");
+        
         //set up extra environment vars if there are any
         if (!env.isEmpty())
             builder.environment().putAll(env);