You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/10/29 16:25:12 UTC
svn commit: r468922 - in /maven/plugins/trunk/maven-ear-plugin: ./
src/site/apt/ src/test/java/org/apache/maven/plugin/ear/
src/test/resources/projects/project-001/expected-META-INF/
src/test/resources/projects/project-002/expected-META-INF/ src/test/r...
Author: snicoll
Date: Sun Oct 29 07:25:10 2006
New Revision: 468922
URL: http://svn.apache.org/viewvc?view=rev&rev=468922
Log:
More tests ; Added checks on deployment descriptors.
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml (with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Oct 29 07:25:10 2006
@@ -45,10 +45,16 @@
<artifactId>plexus-utils</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
<version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Sun Oct 29 07:25:10 2006
@@ -44,4 +44,12 @@
* project-007: builds an EAR with a classified artifact and no extra configuration
+ * project-008: builds an EAR with deployment descriptor configuration for J2EE 1.3
+
+ * project-009: builds an EAR with deployment descriptor configuration for J2EE 1.4
+
+ * project-010: builds an EAR with deployment descriptor configuration for Java EE 5
+
+ * project-011: builds an EAR and make sure that deployment descriptor default settings are applied
+
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java Sun Oct 29 07:25:10 2006
@@ -19,10 +19,14 @@
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.custommonkey.xmlunit.XMLAssert;
import java.io.File;
+import java.io.FileReader;
import java.io.FilenameFilter;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
@@ -62,9 +66,8 @@
protected File executeMojo( final String projectName, final Properties properties, boolean expectNoError )
throws Exception
{
-
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/projects/" + projectName );
- Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath());
verifier.localRepo = localRepositoryDir.getAbsolutePath();
verifier.executeGoal( "package" );
// If no error is expected make sure that error logs are free
@@ -89,7 +92,6 @@
protected File executeMojo( final String projectName, final Properties properties )
throws Exception
{
-
return executeMojo( projectName, properties, true );
}
@@ -97,18 +99,45 @@
/**
* Executes the specified projects and asserts the given artifacts.
*
+ * @param projectName the project to test
+ * @param expectedArtifacts the list of artifacts to be found in the EAR archive
+ * @param artifactsDirectory whether the artifact is an exploded artifactsDirectory or not
+ * @param testDeploymentDescriptors whether we should test deployemnt descriptors
+ * @return the base directory of the project
+ * @throws Exception
+ */
+ protected File doTestProject( final String projectName, final String[] expectedArtifacts,
+ final boolean[] artifactsDirectory, boolean testDeploymentDescriptors )
+ throws Exception
+ {
+ final File baseDir = executeMojo( projectName, new Properties() );
+
+ assertArchiveContent( baseDir, projectName, expectedArtifacts, artifactsDirectory );
+
+ if ( testDeploymentDescriptors )
+ {
+ assertDeploymentDescriptors( baseDir, projectName );
+ }
+
+ return baseDir;
+
+ }
+
+ /**
+ * Executes the specified projects and asserts the given artifacts. Assert the
+ * deployment descriptors are valid
+ *
* @param projectName the project to test
* @param expectedArtifacts the list of artifacts to be found in the EAR archive
* @param artifactsDirectory whether the artifact is an exploded artifactsDirectory or not
+ * @return the base directory of the project
* @throws Exception
*/
- protected void doTestProject( final String projectName, final String[] expectedArtifacts,
+ protected File doTestProject( final String projectName, final String[] expectedArtifacts,
final boolean[] artifactsDirectory )
throws Exception
{
- final File baseDir = executeMojo( projectName, new Properties() );
-
- assertArchiveContent( baseDir, projectName, expectedArtifacts, artifactsDirectory );
+ return doTestProject( projectName, expectedArtifacts, artifactsDirectory, true );
}
@@ -116,14 +145,32 @@
* Executes the specified projects and asserts the given artifacts as
* artifacts (non directory)
*
+ * @param projectName the project to test
+ * @param expectedArtifacts the list of artifacts to be found in the EAR archive
+ * @param testDeploymentDescriptors whether we should test deployemnt descriptors
+ * @return the base directory of the project
+ * @throws Exception
+ */
+ protected File doTestProject( final String projectName, final String[] expectedArtifacts,
+ boolean testDeploymentDescriptors )
+ throws Exception
+ {
+ return doTestProject( projectName, expectedArtifacts, new boolean[expectedArtifacts.length] );
+ }
+
+ /**
+ * Executes the specified projects and asserts the given artifacts as
+ * artifacts (non directory). Assert the deployment descriptors are valid
+ *
* @param projectName the project to test
* @param expectedArtifacts the list of artifacts to be found in the EAR archive
+ * @return the base directory of the project
* @throws Exception
*/
- protected void doTestProject( final String projectName, final String[] expectedArtifacts )
+ protected File doTestProject( final String projectName, final String[] expectedArtifacts )
throws Exception
{
- doTestProject( projectName, expectedArtifacts, new boolean[expectedArtifacts.length] );
+ return doTestProject( projectName, expectedArtifacts, true );
}
protected void assertEarArchive( final File baseDir, final String projectName )
@@ -175,7 +222,7 @@
}
}
- final List actualFiles = buildFiles( dir, expectedDirectories );
+ final List actualFiles = buildArchiveContentFiles( dir, expectedDirectories );
assertEquals( "Artifacts mismatch " + actualFiles, artifactNames.length, actualFiles.size() );
for ( int i = 0; i < artifactNames.length; i++ )
{
@@ -191,7 +238,7 @@
}
}
- protected List buildFiles( final File baseDir, final List expectedDirectories )
+ protected List buildArchiveContentFiles( final File baseDir, final List expectedDirectories )
{
final List result = new ArrayList();
addFiles( baseDir, result, expectedDirectories );
@@ -258,5 +305,84 @@
basedir = new File( basedirString );
}
return basedir;
+ }
+
+ // Generated application.xml stuff
+
+ /**
+ * Asserts that the deployment descriptors have been generated successfully.
+ * <p/>
+ * This test assumes that deployment descriptors are located in the
+ * <tt>expected-META-INF</tt> directory of the project. Note that the
+ * <tt>MANIFEST.mf</tt> file is ignored and is not tested.
+ *
+ * @param baseDir the directory of the tested project
+ * @param projectName the name of the project
+ */
+ protected void assertDeploymentDescriptors( final File baseDir, final String projectName )
+ throws IOException
+ {
+ final File earDirectory = getEarDirectory( baseDir, projectName );
+ final File[] actualDeploymentDescriptors = getDeploymentDescriptors( new File( earDirectory, "META-INF" ) );
+ final File[] expectedDeploymentDescriptors =
+ getDeploymentDescriptors( new File( baseDir, "expected-META-INF" ) );
+
+
+ if (expectedDeploymentDescriptors == null) {
+ assertNull( "No deployment descriptor was expected", actualDeploymentDescriptors);
+ } else {
+ assertNotNull( "Missing deployment descriptor", actualDeploymentDescriptors);
+ }
+ // Make sure we have the same number of files
+ assertEquals( "Number of Deployment descriptor(s) mismatch", expectedDeploymentDescriptors.length,
+ actualDeploymentDescriptors.length );
+
+ // Sort the files so that we have the same behavior here
+ Arrays.sort( expectedDeploymentDescriptors );
+ Arrays.sort( actualDeploymentDescriptors );
+
+ for ( int i = 0; i < expectedDeploymentDescriptors.length; i++ )
+ {
+ File expectedDeploymentDescriptor = expectedDeploymentDescriptors[i];
+ File actualDeploymentDescriptor = actualDeploymentDescriptors[i];
+
+ assertEquals( "File name mismatch", expectedDeploymentDescriptor.getName(),
+ actualDeploymentDescriptor.getName() );
+
+ FileReader expected = null;
+ FileReader actual = null;
+ try
+ {
+ expected = new FileReader( expectedDeploymentDescriptor);
+ actual = new FileReader( actualDeploymentDescriptor);
+ XMLAssert.assertXMLEqual(
+ "Wrong deployment descriptor generated for[" + expectedDeploymentDescriptor.getName() + "]",
+ expected, actual );
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ fail( "Could not assert deployment descriptor " + e.getMessage() );
+ } finally {
+ if (expected != null) {
+ expected.close();
+ }
+ if (actual != null) {
+ actual.close();
+ }
+ }
+ }
+ }
+
+ private File[] getDeploymentDescriptors( final File ddDirectory )
+ {
+ return ddDirectory.listFiles( new FilenameFilter()
+ {
+
+ public boolean accept( File dir, String name )
+ {
+ return !name.equalsIgnoreCase( "manifest.mf" );
+ }
+ } );
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarMojoTest.java Sun Oct 29 07:25:10 2006
@@ -17,7 +17,6 @@
*/
/**
- *
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
@@ -49,7 +48,8 @@
public void testProject003()
throws Exception
{
- doTestProject( "project-003", new String[]{"APP-INF/lib/jar-sample-one-1.0.jar", "APP-INF/lib/jar-sample-two-1.0.jar"} );
+ 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"} );
}
/**
@@ -59,7 +59,8 @@
public void testProject004()
throws Exception
{
- doTestProject( "project-004", new String[]{"jar-sample-one-1.0.jar", "APP-INF/lib/jar-sample-two-1.0.jar"} );
+ 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"} );
}
/**
@@ -68,7 +69,7 @@
public void testProject005()
throws Exception
{
- doTestProject( "project-005", new String[]{"libs/another-name.jar"} );
+ doTestProject( "project-005", new String[]{"ejb-sample-one-1.0.jar", "libs/another-name.jar"} );
}
/**
@@ -77,7 +78,7 @@
public void testProject006()
throws Exception
{
- doTestProject( "project-006", new String[]{"jar-sample-two-1.0.jar"} );
+ doTestProject( "project-006", new String[]{"ejb-sample-one-1.0.jar", "jar-sample-two-1.0.jar"} );
}
/**
@@ -89,16 +90,50 @@
doTestProject( "project-007", new String[]{"ejb-sample-one-1.0-classified.jar"} );
}
+ /**
+ * Builds an EAR with deployment descriptor configuration for J2EE 1.3.
+ */
+ public void testProject008()
+ throws Exception
+ {
+ doTestProject( "project-008", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+ /**
+ * Builds an EAR with deployment descriptor configuration for J2EE 1.4.
+ */
+ public void testProject009()
+ throws Exception
+ {
+ doTestProject( "project-009", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+ /**
+ * Builds an EAR with deployment descriptor configuration for Java EE 5.
+ */
+ public void testProject010()
+ throws Exception
+ {
+ doTestProject( "project-010", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
- /* Need the embedder for this one since it's new code
- public void testProject04()
+ /**
+ * Builds an EAR and make sure that deployment descriptor default settings are applied.
+ */
+ public void testProject011()
throws Exception
{
- doTestProject( "project-04", new String[]{"ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar"},
- new boolean[]{false, true} );
- } */
+ doTestProject( "project-011", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+
+
+ /* Need the embedder for this one since it's new code
+ public void testProject04()
+ throws Exception
+ {
+ doTestProject( "project-04", new String[]{"ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar"},
+ new boolean[]{false, true} );
+ } */
}
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-001</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-001/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-002</display-name>
+ <module>
+ <ejb>APP-INF/lib/ejb-sample-one-1.0.jar</ejb>
+ </module>
+ <module>
+ <ejb>ejb-sample-two.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-002/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-003</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-003/pom.xml Sun Oct 29 07:25:10 2006
@@ -10,6 +10,12 @@
<dependencies>
<dependency>
<groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
<artifactId>jar-sample-one</artifactId>
<version>1.0</version>
</dependency>
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-004</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/pom.xml?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-004/pom.xml Sun Oct 29 07:25:10 2006
@@ -10,6 +10,12 @@
<dependencies>
<dependency>
<groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
<artifactId>jar-sample-one</artifactId>
<version>1.0</version>
</dependency>
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-005</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/pom.xml?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-005/pom.xml Sun Oct 29 07:25:10 2006
@@ -10,6 +10,12 @@
<dependencies>
<dependency>
<groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
<artifactId>jar-sample-one</artifactId>
<version>1.0</version>
</dependency>
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-006</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/pom.xml?view=diff&rev=468922&r1=468921&r2=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-006/pom.xml Sun Oct 29 07:25:10 2006
@@ -10,6 +10,12 @@
<dependencies>
<dependency>
<groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
<artifactId>jar-sample-one</artifactId>
<version>1.0</version>
</dependency>
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-007</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0-classified.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-007/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>Sample test application #008</display-name>
+ <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>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-008</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>Sample test application #008</displayName>
+ <description>
+ The purpose of this application is to test the ApplicationXmlMojo execution with
+ custom settings.
+ </description>
+ <encoding>ISO-8859-15</encoding>
+ <version>1.3</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-008/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4">
+ <description>The purpose of this application is to test the ApplicationXmlMojo execution with
+ custom settings.</description>
+ <display-name>Sample test application #008</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-009</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>Sample test application #008</displayName>
+ <description>
+ The purpose of this application is to test the ApplicationXmlMojo execution with
+ custom settings.
+ </description>
+ <encoding>ISO-8859-1</encoding>
+ <version>1.4</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-009/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
+ <description>The purpose of this application is to test the ApplicationXmlMojo execution with
+ custom settings.</description>
+ <display-name>Sample test application #008</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-010</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>Sample test application #008</displayName>
+ <description>
+ The purpose of this application is to test the ApplicationXmlMojo execution with
+ custom settings.
+ </description>
+ <encoding>UTF-8</encoding>
+ <version>5</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-010/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>maven-ear-plugin-test-project-011</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml?view=auto&rev=468922
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml Sun Oct 29 07:25:10 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ear</groupId>
+ <artifactId>maven-ear-plugin-test-project-011</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-011/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision