svn commit: r1808287 [1/2] - in /maven/plugins/trunk/maven-ear-plugin: ./ src/it/ src/it/MEAR-243-skinny-wars-provided/ src/it/non-skinny-wars/ src/it/packaging-includes/ src/it/skinny-wars-filenamemapping-full/ src/it/skinny-wars-filenamemapping-full/...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1808287 [1/2] - in /maven/plugins/trunk/maven-ear-plugin: ./ src/it/ src/it/MEAR-243-skinny-wars-provided/ src/it/non-skinny-wars/ src/it/packaging-includes/ src/it/skinny-wars-filenamemapping-full/ src/it/skinny-wars-filenamemapping-full/...

khmarbaise
Author: khmarbaise
Date: Wed Sep 13 20:53:49 2017
New Revision: 1808287

URL: http://svn.apache.org/viewvc?rev=1808287&view=rev
Log:
[MEAR-171] Full customization of FileNameMapping is needed
 o Implemented full file name mapping by using
   maven-mapping shared component.
 o Made integration tests more reliable.
 o Changed all integration tests cause the default for the file name
   mapping is defined as:
   @{groupId}@-@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@
 o Introduced a new parameter outputFileNameMapping which
   can be used to change the mapping based on the maven-mapping
   component.

Removed:
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/output/
    maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/output/
Modified:
    maven/plugins/trunk/maven-ear-plugin/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/non-skinny-wars/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-javaee5/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/invoker.properties
    maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/verify.bsh
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
    maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
    maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-023/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-024/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-025/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-027/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-028/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-029/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-030/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-031/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-032/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-033/expected-META-INF/jboss-app.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-034/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-036/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-037/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-038/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-039/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-040/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-041/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-042/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-043/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-044/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-045/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-046/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-047/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-048/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-049/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-050/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-051/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-052/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-056/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-057/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-060/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-061/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-062/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-064/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-065/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-066/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-067/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-068/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-068/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-069/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-070/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-071/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-072/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-073/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-074/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-075/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-076/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-077/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-078/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-078/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-079/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-080/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-081/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-082/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-083/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-084/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-085/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-086/expected-META-INF/application.xml
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Sep 13 20:53:49 2017
@@ -129,6 +129,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-mapping</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-verifier</artifactId>
       <version>1.3</version>
       <scope>test</scope>
@@ -246,10 +252,17 @@
             <configuration>
               <!-- NOTE: Must be synced with the repo path used by AbstractEarPluginIT -->
               <localRepositoryPath>${localRepositoryPath}</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
               <goals>
                 <goal>clean</goal>
                 <goal>package</goal>
               </goals>
+              <extraArtifacts>
+                <extraArtifact>org.apache.maven.plugins:maven-war-plugin:2.1.1:jar</extraArtifact>
+                <extraArtifact>org.apache.maven.plugins:maven-compiler-plugin:2.5.1:jar</extraArtifact>
+                <extraArtifact>org.apache.maven.plugins:maven-ejb-plugin:2.3:jar</extraArtifact>
+              </extraArtifacts>
             </configuration>
           </plugin>
           <plugin>

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/non-skinny-wars/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/non-skinny-wars/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/non-skinny-wars/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/non-skinny-wars/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.nonskinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh Wed Sep 13 20:53:49 2017
@@ -32,7 +32,7 @@ if ( !jarFile.isFile() )
 JarFile jar = new JarFile( jarFile );
 
 String[] includedEntries = {
-    "commons-lang-2.5.jar",
+    "commons-lang-commons-lang-2.5.jar",
     "META-INF/application.xml",
     "META-INF/MANIFEST.MF"
 };

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml Wed Sep 13 20:53:49 2017
@@ -37,16 +37,6 @@ under the License.
             <enabled>true</enabled>
           </snapshots>
         </repository>
-        <repository>
-          <id>local.snapshot</id>
-          <url>file://@localSnapshotRepositoryPath@</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/ear-module/pom.xml Wed Sep 13 20:53:49 2017
@@ -48,9 +48,14 @@ under the License.
         <artifactId>@project.artifactId@</artifactId>
         <version>@project.version@</version>
         <configuration>
+          <!--
+            ! By default the mapping is full
+            ! using groupId, artifactId, version, classifier and extension.
+            ! So we don't need to configure something here.
+           -->
+<!--           <outputFileNameMapping>...</outputFileNameMapping> -->
           <skinnyWars>true</skinnyWars>
           <defaultLibBundleDir>lib/</defaultLibBundleDir>
-          <fileNameMapping>full</fileNameMapping>
         </configuration>
       </plugin>
     </plugins>

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-full/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org-apache-maven-its-ear-skinnywars-war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-filenamemapping-no-version/ear-module/pom.xml Wed Sep 13 20:53:49 2017
@@ -50,6 +50,11 @@ under the License.
         <configuration>
           <skinnyWars>true</skinnyWars>
           <defaultLibBundleDir>lib/</defaultLibBundleDir>
+          <!--
+            ! Only artifactId.extension
+            ! no groupId/version etc.
+           -->
+          <outputFileNameMapping>@{artifactId}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
           <fileNameMapping>no-version</fileNameMapping>
         </configuration>
       </plugin>

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-javaee5/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-javaee5/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-javaee5/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-javaee5/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {
@@ -46,9 +46,9 @@ for ( String included : includedEntries
 
 Manifest manifest = jar.getManifest();
 String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( manifestClassPath != null && manifestClassPath.equals("lib/commons-lang-2.5.jar") )
+if ( manifestClassPath != null && manifestClassPath.equals("lib/commons-lang-commons-lang-2.5.jar") )
 {
-    throw new IllegalStateException( "Superfluous entry in war MANIFEST.MF: commons-lang-2.5.jar");
+    throw new IllegalStateException( "Superfluous entry in war MANIFEST.MF: commons-lang-commons-lang-2.5.jar");
 }
 
 String[] excludedEntries = {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh Wed Sep 13 20:53:49 2017
@@ -22,7 +22,7 @@ import java.util.*;
 import java.util.jar.*;
 import java.util.regex.*;
 
-File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/war-module-1.0.war" );
+File jarFile = new File( basedir, "ear-module/target/ear-module-1.0/org.apache.maven.its.ear.skinnywars-war-module-1.0.war" );
 System.out.println( "Checking for existence of " + jarFile );
 if ( !jarFile.isFile() )
 {
@@ -46,13 +46,13 @@ for ( String included : includedEntries
 
 Manifest manifest = jar.getManifest();
 String manifestClassPath = manifest.getMainAttributes().getValue("Class-Path");
-if ( !manifestClassPath.equals("commons-lang-2.5.jar") )
+if ( !manifestClassPath.equals("commons-lang-commons-lang-2.5.jar") )
 {
-    throw new IllegalStateException( "Missing entry in war MANIFEST.MF: commons-lang-2.5.jar");
+    throw new IllegalStateException( "Missing entry in war MANIFEST.MF: commons-lang-commons-lang-2.5.jar");
 }
 
 String[] excludedEntries = {
-    "WEB-INF/lib/commons-lang-2.5.jar"
+    "WEB-INF/lib/commons-lang-commons-lang-2.5.jar"
 };
 for ( String excluded : excludedEntries )
 {

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/invoker.properties?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/invoker.properties (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/invoker.properties Wed Sep 13 20:53:49 2017
@@ -16,4 +16,5 @@
 # under the License.
 
 # wildcard exclusions for dependencies not supported by Maven2
+# The first version which support * is as far as I know maven 3.2.5 RECHECK THIS!
 invoker.maven.version = 3.0+
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/verify.bsh?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/verify.bsh (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/transitive-excludes/verify.bsh Wed Sep 13 20:53:49 2017
@@ -33,7 +33,7 @@ Enumeration entries = ear.entries();
 while( entries.hasMoreElements() )
 {
   JarEntry entry = (JarEntry) entries.nextElement();
-  if( entry.getName().endsWith( ".jar" ) && !"maven-core-3.0.jar".equals( entry.getName() ) )
+  if( entry.getName().endsWith( ".jar" ) && !"org.apache.maven-maven-core-3.0.jar".equals( entry.getName() ) )
   {
     throw new IllegalStateException( "Unexpected archive entry: " + entry.getName() );
   }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java Wed Sep 13 20:53:49 2017
@@ -23,8 +23,9 @@ import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.ear.output.FileNameMappingFactory;
 import org.apache.maven.plugins.ear.util.ArtifactRepository;
+import org.apache.maven.shared.mapping.MappingUtils;
+import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.util.xml.XMLWriter;
 
 /**
@@ -247,23 +248,25 @@ public abstract class AbstractEarModule
     {
         if ( bundleFileName == null )
         {
-            bundleFileName = earExecutionContext.getFileNameMapping().mapFileName( artifact );
+            try
+            {
+                String outputFileNameMapping = earExecutionContext.getOutputFileNameMapping();
+                System.out.println( "*** outputFileNameMapping:" + outputFileNameMapping );
+                bundleFileName = MappingUtils.evaluateFileNameMapping( outputFileNameMapping, artifact );
+            }
+            catch ( InterpolationException e )
+            {
+                // We currently ignore this here, cause assumption is that
+                // has already been happened before..
+                // FIXME: Should be checked first.
+            }
+
+            // bundleFileName = earExecutionContext.getFileNameMapping().mapFileName( artifact );
         }
         return bundleFileName;
     }
 
     /**
-     * Based on MEAR-189 we need to get back
-     * the original file name under any circumstances.
-     *
-     * @return The original file name.
-     */
-    public String getOriginalBundleFileName()
-    {
-        return FileNameMappingFactory.getDefaultFileNameMapping().mapFileName( artifact );
-    }
-
-    /**
      * The alt-dd element specifies an optional URI to the post-assembly version of the deployment descriptor file for a
      * particular Java EE module. The URI must specify the full pathname of the deployment descriptor file relative to
      * the application's root directory.
@@ -327,10 +330,11 @@ public abstract class AbstractEarModule
         else if ( generateId )
         {
             // No module id was specified but one should be generated.
+            // FIXME: Should we use the mapping using outputFileNameMapping instead
+            // of doing this on our own?
             Artifact theArtifact = getArtifact();
-            String generatedId =
-                theArtifact.getType().toUpperCase() + "_" + theArtifact.getGroupId() + "."
-                    + theArtifact.getArtifactId();
+            String generatedId = theArtifact.getType().toUpperCase() + "_" + theArtifact.getGroupId() + "."
+                + theArtifact.getArtifactId();
             if ( null != theArtifact.getClassifier() && theArtifact.getClassifier().trim().length() > 0 )
             {
                 generatedId += "-" + theArtifact.getClassifier().trim();

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java Wed Sep 13 20:53:49 2017
@@ -111,22 +111,30 @@ public abstract class AbstractEarMojo
     private Boolean includeLibInApplicationXml = Boolean.FALSE;
 
     /**
-     * The file name mapping to use for all dependencies included in the EAR file. The following values are valid
-     * {@code standard}, {@code no-version}, {@code full}, {@code no-version-for-ejb}. The {@code standard} means the
-     * filename is the artifactId incl. the version of the artifact. The {@code no-version} means the files is only the
-     * artifactId without the version. The {@code full} means the filename is the groupId+artifactId+version of the
-     * artifact. The {@code no-version-for-ejb} means the filename is the artifactId without the version in case of
-     * {@code EJB} type.
+     * Only here to identify migration issues. The usage of this parameter will fail the build. If you need file name
+     * mapping please use {@link #outputFileNameMapping} instead.
+     *
+     * @deprecated
      */
     @Parameter
     private String fileNameMapping;
 
     /**
+     * The file name mapping to use for all dependencies included in the EAR file. The mapping between artifacts and the
+     * file names which is used within the EAR file. Details see
+     * <a href="http://maven.apache.org/shared/maven-mapping/index.html">Maven Mapping Reference</a>.
+     */
+    // CHECKSTYLE_OFF: LineLength
+    @Parameter( defaultValue = "@{groupId}@-@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@", required = true )
+    private String outputFileNameMapping;
+    // CHECKSTYLE_ON: LineLength
+
+    /**
      * When using a {@link #fileNameMapping} with versions, either use the {@code baseVersion} or the {@code version}.
      * When the artifact is a SNAPSHOT, {@code version} will always return a value with a {@code -SNAPSHOT} postfix
      * instead of the possible timestamped value.
      *
-     * @since 2.9
+     * @since 2.9 FIXME: Check what exactly this means!!!
      */
     @Parameter
     private Boolean useBaseVersion;
@@ -202,12 +210,13 @@ public abstract class AbstractEarMojo
 
         getLog().debug( "Initializing ear execution context" );
         EarExecutionContext earExecutionContext =
-            new EarExecutionContext( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration, fileNameMapping,
-                                     typeMappingService );
+            new EarExecutionContext( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration,
+                                     outputFileNameMapping, typeMappingService );
 
         if ( useBaseVersion != null )
         {
-            earExecutionContext.getFileNameMapping().setUseBaseVersion( useBaseVersion );
+            getLog().warn( "Using useBaseVersion not yet fixed." );
+            // earExecutionContext.getOutputFileNameMapping().setUseBaseVersion( useBaseVersion );
         }
 
         getLog().debug( "Resolving ear modules ..." );
@@ -293,7 +302,7 @@ public abstract class AbstractEarMojo
         }
         return earModules;
     }
-    
+
     /**
      * @return The list of {@link #allJarModules}. This corresponds to all JAR modules (compile + runtime).
      */
@@ -338,6 +347,14 @@ public abstract class AbstractEarMojo
         return tempFolder;
     }
 
+    /**
+     * @return {@link #outputFileNameMapping}
+     */
+    public String getOutputFileNameMapping()
+    {
+        return outputFileNameMapping;
+    }
+
     private static boolean isArtifactRegistered( Artifact a, List<EarModule> currentList )
     {
         for ( EarModule em : currentList )

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java Wed Sep 13 20:53:49 2017
@@ -19,8 +19,6 @@ package org.apache.maven.plugins.ear;
  * under the License.
  */
 
-import org.apache.maven.plugins.ear.output.FileNameMapping;
-import org.apache.maven.plugins.ear.output.FileNameMappingFactory;
 import org.apache.maven.plugins.ear.util.ArtifactRepository;
 import org.apache.maven.plugins.ear.util.ArtifactTypeMappingService;
 import org.apache.maven.project.MavenProject;
@@ -37,7 +35,7 @@ public class EarExecutionContext
 
     private JbossConfiguration jbossConfiguration;
 
-    private FileNameMapping fileNameMapping;
+    private String outputFileNameMapping;
 
     private ArtifactRepository artifactRepository;
 
@@ -77,9 +75,9 @@ public class EarExecutionContext
     /**
      * @return {@link #fileNameMapping}
      */
-    public FileNameMapping getFileNameMapping()
+    public String getOutputFileNameMapping()
     {
-        return fileNameMapping;
+        return outputFileNameMapping;
     }
 
     /**
@@ -91,19 +89,12 @@ public class EarExecutionContext
     }
 
     private void initialize( MavenProject project, String mainArtifactId, String defaultLibBundleDir,
-                             JbossConfiguration jbossConfiguration, String fileNameMappingName,
+                             JbossConfiguration jbossConfiguration, String outputFileNameMapping,
                              ArtifactTypeMappingService typeMappingService )
     {
         this.artifactRepository = new ArtifactRepository( project.getArtifacts(), mainArtifactId, typeMappingService );
         this.defaultLibBundleDir = defaultLibBundleDir;
         this.jbossConfiguration = jbossConfiguration;
-        if ( fileNameMappingName == null || fileNameMappingName.trim().length() == 0 )
-        {
-            this.fileNameMapping = FileNameMappingFactory.getDefaultFileNameMapping();
-        }
-        else
-        {
-            this.fileNameMapping = FileNameMappingFactory.getFileNameMapping( fileNameMappingName );
-        }
+        this.outputFileNameMapping = outputFileNameMapping;
     }
 }

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java Wed Sep 13 20:53:49 2017
@@ -55,11 +55,9 @@ public final class EarModuleFactory
      * @return an ear module for this artifact
      * @throws UnknownArtifactTypeException if the artifact is not handled
      */
-    // CHECKSTYLE_OFF: LineLength
     public static EarModule newEarModule( Artifact artifact, JavaEEVersion javaEEVersion, String defaultLibBundleDir,
                                           Boolean includeInApplicationXml,
                                           ArtifactTypeMappingService typeMappingService )
-        // CHECKSTYLE_ON: LineLength
         throws UnknownArtifactTypeException
     {
         // Get the standard artifact type based on default config and user-defined mapping(s)

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java Wed Sep 13 20:53:49 2017
@@ -134,11 +134,9 @@ public class EarMojo
     protected String escapeString;
 
     /**
-     * In case of using the {@link #skinnyWars} and {@link #defaultLibBundleDir} usually the
-     * classpath will be modified.
-     * By settings this option {@code true} you can change this and keep the classpath untouched.
-     * This option has been introduced to keep the backward compatibility with earlier versions
-     * of the plugin.
+     * In case of using the {@link #skinnyWars} and {@link #defaultLibBundleDir} usually the classpath will be modified.
+     * By settings this option {@code true} you can change this and keep the classpath untouched. This option has been
+     * introduced to keep the backward compatibility with earlier versions of the plugin.
      *
      * @since 2.10
      */
@@ -296,8 +294,7 @@ public class EarMojo
             if ( duplicateArtifactsBreakTheBuild )
             {
                 // CHECKSTYLE_OFF: LineLength
-                throw new MojoExecutionException(
-                                                  "The build contains duplicate artifacts which result in unpredictable ear content." );
+                throw new MojoExecutionException( "The build contains duplicate artifacts which result in unpredictable ear content." );
                 // CHECKSTYLE_ON: LineLength
             }
         }
@@ -359,7 +356,8 @@ public class EarMojo
         if ( !ddFile.exists() && ( javaEEVersion.lt( JavaEEVersion.FIVE ) ) )
         {
             // CHECKSTYLE_OFF: LineLength
-            throw new MojoExecutionException( "Deployment descriptor: " + ddFile.getAbsolutePath() + " does not exist." );
+            throw new MojoExecutionException( "Deployment descriptor: " + ddFile.getAbsolutePath()
+                + " does not exist." );
             // CHECKSTYLE_ON: LineLength
         }
 
@@ -418,14 +416,16 @@ public class EarMojo
                 if ( destinationFile.getCanonicalPath().equals( sourceFile.getCanonicalPath() ) )
                 {
                     getLog().info( "Skipping artifact [" + module + "], as it already exists at [" + module.getUri()
-                                       + "]" );
+                        + "]" );
+                    // FIXME: Shouldn't that result in a build failure!?
                     continue;
                 }
 
                 // If the module is within the unpack list, make sure that no unpack wasn't forced (null or true)
                 // If the module is not in the unpack list, it should be true
                 // CHECKSTYLE_OFF: LineLength
-                if ( ( unpackTypesList.contains( module.getType() ) && ( module.shouldUnpack() == null || module.shouldUnpack() ) )
+                if ( ( unpackTypesList.contains( module.getType() )
+                    && ( module.shouldUnpack() == null || module.shouldUnpack() ) )
                     || ( module.shouldUnpack() != null && module.shouldUnpack() ) )
                 // CHECKSTYLE_ON: LineLength
                 {
@@ -454,7 +454,7 @@ public class EarMojo
                     else
                     {
                         getLog().debug( "Skipping artifact [" + module + "], as it is already up to date at ["
-                                            + module.getUri() + "]" );
+                            + module.getUri() + "]" );
                     }
                 }
             }
@@ -784,16 +784,29 @@ public class EarMojo
                     // We use the original name, cause in case of fileNameMapping to no-version/full
                     // we could not not delete it and it will end up in the resulting EAR and the WAR
                     // will not be cleaned up.
-                    File artifact =
-                        new File( new File( workDirectory, module.getLibDir() ), jm.getOriginalBundleFileName() );
+                    // CHECKSTYLE_OFF: LineLength
+                    File artifact = new File( new File( workDirectory, module.getLibDir() ),
+                                              module.getArtifact().getFile().getName() );
+                    // CHECKSTYLE_ON: LineLength
 
                     // MEAR-217
                     // If WAR contains files with timestamps, but EAR strips them away (useBaseVersion=true)
                     // the artifact is not found. Therefore respect the current fileNameMapping additionally.
+
+                    // FIXME: Need to check this based on the new name mapping.!
+                    if ( !artifact.exists() )
+                    {
+                        getLog().debug( "module does not exist with original file name." );
+                        artifact = new File( new File( workDirectory, module.getLibDir() ), jm.getBundleFileName() );
+                        getLog().debug( "Artifact with mapping:" + artifact.getAbsolutePath() );
+                    }
+
                     if ( !artifact.exists() )
                     {
-                        artifact =
-                            new File( new File( workDirectory, module.getLibDir() ), jm.getBundleFileName() );
+                        getLog().debug( "Artifact with mapping does not exist." );
+                        artifact = new File( new File( workDirectory, module.getLibDir() ),
+                                             jm.getArtifact().getFile().getName() );
+                        getLog().debug( "Artifact with orignal file name:" + artifact.getAbsolutePath() );
                     }
 
                     if ( artifact.exists() )

Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm Wed Sep 13 20:53:49 2017
@@ -63,6 +63,10 @@ ${project.name}
   For more information about the Java EE technology, please visit
   {{http://www.oracle.com/us/technologies/java/enterprise-edition/overview/index.html}}.
 
+  Note: Starting with version 3.0.0 the usage of <<<fileNameMapping>> has been removed. If you need
+  to use <<<fileNameMapping>> take a look at the new <<<outputFileNameMapping>>> which is more
+  flexible.
+  
 * Goals Overview
 
   EAR Plugin has two goals:

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java Wed Sep 13 20:53:49 2017
@@ -44,7 +44,7 @@ public class EarMojoIT
     public void testProject001()
         throws Exception
     {
-        doTestProject( "project-001", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-001", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -53,7 +53,8 @@ public class EarMojoIT
     public void testProject002()
         throws Exception
     {
-        doTestProject( "project-002", new String[] { "APP-INF/lib/ejb-sample-one-1.0.jar", "ejb-sample-two.jar" } );
+        doTestProject( "project-002",
+                       new String[] { "APP-INF/lib/eartest-ejb-sample-one-1.0.jar", "ejb-sample-two.jar" } );
     }
 
     /**
@@ -62,8 +63,8 @@ public class EarMojoIT
     public void testProject003()
         throws Exception
     {
-        doTestProject( "project-003", new String[] { "ejb-sample-one-1.0.jar", "APP-INF/lib/jar-sample-one-1.0.jar",
-            "APP-INF/lib/jar-sample-two-1.0.jar" } );
+        doTestProject( "project-003", new String[] { "eartest-ejb-sample-one-1.0.jar",
+            "APP-INF/lib/eartest-jar-sample-one-1.0.jar", "APP-INF/lib/eartest-jar-sample-two-1.0.jar" } );
     }
 
     /**
@@ -72,8 +73,8 @@ public class EarMojoIT
     public void testProject004()
         throws Exception
     {
-        doTestProject( "project-004", new String[] { "ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar",
-            "APP-INF/lib/jar-sample-two-1.0.jar" } );
+        doTestProject( "project-004", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-jar-sample-one-1.0.jar",
+            "APP-INF/lib/eartest-jar-sample-two-1.0.jar" } );
     }
 
     /**
@@ -82,7 +83,7 @@ public class EarMojoIT
     public void testProject005()
         throws Exception
     {
-        doTestProject( "project-005", new String[] { "ejb-sample-one-1.0.jar", "libs/another-name.jar" } );
+        doTestProject( "project-005", new String[] { "eartest-ejb-sample-one-1.0.jar", "libs/another-name.jar" } );
     }
 
     /**
@@ -91,7 +92,8 @@ public class EarMojoIT
     public void testProject006()
         throws Exception
     {
-        doTestProject( "project-006", new String[] { "ejb-sample-one-1.0.jar", "jar-sample-two-1.0.jar" } );
+        doTestProject( "project-006",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-jar-sample-two-1.0.jar" } );
     }
 
     /**
@@ -100,7 +102,7 @@ public class EarMojoIT
     public void testProject007()
         throws Exception
     {
-        doTestProject( "project-007", new String[] { "ejb-sample-one-1.0-classified.jar" } );
+        doTestProject( "project-007", new String[] { "eartest-ejb-sample-one-1.0-classified.jar" } );
     }
 
     /**
@@ -109,7 +111,7 @@ public class EarMojoIT
     public void testProject008()
         throws Exception
     {
-        doTestProject( "project-008", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-008", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -118,7 +120,7 @@ public class EarMojoIT
     public void testProject009()
         throws Exception
     {
-        doTestProject( "project-009", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-009", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -127,7 +129,7 @@ public class EarMojoIT
     public void testProject010()
         throws Exception
     {
-        doTestProject( "project-010", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-010", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -136,7 +138,7 @@ public class EarMojoIT
     public void testProject011()
         throws Exception
     {
-        doTestProject( "project-011", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-011", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -145,7 +147,7 @@ public class EarMojoIT
     public void testProject012()
         throws Exception
     {
-        doTestProject( "project-012", new String[] { "README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-012", new String[] { "README.txt", "LICENSE.txt", "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -154,7 +156,7 @@ public class EarMojoIT
     public void testProject013()
         throws Exception
     {
-        doTestProject( "project-013", new String[] { "README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-013", new String[] { "README.txt", "LICENSE.txt", "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -163,7 +165,7 @@ public class EarMojoIT
     public void testProject014()
         throws Exception
     {
-        doTestProject( "project-014", new String[] { "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-014", new String[] { "LICENSE.txt", "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -172,7 +174,7 @@ public class EarMojoIT
     public void testProject015()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-015", new String[] { "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-015", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
         final File expectedManifest = new File( baseDir, "src/main/application/META-INF/MANIFEST.MF" );
         final File actualManifest = new File( getEarDirectory( baseDir, "project-015" ), "META-INF/MANIFEST.MF" );
         assertTrue( "Manifest was not copied", actualManifest.exists() );
@@ -185,7 +187,7 @@ public class EarMojoIT
     public void testProject016()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-016", new String[] { "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-016", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
 
         final File targetFolder = new File( baseDir, "target" );
         final File createdEarFile = new File( targetFolder, "maven-ear-plugin-test-project-016-99.0.ear" );
@@ -207,7 +209,7 @@ public class EarMojoIT
     public void testProject017()
         throws Exception
     {
-        doTestProject( "project-017", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-017", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -227,8 +229,8 @@ public class EarMojoIT
     public void testProject019()
         throws Exception
     {
-        doTestProject( "project-019", new String[] { "ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar",
-            "jar-sample-one-1.0.jar" }, new boolean[] { false, true, true } );
+        doTestProject( "project-019", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-sar-sample-one-1.0.sar",
+            "eartest-jar-sample-one-1.0.jar" }, new boolean[] { false, true, true } );
     }
 
     /**
@@ -237,8 +239,8 @@ public class EarMojoIT
     public void testProject020()
         throws Exception
     {
-        doTestProject( "project-020", new String[] { "ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar",
-            "jar-sample-one-1.0.jar" }, new boolean[] { true, false, false } );
+        doTestProject( "project-020", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-sar-sample-one-1.0.sar",
+            "eartest-jar-sample-one-1.0.jar" }, new boolean[] { true, false, false } );
     }
 
     /**
@@ -247,9 +249,11 @@ public class EarMojoIT
     public void testProject021()
         throws Exception
     {
-        doTestProject( "project-021", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar",
-            "sar-sample-one-1.0.sar", "jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar" }, new boolean[] { false,
-            true, false, false, true } );
+        doTestProject( "project-021",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+                           "eartest-sar-sample-one-1.0.sar", "eartest-jar-sample-one-1.0.jar",
+                           "eartest-jar-sample-two-1.0.jar" },
+                       new boolean[] { false, true, false, false, true } );
     }
 
     /**
@@ -269,7 +273,8 @@ public class EarMojoIT
     public void testProject023()
         throws Exception
     {
-        doTestProject( "project-023", new String[] { "ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar" },
+        doTestProject( "project-023",
+                       new String[] { "eartest-ejb-sample-one-1.0-classified.jar", "eartest-ejb-sample-two-1.0.jar" },
                        new boolean[] { true, false } );
     }
 
@@ -279,7 +284,8 @@ public class EarMojoIT
     public void testProject024()
         throws Exception
     {
-        doTestProject( "project-024", new String[] { "ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar" },
+        doTestProject( "project-024",
+                       new String[] { "eartest-ejb-sample-one-1.0-classified.jar", "eartest-ejb-sample-two-1.0.jar" },
                        new boolean[] { true, false } );
     }
 
@@ -290,7 +296,8 @@ public class EarMojoIT
     public void testProject025()
         throws Exception
     {
-        doTestProject( "project-025", new String[] { "ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar" },
+        doTestProject( "project-025",
+                       new String[] { "eartest-ejb-sample-one-1.0-classified.jar", "eartest-ejb-sample-one-1.0.jar" },
                        new boolean[] { true, false } );
     }
 
@@ -312,7 +319,7 @@ public class EarMojoIT
     public void testProject027()
         throws Exception
     {
-        doTestProject( "project-027", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-027", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -321,7 +328,7 @@ public class EarMojoIT
     public void testProject028()
         throws Exception
     {
-        doTestProject( "project-028", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-028", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -330,7 +337,7 @@ public class EarMojoIT
     public void testProject029()
         throws Exception
     {
-        doTestProject( "project-029", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-029", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -340,7 +347,8 @@ public class EarMojoIT
     public void testProject030()
         throws Exception
     {
-        doTestProject( "project-030", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-030",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
@@ -350,7 +358,8 @@ public class EarMojoIT
     public void testProject031()
         throws Exception
     {
-        doTestProject( "project-031", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-031",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -359,7 +368,8 @@ public class EarMojoIT
     public void testProject032()
         throws Exception
     {
-        doTestProject( "project-032", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-032",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -368,8 +378,8 @@ public class EarMojoIT
     public void testProject033()
         throws Exception
     {
-        doTestProject( "project-033", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar",
-            "sar-sample-one-1.0.sar", "har-sample-one-1.0.har" } );
+        doTestProject( "project-033", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+            "eartest-sar-sample-one-1.0.sar", "eartest-har-sample-one-1.0.har" } );
     }
 
     /**
@@ -378,7 +388,8 @@ public class EarMojoIT
     public void testProject034()
         throws Exception
     {
-        doTestProject( "project-034", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-034",
+                       new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -387,9 +398,10 @@ public class EarMojoIT
     public void testProject035()
         throws Exception
     {
-        doTestProject( "project-035", new String[] { "foo/eartest-ejb-sample-one-1.0.jar",
-            "eartest-ejb-sample-two-1.0.jar", "libs/eartest-jar-sample-one-1.0.jar",
-            "libs/eartest-jar-sample-two-1.0.jar", "sar-sample-one.sar" } );
+        doTestProject( "project-035",
+                       new String[] { "foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+                           "libs/eartest-jar-sample-one-1.0.jar", "libs/eartest-jar-sample-two-1.0.jar",
+                           "sar-sample-one.sar" } );
     }
 
     /**
@@ -399,10 +411,11 @@ public class EarMojoIT
     public void testProject036()
         throws Exception
     {
-        doTestProject( "project-036", new String[] { "foo/eartest-ejb-sample-one-1.0.jar",
-            "eartest-ejb-sample-two-1.0.jar", "com-foo-bar-ejb-sample-one-1.0.jar",
-            "com-foo-bar-ejb-sample-two-1.0.jar", "libs/eartest-jar-sample-one-1.0.jar",
-            "libs/eartest-jar-sample-two-1.0.jar", "sar-sample-one.sar" } );
+        doTestProject( "project-036",
+                       new String[] { "foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+                           "com.foo.bar-ejb-sample-one-1.0.jar", "com.foo.bar-ejb-sample-two-1.0.jar",
+                           "libs/eartest-jar-sample-one-1.0.jar", "libs/eartest-jar-sample-two-1.0.jar",
+                           "sar-sample-one.sar" } );
     }
 
     /**
@@ -412,7 +425,7 @@ public class EarMojoIT
     public void testProject037()
         throws Exception
     {
-        doTestProject( "project-037", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-037", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
@@ -422,7 +435,7 @@ public class EarMojoIT
     public void testProject038()
         throws Exception
     {
-        doTestProject( "project-038", new String[] { "ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar" },
+        doTestProject( "project-038", new String[] { "eartest-ejb-sample-one-1.0-classified.jar", "eartest-ejb-sample-one-1.0.jar" },
                        new boolean[] { false, true } );
     }
 
@@ -432,7 +445,7 @@ public class EarMojoIT
     public void testProject039()
         throws Exception
     {
-        doTestProject( "project-039", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-039", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -441,7 +454,7 @@ public class EarMojoIT
     public void testProject040()
         throws Exception
     {
-        doTestProject( "project-040", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-040", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -450,7 +463,7 @@ public class EarMojoIT
     public void testProject041()
         throws Exception
     {
-        doTestProject( "project-041", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-041", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -459,7 +472,7 @@ public class EarMojoIT
     public void testProject042()
         throws Exception
     {
-        doTestProject( "project-042", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-042", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -468,7 +481,7 @@ public class EarMojoIT
     public void testProject043()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-043", new String[] { "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-043", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
         final File expectedApplicationXml = new File( baseDir, "target/custom-descriptor-dir/application.xml" );
         assertTrue( "Application.xml file not found", expectedApplicationXml.exists() );
         assertFalse( "Application.xml file should not be empty", expectedApplicationXml.length() == 0 );
@@ -480,7 +493,7 @@ public class EarMojoIT
     public void testProject044()
         throws Exception
     {
-        doTestProject( "project-044", new String[] { "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
+        doTestProject( "project-044", new String[] { "eartest-ejb-sample-one-1.0.jar", "myLibs/eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -489,7 +502,7 @@ public class EarMojoIT
     public void testProject045()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-045", new String[] { "README.txt", "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-045", new String[] { "README.txt", "eartest-ejb-sample-one-1.0.jar" } );
         final File actualReadme = new File( getEarDirectory( baseDir, "project-045" ), "README.txt" );
         final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
         assertTrue( "application name and version was not filtered properly", content.contains( "my-app 99.0" ) );
@@ -502,7 +515,7 @@ public class EarMojoIT
     public void testProject046()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-046", new String[] { "README.txt", "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-046", new String[] { "README.txt", "eartest-ejb-sample-one-1.0.jar" } );
         final File actualReadme = new File( getEarDirectory( baseDir, "project-046" ), "README.txt" );
         final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
         assertTrue( "application name and version was not filtered properly", content.contains( "my-app 99.0" ) );
@@ -517,7 +530,7 @@ public class EarMojoIT
     public void testProject047()
         throws Exception
     {
-        final File baseDir = doTestProject( "project-047", new String[] { "README.txt", "ejb-sample-one-1.0.jar" } );
+        final File baseDir = doTestProject( "project-047", new String[] { "README.txt", "eartest-ejb-sample-one-1.0.jar" } );
         final File actualReadme = new File( getEarDirectory( baseDir, "project-047" ), "README.txt" );
         final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
         assertTrue( "application name and version should not have been filtered", !content.contains( "my-app 99.0" ) );
@@ -530,7 +543,7 @@ public class EarMojoIT
     public void testProject048()
         throws Exception
     {
-        doTestProject( "project-048", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-048", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -539,7 +552,7 @@ public class EarMojoIT
     public void testProject049()
         throws Exception
     {
-        doTestProject( "project-049", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-049", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -548,7 +561,7 @@ public class EarMojoIT
     public void testProject050()
         throws Exception
     {
-        doTestProject( "project-050", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-050", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -557,7 +570,7 @@ public class EarMojoIT
     public void testProject051()
         throws Exception
     {
-        doTestProject( "project-051", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-051", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -566,7 +579,7 @@ public class EarMojoIT
     public void testProject052()
         throws Exception
     {
-        doTestProject( "project-052", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-052", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -575,7 +588,7 @@ public class EarMojoIT
     public void testProject053()
         throws Exception
     {
-        doTestProject( "project-053", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-053", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -584,7 +597,7 @@ public class EarMojoIT
     public void testProject054()
         throws Exception
     {
-        doTestProject( "project-054", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-054", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -593,8 +606,8 @@ public class EarMojoIT
     public void testProject055()
         throws Exception
     {
-        doTestProject( "project-055", new String[] { "jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar",
-            "jar-sample-three-with-deps-1.0.jar" } );
+        doTestProject( "project-055", new String[] { "eartest-jar-sample-one-1.0.jar", "eartest-jar-sample-two-1.0.jar",
+            "eartest-jar-sample-three-with-deps-1.0.jar" } );
     }
 
     /**
@@ -603,7 +616,7 @@ public class EarMojoIT
     public void testProject056()
         throws Exception
     {
-        doTestProject( "project-056", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-056", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -612,7 +625,7 @@ public class EarMojoIT
     public void testProject057()
         throws Exception
     {
-        doTestProject( "project-057", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-057", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -621,7 +634,7 @@ public class EarMojoIT
     public void testProject058()
         throws Exception
     {
-        doTestProject( "project-058", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-058", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -630,62 +643,62 @@ public class EarMojoIT
     public void testProject059()
         throws Exception
     {
-        doTestProject( "project-059", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-059", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
      * Builds an EAR with ejb-client packaged for J2EE 1.3 (MEAR-85)
-     *
+     *
      * @throws Exception
      */
     public void testProject060()
         throws Exception
     {
-        doTestProject( "project-060", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-060", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
      * Builds an EAR with ejb-client packaged for J2EE 1.4 (MEAR-85)
-     *
+     *
      * @throws Exception
      */
     public void testProject061()
         throws Exception
     {
-        doTestProject( "project-061", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-061", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
      * Builds an EAR with ejb-client packaged for JavaEE 5 (MEAR-85)
-     *
+     *
      * @throws Exception
      */
     public void testProject062()
         throws Exception
     {
-        doTestProject( "project-062", new String[] { "ejb-sample-one-1.0.jar", "lib/ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-062", new String[] { "eartest-ejb-sample-one-1.0.jar", "lib/eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
      * Builds an EAR with ejb-client packaged for JavaEE 6 (MEAR-85)
-     *
+     *
      * @throws Exception
      */
     public void testProject063()
         throws Exception
     {
-        doTestProject( "project-063", new String[] { "lib/ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-063", new String[] { "lib/eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
      * Builds an EAR with ejb-client packaged for JavaEE 5 and still put it in the root (MEAR-85)
-     *
+     *
      * @throws Exception
      */
     public void testProject064()
         throws Exception
     {
-        doTestProject( "project-064", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
+        doTestProject( "project-064", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0-client.jar" } );
     }
 
     /**
@@ -694,7 +707,7 @@ public class EarMojoIT
     public void testProject065()
         throws Exception
     {
-        doTestProject( "project-065", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-065", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -703,7 +716,7 @@ public class EarMojoIT
     public void testProject066()
         throws Exception
     {
-        doTestProject( "project-066", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-066", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -712,7 +725,7 @@ public class EarMojoIT
     public void testProject067()
         throws Exception
     {
-        doTestProject( "project-067", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-067", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -721,7 +734,7 @@ public class EarMojoIT
     public void testProject068()
         throws Exception
     {
-        doTestProject( "project-068", new String[] { "ejb-sample-one.jar", "ejb-sample-two.jar" } );
+        doTestProject( "project-068", new String[] { "eartest-ejb-sample-one.jar", "eartest-ejb-sample-two.jar" } );
     }
 
     /**
@@ -730,7 +743,7 @@ public class EarMojoIT
     public void testProject069()
         throws Exception
     {
-        doTestProject( "project-069", new String[] { "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
+        doTestProject( "project-069", new String[] { "eartest-ejb-sample-one-1.0.jar", "myLibs/eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -739,7 +752,7 @@ public class EarMojoIT
     public void testProject070()
         throws Exception
     {
-        doTestProject( "project-070", new String[] { "ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar" } );
+        doTestProject( "project-070", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -748,7 +761,7 @@ public class EarMojoIT
     public void testProject071()
         throws Exception
     {
-        doTestProject( "project-071", new String[] { "ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar" } );
+        doTestProject( "project-071", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -757,7 +770,7 @@ public class EarMojoIT
     public void testProject072()
         throws Exception
     {
-        doTestProject( "project-072", new String[] { "ejb-sample-one-1.0.jar", "app-client-sample-one-1.0.jar" } );
+        doTestProject( "project-072", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-app-client-sample-one-1.0.jar" } );
     }
 
     /**
@@ -766,8 +779,8 @@ public class EarMojoIT
     public void testProject073()
         throws Exception
     {
-        doTestProject( "project-073", new String[] { "ejb-sample-one-1.0.jar", "app-client-sample-one-1.0.jar",
-            "APP-INF/lib/jar-sample-one-1.0.jar", "APP-INF/lib/jar-sample-two-1.0.jar" } );
+        doTestProject( "project-073", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-app-client-sample-one-1.0.jar",
+            "APP-INF/lib/eartest-jar-sample-one-1.0.jar", "APP-INF/lib/eartest-jar-sample-two-1.0.jar" } );
     }
 
     /**
@@ -777,7 +790,7 @@ public class EarMojoIT
     public void testProject074()
         throws Exception
     {
-        doTestProject( "project-074", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-074", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -787,7 +800,7 @@ public class EarMojoIT
     public void testProject075()
         throws Exception
     {
-        doTestProject( "project-075", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-075", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -797,7 +810,7 @@ public class EarMojoIT
     public void testProject076()
         throws Exception
     {
-        doTestProject( "project-076", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-076", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -806,7 +819,7 @@ public class EarMojoIT
     public void testProject077()
         throws Exception
     {
-        doTestProject( "project-077", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-077", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -815,8 +828,8 @@ public class EarMojoIT
     public void testProject078()
         throws Exception
     {
-        doTestProject( "project-078", new String[] { "ejb-sample-one.jar", "war-sample-one-1.0.war",
-            "jar-sample-two-1.0.jar" } );
+        doTestProject( "project-078",
+                       new String[] { "ejb-sample-one.jar", "war-sample-one.war", "jar-sample-two.jar" } );
     }
 
     /**
@@ -825,7 +838,7 @@ public class EarMojoIT
     public void testProject079()
         throws Exception
     {
-        doTestProject( "project-079", new String[] { "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
+        doTestProject( "project-079", new String[] { "eartest-ejb-sample-one-1.0.jar", "myLibs/eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -834,7 +847,7 @@ public class EarMojoIT
     public void testProject080()
         throws Exception
     {
-        doTestProject( "project-080", new String[] { "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
+        doTestProject( "project-080", new String[] { "eartest-ejb-sample-one-1.0.jar", "myLibs/eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -843,7 +856,7 @@ public class EarMojoIT
     public void testProject081()
         throws Exception
     {
-        doTestProject( "project-081", new String[] { "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
+        doTestProject( "project-081", new String[] { "eartest-ejb-sample-one-1.0.jar", "myLibs/eartest-jar-sample-one-1.0.jar" } );
     }
 
     /**
@@ -852,7 +865,7 @@ public class EarMojoIT
     public void testProject082()
         throws Exception
     {
-        doTestProject( "project-082", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-082", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
 
     /**
@@ -862,7 +875,7 @@ public class EarMojoIT
     public void testProject083()
         throws Exception
     {
-        doTestProject( "project-083", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-083", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -871,16 +884,16 @@ public class EarMojoIT
     public void testProject084()
         throws Exception
     {
-        doTestProject( "project-084", new String[] { "ejb-sample-one-1.0.jar" } );
+        doTestProject( "project-084", new String[] { "eartest-ejb-sample-one-1.0.jar" } );
     }
-    
+
     /**
      * Builds an EAR with custom ejbRef entries settings and JavaEE 6.
      */
     public void testProject085()
         throws Exception
     {
-        doTestProject( "project-085", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-085", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -889,7 +902,7 @@ public class EarMojoIT
     public void testProject086()
         throws Exception
     {
-        doTestProject( "project-086", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-086", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 
     /**
@@ -898,6 +911,6 @@ public class EarMojoIT
     public void testProject087()
         throws Exception
     {
-        doTestProject( "project-087", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
+        doTestProject( "project-087", new String[] { "eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar" } );
     }
 }

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-001</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,9 +24,9 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-002</display-name>
   <module>
-    <ejb>APP-INF/lib/ejb-sample-one-1.0.jar</ejb>
+    <ejb>APP-INF/lib/eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
   <module>
     <ejb>ejb-sample-two.jar</ejb>
   </module>
-</application>
\ No newline at end of file
+</application>

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-003</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-004</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-005</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-006</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -24,6 +24,6 @@ under the License.
 <application>
   <display-name>maven-ear-plugin-test-project-007</display-name>
   <module>
-    <ejb>ejb-sample-one-1.0-classified.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0-classified.jar</ejb>
   </module>
 </application>
\ No newline at end of file

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml?rev=1808287&r1=1808286&r2=1808287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml Wed Sep 13 20:53:49 2017
@@ -26,6 +26,6 @@ under the License.
   <description>The purpose of this application is to test the ApplicationXmlMojo execution with
             custom settings.</description>
   <module>
-    <ejb>ejb-sample-one-1.0.jar</ejb>
+    <ejb>eartest-ejb-sample-one-1.0.jar</ejb>
   </module>
 </application>
\ No newline at end of file