Author: snicoll
Date: Sun Dec 19 14:28:16 2010
New Revision: 1050860
URL: http://svn.apache.org/viewvc?rev=1050860&view=rev
Log:
MEAR-131: Rationalized the use of expresion vs. default-value for mojo
parameters.
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/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?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Dec 19 14:28:16 2010
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.4.3-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven EAR Plugin</name>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Sun Dec 19 14:28:16 2010
@@ -77,14 +77,14 @@ public abstract class AbstractEarMojo
/**
* Directory where the deployment descriptor file(s) will be
auto-generated.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
*/
protected String generatedDescriptorLocation;
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
*/
@@ -129,7 +129,7 @@ public abstract class AbstractEarMojo
/**
* Directory that resources are copied to during the build.
*
- * @parameter
expression="${project.build.directory}/${project.build.finalName}"
+ * @parameter
default-value="${project.build.directory}/${project.build.finalName}"
* @required
*/
private File workDirectory;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Sun Dec 19 14:28:16 2010
@@ -65,7 +65,7 @@ public class EarMojo
/**
* Single directory for extra files to include in the EAR.
*
- * @parameter expression="${basedir}/src/main/application"
+ * @parameter default-value="${basedir}/src/main/application"
* @required
*/
private File earSourceDirectory;
@@ -102,7 +102,7 @@ public class EarMojo
/**
* A list of file extensions that should not be filtered if
- * filtering is actived.
+ * filtering is enabled.
*
* @parameter
* @since 2.3.2
@@ -148,7 +148,7 @@ public class EarMojo
/**
* The directory for the generated EAR.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private String outputDirectory;
@@ -156,7 +156,7 @@ public class EarMojo
/**
* The name of the EAR file to generate.
*
- * @parameter alias="earName" expression="${project.build.finalName}"
+ * @parameter alias="earName" default-value="${project.build.finalName}"
* @required
*/
private String finalName;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
Sun Dec 19 14:28:16 2010
@@ -63,7 +63,7 @@ public class GenerateApplicationXmlMojo
* Display name of the application to be used when application.xml
* file is autogenerated.
*
- * @parameter expression="${project.artifactId}"
+ * @parameter default-value="${project.artifactId}"
*/
private String displayName;
@@ -71,7 +71,7 @@ public class GenerateApplicationXmlMojo
* Description of the application to be used when application.xml
* file is autogenerated.
*
- * @parameter expression="${project.description}"
+ * @parameter default-value="${project.description}"
*/
private String description;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/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?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/expected-META-INF/application.xml
Sun Dec 19 14:28:16 2010
@@ -17,10 +17,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
<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>
+ <description>A custom description</description>
+ <display-name>maven-ear-plugin-test-project-059</display-name>
<module>
<ejb>ejb-sample-one-1.0.jar</ejb>
</module>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml?rev=1050860&r1=1050859&r2=1050860&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-059/pom.xml
Sun Dec 19 14:28:16 2010
@@ -42,10 +42,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<displayName>${null}</displayName>
- <description>
- The purpose of this application is to test the ApplicationXmlMojo
execution with
- custom settings.
- </description>
+ <description>A custom description</description>
<encoding>UTF-8</encoding>
<version>6</version>
</configuration>
