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/11/01 18:34:59 UTC
svn commit: r470004 - in /maven/plugins/trunk/maven-ear-plugin/src:
site/apt/ test/java/org/apache/maven/plugin/ear/
test/resources/projects/project-012/
test/resources/projects/project-012/expected-META-INF/
test/resources/projects/project-012/src/ te...
Author: snicoll
Date: Wed Nov 1 09:34:56 2006
New Revision: 470004
URL: http://svn.apache.org/viewvc?view=rev&rev=470004
Log:
More tests.
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/src/main/application/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/src/main/application/META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/
- copied from r469948, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/pom.xml
- copied, changed from r470002, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml (with props)
Removed:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/
Modified:
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
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=470004&r1=470003&r2=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Wed Nov 1 09:34:56 2006
@@ -52,4 +52,24 @@
* project-011: builds an EAR and make sure that deployment descriptor default settings are applied
+ * project-012: builds an EAR and make sure that EAR resources are bundled within the EAR
+
+ * project-013: builds an EAR and make sure that EAR resources in a customized resources directory are bundled within the EAR
+
+ * project-014: builds an EAR and make sure that EAR resources are bundled within the EAR using includes and excludes
+
+ * project-015: builds an EAR and make sure that default manifest is taken into account
+
+ * project-016: builds an EAR and make sure that custom manifest is taken into account
+
+ * project-017: builds an EAR and make sure that custom application.xml is taken into account
+
+ * project-018: builds an EAR with a custom final name
+
+ * project-019: builds an EAR with unpacked archives using the unpackTypes.
+
+ * project-020: builds an EAR with unpacked archives using the unpack module attribute
+
+ * project-021: builds an EAR with unpacked archives using both unpackTypes and the unpack module attribute
+
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=470004&r1=470003&r2=470004
==============================================================================
--- 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 Wed Nov 1 09:34:56 2006
@@ -19,12 +19,16 @@
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.custommonkey.xmlunit.XMLAssert;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.archiver.UnArchiver;
import java.io.File;
import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -54,7 +58,7 @@
*/
protected File localRepositoryDir = new File( getBasedir().getAbsolutePath(), "target/test-classes/m2repo" );
- protected File settingsFile = new File( getBasedir().getAbsolutePath(), "target/test-classes/settings.ml" );
+ protected File settingsFile = new File( getBasedir().getAbsolutePath(), "target/test-classes/settings.xml" );
/**
@@ -69,8 +73,9 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/projects/" + projectName );
- // Specifying the settings here does not seem to work.
- Verifier verifier = new Verifier( testDir.getAbsolutePath(), settingsFile.getAbsolutePath() );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath());
+ // Let's add alternate settings.xml setting so that the latest dependencies are used
+ verifier.getCliOptions().add("-s " + settingsFile.getAbsolutePath());
verifier.localRepo = localRepositoryDir.getAbsolutePath();
verifier.executeGoal( "package" );
// If no error is expected make sure that error logs are free
@@ -79,9 +84,6 @@
verifier.verifyErrorFreeLog();
}
verifier.resetStreams();
- assertEarArchive( testDir, projectName );
- assertEarDirectory( testDir, projectName );
-
return testDir;
}
@@ -115,6 +117,8 @@
throws Exception
{
final File baseDir = executeMojo( projectName, new Properties() );
+ assertEarArchive( baseDir, projectName );
+ assertEarDirectory( baseDir, projectName );
assertArchiveContent( baseDir, projectName, expectedArtifacts, artifactsDirectory );
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=470004&r1=470003&r2=470004
==============================================================================
--- 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 Wed Nov 1 09:34:56 2006
@@ -1,5 +1,10 @@
package org.apache.maven.plugin.ear;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.util.Properties;
+
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -124,16 +129,111 @@
throws Exception
{
doTestProject( "project-011", new String[]{"ejb-sample-one-1.0.jar"} );
- }
+ }
+
+ /**
+ * Builds an EAR and make sure that EAR resources are bundled within the EAR.
+ */
+ public void testProject012()
+ throws Exception
+ {
+ doTestProject( "project-012", new String[]{"README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR and make sure that EAR resources in a customized resources directory are bundled within the EAR.
+ */
+ public void testProject013()
+ throws Exception
+ {
+ doTestProject( "project-013", new String[]{"README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR and make sure that EAR resources are bundled within the EAR using includes and excludes.
+ */
+ public void testProject014()
+ throws Exception
+ {
+ doTestProject( "project-014", new String[]{"LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR and make sure that default manifest is taken into account.
+ */
+ public void testProject015()
+ throws Exception
+ {
+ final File baseDir = doTestProject( "project-015", new String[]{"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() );
+ assertTrue( FileUtils.contentEquals( expectedManifest, actualManifest ) );
+ }
+
+ /**
+ * Builds an EAR and make sure that custom manifest is taken into account.
+ */
+ public void testProject016()
+ throws Exception
+ {
+ System.out.println( "Skipped project-016: need a way to extract the EAR archive" );
+ /*
+ final File baseDir = doTestProject( "project-016", new String[]{"ejb-sample-one-1.0.jar"} );
+ final File expectedManifest = new File(baseDir, "src/main/ear/META-INF/MANIFEST.MF");
+ // TODO: needs a way to extract the EAR archive
+ */
+ }
+
+ /**
+ * Builds an EAR and make sure that custom application.xml is taken into account.
+ */
+ public void testProject017()
+ throws Exception
+ {
+ doTestProject( "project-017", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
+
+ /**
+ * Builds an EAR with a custom final name.
+ */
+ public void testProject018()
+ throws Exception
+ {
+ final File baseDir = executeMojo( "project-018", new Properties() );
+ final File expectedFile = new File( baseDir, "target/my-custom-file.ear" );
+ assertTrue( "EAR archive not found", expectedFile.exists() );
+ }
+ /**
+ * Builds an EAR with unpacked archives using the unpackTypes.
+ */
+ 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} );
+ }
- /* 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} );
- } */
+ /**
+ * Builds an EAR with unpacked archives using the unpack module attribute.
+ */
+ 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} );
+ }
+ /**
+ * Builds an EAR with unpacked archives using both unpackTypes and the unpack module attribute.
+ */
+ 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} );
+ }
}
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-012</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-012/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml Wed Nov 1 09:34:56 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-012</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-012/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake license
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake readme
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-012/src/main/application/README.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-013</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-013/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,30 @@
+<?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-013</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>
+ <earSourceDirectory>src/main/ear</earSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake license
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake readme
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-013/src/main/ear/README.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-014</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-014/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,30 @@
+<?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-014</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>
+ <earSourceIncludes>LICENSE.txt</earSourceIncludes>
+ <earSourceExcludes>**/*README.txt, **/*ignore.txt</earSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake license
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+fake readme
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/README.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+ignore
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/content/ignore.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt Wed Nov 1 09:34:56 2006
@@ -0,0 +1 @@
+ignore
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-014/src/main/application/ignore.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-015</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-015/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml Wed Nov 1 09:34:56 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-015</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-015/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-015/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-016</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-016/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,29 @@
+<?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-016</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>
+ <manifestFile>src/main/ear/MANIFEST.MF</manifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF Wed Nov 1 09:34:56 2006
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Custom Archive
+Created-By: Foo
+Built-By: sni
+Build-Jdk: 1.5.0_06
+
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,11 @@
+<?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>My custom display name</display-name>
+ <description>Custom description</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-017/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,29 @@
+<?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-017</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>
+ <applicationXml>src/main/ear/application.xml</applicationXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,11 @@
+<?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>My custom display name</display-name>
+ <description>Custom description</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-017/src/main/ear/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-017/src/main/ear/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,29 @@
+<?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-018</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>
+ <finalName>my-custom-file</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-018/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-019</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+ <module>
+ <connector>sar-sample-one-1.0.sar</connector>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/pom.xml (from r470002, maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/pom.xml?view=diff&rev=470004&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/pom.xml&r1=470002&p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/pom.xml&r2=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-04/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-019/pom.xml Wed Nov 1 09:34:56 2006
@@ -3,7 +3,7 @@
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-04</artifactId>
+ <artifactId>maven-ear-plugin-test-project-019</artifactId>
<version>99.0</version>
<name>Maven</name>
<packaging>ear</packaging>
@@ -20,15 +20,19 @@
<version>1.0</version>
<type>sar</type>
</dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>jar-sample-one</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Sample Ear Application</displayName>
- <unpackTypes>sar</unpackTypes>
+ <configuration>
+ <unpackTypes>jar,sar</unpackTypes>
</configuration>
</plugin>
</plugins>
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml Wed Nov 1 09:34:56 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-020</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+ <module>
+ <connector>sar-sample-one-1.0.sar</connector>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,47 @@
+<?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-020</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>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>sar-sample-one</artifactId>
+ <version>1.0</version>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>jar-sample-one</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <modules>
+ <ejbModule>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <unpack>true</unpack>
+ </ejbModule>
+ </modules>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-020/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,16 @@
+<?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-021</display-name>
+ <module>
+ <ejb>ejb-sample-one-1.0.jar</ejb>
+ </module>
+ <module>
+ <ejb>ejb-sample-two-1.0.jar</ejb>
+ </module>
+ <module>
+ <connector>sar-sample-one-1.0.sar</connector>
+ </module>
+</application>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/expected-META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml?view=auto&rev=470004
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml Wed Nov 1 09:34:56 2006
@@ -0,0 +1,63 @@
+<?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-021</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>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-two</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>sar-sample-one</artifactId>
+ <version>1.0</version>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>jar-sample-one</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eartest</groupId>
+ <artifactId>jar-sample-two</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <unpackTypes>ejb,jar</unpackTypes>
+ <modules>
+ <ejbModule>
+ <groupId>eartest</groupId>
+ <artifactId>ejb-sample-one</artifactId>
+ <unpack>false</unpack>
+ </ejbModule>
+ <javaModule>
+ <groupId>eartest</groupId>
+ <artifactId>jar-sample-one</artifactId>
+ <unpack>false</unpack>
+ </javaModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-021/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision