Author: tchemit Date: 2013-08-07 18:39:44 +0200 (Wed, 07 Aug 2013) New Revision: 900 Url: http://nuiton.org/projects/maven-helper-plugin/repository/revisions/900 Log: fix api Modified: trunk/helper-maven-plugin-api/src/main/java/org/nuiton/plugin/AbstractPlugin.java trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/ShareServerSecretPlugin.java Modified: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java =================================================================== --- trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2013-08-07 16:15:33 UTC (rev 899) +++ trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2013-08-07 16:39:44 UTC (rev 900) @@ -282,9 +282,9 @@ String key = buffer.toString(); - boolean wasAlreadyExecuted = checkRunOnceDone(runOnce, false, key); + boolean shouldInvoke = needInvoke(runOnce, false, key); - if (wasAlreadyExecuted) { + if (!shouldInvoke) { return false; } Modified: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java =================================================================== --- trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2013-08-07 16:15:33 UTC (rev 899) +++ trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2013-08-07 16:39:44 UTC (rev 900) @@ -238,7 +238,7 @@ return false; } - return true; + return super.checkSkip(); } @Override Modified: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java =================================================================== --- trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java 2013-08-07 16:15:33 UTC (rev 899) +++ trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java 2013-08-07 16:39:44 UTC (rev 900) @@ -309,14 +309,10 @@ buffer.append("##").append(mailSender.getEmail()); String key = buffer.toString(); - boolean wasAlreadyExecuted = checkRunOnceDone(runOnce, false, key); + boolean shouldInvoke = needInvoke(runOnce, false, key); - if (wasAlreadyExecuted) { + return shouldInvoke && super.checkSkip(); - return false; - } - - return super.checkSkip(); } @Override Modified: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/ShareServerSecretPlugin.java =================================================================== --- trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/ShareServerSecretPlugin.java 2013-08-07 16:15:33 UTC (rev 899) +++ trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/ShareServerSecretPlugin.java 2013-08-07 16:39:44 UTC (rev 900) @@ -256,24 +256,26 @@ @Override public boolean checkSkip() { + if (isGoalSkip()) { + getLog().info("Skip flag is on, goal will not be executed."); + return false; + } + + // check if plugin was already done StringBuilder buffer = new StringBuilder("share-secret##"); buffer.append(serverId); buffer.append("##"); for (Map.Entry<Property, String> entry : propertiesToTreate.entrySet()) { - buffer.append(entry.getKey()).append(entry.getValue()); + buffer.append(entry.getKey()).append('-').append(entry.getValue()); } - // check if plugin was already done. String key = buffer.toString(); - boolean wasAlreadyDone = checkRunOnceDone(runOnce, false, key); + boolean shouldInvoke = needInvoke(runOnce, false, key); - if (wasAlreadyDone) { - return false; - } + return shouldInvoke && super.checkSkip(); - return super.checkSkip(); } @Override Modified: trunk/helper-maven-plugin-api/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/helper-maven-plugin-api/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2013-08-07 16:15:33 UTC (rev 899) +++ trunk/helper-maven-plugin-api/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2013-08-07 16:39:44 UTC (rev 900) @@ -281,31 +281,32 @@ } /** - * Check if an execution was already done according to the given parameters. - * + * Check if an execution should be done or not according to the + * given parameters. + * <p/> * Will search if the given {@code key} is found in project, if not then * means that the plugin was not invoked. * * @param runOnce always return true if not set * @param onlyForRoot flag to only accept root project * @param key key to check over project (first time will put it in project properties) - * @return {@code true} if the goal was already invoked, {@code false} - * otherwise (means should run it now!). + * @return {@code true} if the goal should be invoked, {@code false} + * otherwise. * @since 2.1 */ - protected boolean checkRunOnceDone(boolean runOnce, - boolean onlyForRoot, - String key) { + protected boolean needInvoke(boolean runOnce, + boolean onlyForRoot, + String key) { if (!runOnce) { // will run each time - return false; + return true; } if (onlyForRoot && !isExecutionRoot()) { // never do it for a child - return true; + return false; }