Issue #1743 WIP tests

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

jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml

@@ -65,7 +65,7 @@
         <executions>
           <execution>
             <id>start-jetty</id>
-            <phase>test-compile</phase>
+            <phase>process-test-classes</phase>
             <goals>
               <goal>newstart</goal>
             </goals>
@@ -79,7 +79,7 @@
               <stopKey>@jetty.stopKey@</stopKey>
               <jvmArgs>${jetty.jvmArgs}</jvmArgs>
               <jettyProperties>
-                <jettyProperty>jetty.port.file=${jetty.port.file}</jettyProperty>
+                <jetty.port.file>${jetty.port.file}</jetty.port.file>
               </jettyProperties>
             </configuration>
           </execution>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/common/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
   <parent>
-    <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+    <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
     <artifactId>jetty-multi-module-project</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/module/module-api/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
   <parent>
-    <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+    <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
     <artifactId>module</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/module/module-impl/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
   <parent>
-    <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+    <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
     <artifactId>module</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -10,7 +10,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+      <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
       <artifactId>module-api</artifactId>
     </dependency>
   </dependencies>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/module/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
   <parent>
-    <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+    <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
     <artifactId>jetty-multi-module-project</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+      <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
       <artifactId>common</artifactId>
     </dependency>
   </dependencies>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/pom.xml

@@ -8,7 +8,7 @@
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+  <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
   <artifactId>jetty-multi-module-project</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -31,17 +31,17 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+        <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
         <artifactId>common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+        <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
         <artifactId>module-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+        <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
         <artifactId>module-impl</artifactId>
         <version>${project.version}</version>
       </dependency>

jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
   <parent>
-    <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+    <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
     <artifactId>jetty-multi-module-project</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -15,13 +15,13 @@
       <artifactId>jetty-servlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>test.jetty-run-mojo-multi-module-single-war-it</groupId>
+      <groupId>test.jetty-start-mojo-multi-module-single-war-it</groupId>
       <artifactId>module-impl</artifactId>
     </dependency>
   </dependencies>
 
   <properties>
-    <jetty.port.file>${project.build.directory}/jetty-run-mojo.txt</jetty.port.file>
+    <jetty.port.file>${project.build.directory}/jetty-start-mojo.txt</jetty.port.file>
     <jetty.runType>EMBED</jetty.runType>
   </properties>
 

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

@@ -78,9 +78,9 @@
               <webApp>
                   <war>${project.build.directory}/${project.artifactId}-${project.version}</war>
               </webApp>
-              <systemProperties>
+              <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-forked-mojo-it/postbuild.groovy

@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-File outputLog = new File( basedir, 'jetty-simple-webapp/target/jetty-start-war.out' )
-assert outputLog.text.contains( 'Started Server' )
+File outputLog = new File( basedir, 'build.log' )
+assert outputLog.text.contains( 'Forked process starting' )
 assert outputLog.text.contains( 'Running org.eclipse.jetty.maven.plugin.it.TestGetContent')
 assert outputLog.text.contains( 'pingServlet ok')
 assert outputLog.text.contains( 'helloServlet')

jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml

@@ -90,7 +90,7 @@
             <id>run</id>
             <phase>test-compile</phase>
             <goals>
-              <goal>newrun</goal>
+              <goal>newstart</goal>
             </goals>
             <configuration>
               <systemProperties>