Author: snicoll
Date: Sat Jan 16 15:07:19 2010
New Revision: 899971
URL: http://svn.apache.org/viewvc?rev=899971&view=rev
Log:
MEAR-121: Added documentation about the ${null} trick to avoid a display name
at all in the generated application.xml
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
- copied, changed from r899968,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/expected-META-INF/application.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
- copied, changed from r899968,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/pom.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.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?rev=899971&r1=899970&r2=899971&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Sat Jan 16
15:07:19 2010
@@ -146,5 +146,7 @@
* project-058: builds an EAR with deployment descriptor configuration for
Java EE 6
+ * project-059: builds an EAR with no display name entry at all
+
\ No newline at end of file
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml?rev=899971&r1=899970&r2=899971&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml Sat Jan 16
15:07:19 2010
@@ -46,6 +46,18 @@
</p>
</answer>
</faq>
+ <faq id="avoid-display-name">
+ <question>
+ How can I avoid to generate a display-name entry in the generated
application.xml?
+ </question>
+ <answer>
+ <p>
+ By default, the plugin will always generate a display-name with the
id of the project if a custom one
+ is not provided through configuration. If for some reason you don't
want any display-name at all, just
+ use the ${null} value instead.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=899971&r1=899970&r2=899971&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Sat Jan 16 15:07:19 2010
@@ -617,7 +617,7 @@
doTestProject( "project-057", new String[]{"ejb-sample-one-1.0.jar",
"ejb-sample-two-1.0.jar"} );
}
- /**
+ /**
* Builds an EAR with deployment descriptor configuration for Java EE 6.
*/
public void testProject058()
@@ -625,4 +625,13 @@
{
doTestProject( "project-058", new String[]{"ejb-sample-one-1.0.jar"} );
}
+
+ /**
+ * Builds an EAR with no display name entry at all.
+ */
+ public void testProject059()
+ throws Exception
+ {
+ doTestProject( "project-059", new String[]{"ejb-sample-one-1.0.jar"} );
+ }
}
Copied:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
(from r899968,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/expected-META-INF/application.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/expected-META-INF/application.xml&r1=899968&r2=899971&rev=899971&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/expected-META-INF/application.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
Sat Jan 16 15:07:19 2010
@@ -21,7 +21,6 @@
<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_6.xsd"; version="6">
<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>
Copied:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
(from r899968,
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/pom.xml&r1=899968&r2=899971&rev=899971&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-058/pom.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
Sat Jan 16 15:07:19 2010
@@ -22,7 +22,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-058</artifactId>
+ <artifactId>maven-ear-plugin-test-project-059</artifactId>
<version>99.0</version>
<name>Maven</name>
<packaging>ear</packaging>
@@ -41,7 +41,7 @@
<artifactId>maven-ear-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <displayName>Sample test application #008</displayName>
+ <displayName>${null}</displayName>
<description>
The purpose of this application is to test the ApplicationXmlMojo
execution with
custom settings.
