r411 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . announcement - Jredmine-commits

8 Aug 2013

Author: tchemit
Date: 2013-08-08 14:31:31 +0200 (Thu, 08 Aug 2013)
New Revision: 411

Url: http://nuiton.org/projects/jredmine/repository/revisions/411

Log:
improve log messages

Modified:
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java
   trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java
===================================================================

--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -321,11 +321,11 @@
             SkipOrRunOnlyOnceAware m = ((SkipOrRunOnlyOnceAware) this);
 
             if (m.isGoalSkip()) {
-                getLog().warn("The goal is skip due to the skipGoal flag on");
+                getLog().info("Skipping goal (" + m.getSkipProperty() + " flag is on).");
                 return false;
             }
             if (m.isRunOnce() && m.isRunOnceDone()) {
-                getLog().info("skip goal, runOnce flag is on, and was already executed.");
+                getLog().info("Skipping goal (runOnce flag is on, and was already executed).");
                 return false;
             }
         }

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -278,6 +278,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipGenerateChanges";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipGenerateChanges;
     }
@@ -379,16 +384,6 @@
             throw new MojoExecutionException("could not obtain categories for reason " + e.getMessage(), e);
         }
 
-//        // get versions
-//
-//        try {
-//
-//            versions = service.getVersions(projectId);
-//
-//        } catch (RedmineServiceException e) {
-//            throw new MojoExecutionException("could not obtain versions for reason " + e.getMessage(), e);
-//        }
-
         filters = new HashMap<String, String>();
 
         // build trackerToAction and tracker filter

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -105,8 +105,8 @@
      *
      * @since 1.6
      */
-    @Parameter(property = "redmine.useLastPreviousVersion")
-    protected boolean useLastPreviousVersion;
+    @Parameter(property = "redmine.useLatestClosedVersion")
+    protected boolean useLatestClosedVersion;
 
     /**
      * A flag to skip the goal.
@@ -187,6 +187,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipNextVersion";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipNextVersion;
     }
@@ -274,10 +279,10 @@
                 safePreviousVersionName = previousVersionName;
             }
 
-            if (useLastPreviousVersion) {
-                getLog().warn("useLastPreviousVersion flag has no effect when previousVersionName property is filled.");
+            if (useLatestClosedVersion) {
+                getLog().warn("useLatestClosedVersion flag has no effect when previousVersionName property is filled.");
             }
-        } else if (useLastPreviousVersion) {
+        } else if (useLatestClosedVersion) {
 
             // get all version
             Version previousVersion = service.getLastestClosedVersion(projectId);

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -166,6 +166,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipPublishAttachments";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipPublishAttachments;
     }

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -155,6 +155,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipPublishNews";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipPublishNews;
     }

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/SkipOrRunOnlyOnceAware.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -32,6 +32,8 @@
  */
 public interface SkipOrRunOnlyOnceAware {
 
+    String getSkipProperty();
+
     boolean isGoalSkip();
 
     boolean isRunOnce();

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -192,6 +192,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipUpdateVersion";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipUpdateVersion;
     }

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -70,6 +70,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipGenerateEmailAnnouncement";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipGenerateEmailAnnouncement;
     }

Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java
===================================================================
--- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java	2013-08-08 10:58:51 UTC (rev 410)
+++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java	2013-08-08 12:31:31 UTC (rev 411)
@@ -70,6 +70,11 @@
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
+    public String getSkipProperty() {
+        return "skipGenerateNewsAnnouncement";
+    }
+
+    @Override
     public boolean isGoalSkip() {
         return skipGenerateNewsAnnouncement;
     }

    

r411 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . announcement

tchemit＠users.nuiton.org

tags

participants (1)