svn commit: r674459 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement: AnnouncementMailMojo.java AnnouncementMojo.java

[de...@apache.org]

Author: dennisl
Date: Mon Jul  7 04:30:10 2008
New Revision: 674459

URL: http://svn.apache.org/viewvc?rev=674459&view=rev
Log:
[MCHANGES-113] Allow configuration of announcement parameters from command line

Modified:
    maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
    maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=674459&r1=674458&r2=674459&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Mon Jul  7 04:30:10 2008
@@ -59,7 +59,7 @@
     /**
      * Smtp Server.
      *
-     * @parameter
+     * @parameter expression="${changes.smtpHost}"
      * @required
      */
     private String smtpHost;
@@ -67,7 +67,7 @@
     /**
      * Port.
      *
-     * @parameter default-value="25";
+     * @parameter default-value="25" expression="${changes.smtpPort}"
      * @required
      */
     private int smtpPort;
@@ -75,28 +75,28 @@
     /**
      * The username used to send the email.
      *
-     * @parameter
+     * @parameter expression="${changes.username}"
      */
     private String username;
 
     /**
      * The password used to send the email.
      *
-     * @parameter
+     * @parameter expression="${changes.password}"
      */
     private String password;
 
     /**
      * If the email should be sent in SSL mode.
      *
-     * @parameter default-value="false"
+     * @parameter default-value="false" expression="${changes.sslMode}"
      */
     private boolean sslMode;
 
     /**
      * Subject for the email.
      *
-     * @parameter default-value="[ANNOUNCEMENT] - ${project.name} ${project.version} released"
+     * @parameter default-value="[ANNOUNCEMENT] - ${project.name} ${project.version} released" expression="${changes.subject}"
      * @required
      */
     private String subject;
@@ -115,7 +115,7 @@
      * Defines the sender of the announcement if the list of developer is empty or
      * if the sender is not a member of the development team.
      *
-     * @parameter
+     * @parameter expression="${changes.mailSender}"
      */
     private MailSender mailSender;
 
@@ -123,7 +123,7 @@
     /**
      * Recipient email address.
      *
-     * @parameter
+     * @parameter expression="${changes.toAddresses}"
      * @required
      */
     private List toAddresses;
@@ -148,7 +148,7 @@
     /**
      * The Velocity template used to format the announcement.
      *
-     * @parameter default-value="announcement.vm"
+     * @parameter default-value="announcement.vm" expression="${changes.template}"
      * @required
      */
     private String template;

Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=674459&r1=674458&r2=674459&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Mon Jul  7 04:30:10 2008
@@ -123,7 +123,7 @@
     /**
      * Name of the team that develops the artifact.
      *
-     * @parameter default-value="${project.name} team"
+     * @parameter default-value="${project.name} team" expression="${changes.developmentTeam}"
      * @required
      */
     private String developmentTeam;
@@ -146,7 +146,7 @@
     /**
      * The Velocity template used to format the announcement.
      *
-     * @parameter default-value="announcement.vm"
+     * @parameter default-value="announcement.vm" expression="${changes.template}"
      * @required
      */
     private String template;
@@ -158,7 +158,7 @@
      * <code>/src/main/resources/</code>.
      * </p>
      *
-     * @parameter default-value="org/apache/maven/plugin/announcement"
+     * @parameter default-value="org/apache/maven/plugin/announcement" expression="${changes.templateDirectory}"
      * @required
      */
     private String templateDirectory;
@@ -202,7 +202,7 @@
      * called "statusId".
      * </p>
      *
-     * @parameter default-value="Closed"
+     * @parameter default-value="Closed" expression="${changes.statusIds}"
      */
     private String statusIds;
 
@@ -213,7 +213,7 @@
      * called "resolutionId".
      * </p>
      *
-     * @parameter default-value="Fixed"
+     * @parameter default-value="Fixed" expression="${changes.resolutionIds}"
      */
     private String resolutionIds;
 
@@ -227,13 +227,13 @@
     private File jiraXML;
 
     /**
-     * The maximum number of issues to include.
+     * The maximum number of issues to fetch from JIRA.
      * <p>
      * <b>Note:</b> In versions 2.0-beta-3 and earlier this parameter was
      * called "nbEntries".
      * </p>
      *
-     * @parameter default-value="25"
+     * @parameter default-value="25"  expression="${changes.maxEntries}"
      * @required
      */
     private int maxEntries;