branch develop-2.x updated (4d199b2 -> 8144e1a)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from 4d199b2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 04cbd37 Improve code new da94dcc Use the cssExtension to scan if files are modified (See #3872) new 8144e1a Fixes #3872 Merge branch 'feature/3872' into develop-2.x The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8144e1a90aae2841d3b3000d594aa1d887dd3f99 Merge: 04cbd37 da94dcc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 20:53:00 2016 +0100 Fixes #3872 Merge branch 'feature/3872' into develop-2.x commit da94dcc875ab2ba7fd18db750881172db5d54b12 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 20:52:57 2016 +0100 Use the cssExtension to scan if files are modified (See #3872) commit 04cbd3730f09430d6c2500c0e925f7de8184bd0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 19:41:18 2016 +0100 Improve code Summary of changes: .../org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 4 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 47 ++++++++++++---------- 2 files changed, 27 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 04cbd3730f09430d6c2500c0e925f7de8184bd0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 19:41:18 2016 +0100 Improve code --- .../src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index 572d2ed..da7328a 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -53,6 +53,7 @@ import org.nuiton.plugin.PluginHelper; import java.beans.Introspector; import java.io.File; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -395,7 +396,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat getFilesToTreateForRoots( includes, excludes, - Arrays.asList(src.getAbsolutePath()), + Collections.singletonList(src.getAbsolutePath()), result, isForce() ? null : updater); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit da94dcc875ab2ba7fd18db750881172db5d54b12 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 20:52:57 2016 +0100 Use the cssExtension to scan if files are modified (See #3872) --- .../org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 4 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 44 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java index 481831e..41d9444 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java @@ -168,8 +168,8 @@ public abstract class AbstractJaxxMojo extends AbstractPlugin implements PluginW */ public static class JaxxFileUpdater extends MirroredFileUpdater { - protected JaxxFileUpdater(File sourceDirectory, File destinationDirectory) { - super(".jaxx|*.css", ".java", sourceDirectory, destinationDirectory); + protected JaxxFileUpdater(String cssExtension, File sourceDirectory, File destinationDirectory) { + super(".jaxx|*." + cssExtension, ".java", sourceDirectory, destinationDirectory); } @Override diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index da7328a..db62017 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -66,12 +66,9 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com */ @Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_SOURCES, - requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true) + requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true) public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfiguration { - /** Default includes to use, if none provided */ - private static final String[] INCLUDES = {"**/*.jaxx", "**/*.css"}; - /** * Directory where jaxx files are located. */ @@ -386,11 +383,16 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat } fixCompileSourceRoots(); + if (cssExtension==null) { + cssExtension = DEFAULT_CSS_EXTENSION; + } + if (includes == null || includes.length == 0) { // use default includes - includes = INCLUDES; + includes = new String[]{"**/*.jaxx", "**/*." + cssExtension}; } - updater = new JaxxFileUpdater(src, outJava); + + updater = new JaxxFileUpdater(cssExtension, src, outJava); Map<File, String[]> result = new HashMap<File, String[]>(); getFilesToTreateForRoots( @@ -407,16 +409,16 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat // if a css is modified, try to find the corresponding jaxx files if (files != null && files.length > 0) { Set<String> filterFiles = new HashSet<String>(files.length); + int cssExtensionLength = cssExtension.length() + 1; for (String path : files) { - if (path.endsWith(".css")) { + if (path.endsWith("." + cssExtension)) { // take the jaxx file - String jaxxFilePath = - path.substring(0, path.length() - 4) + ".jaxx"; + String jaxxFilePath = path.substring(0, path.length() - cssExtensionLength) + ".jaxx"; File f = new File(src, jaxxFilePath); if (f.exists()) { if (isVerbose()) { getLog().info("will treate jaxx file from css " + - f); + f); } filterFiles.add(jaxxFilePath); } @@ -438,12 +440,12 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat } cl = initClassLoader(getProject(), - src, - addSourcesToClassPath, - testPhase, - addResourcesToClassPath, - addCompileClassPath, - addProjectClassPath); + src, + addSourcesToClassPath, + testPhase, + addResourcesToClassPath, + addCompileClassPath, + addProjectClassPath); Thread.currentThread().setContextClassLoader(cl); @@ -456,7 +458,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat if (!JAXXContext.class.isAssignableFrom(jaxxContextClass)) { throw new MojoExecutionException( "jaxxContextFQN must be an implementation of " + - JAXXContext.class + " but was : " + jaxxContextClass); + JAXXContext.class + " but was : " + jaxxContextClass); } // validatorClass = Class.forName(validatorFQN, false, cl); @@ -704,8 +706,8 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat if (!warnings.isEmpty()) { StringBuilder buffer = new StringBuilder( "JAXX detects " + - (warnings.size() == 1 ? "1 warning" : - warnings.size() + " warnings")); + (warnings.size() == 1 ? "1 warning" : + warnings.size() + " warnings")); buffer.append(" :"); for (String s : warnings) { buffer.append("\n").append(s); @@ -716,8 +718,8 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat if (!errors.isEmpty()) { StringBuilder buffer = new StringBuilder( "JAXX detects " + - (errors.size() == 1 ? "1 error" : - errors.size() + " errors")); + (errors.size() == 1 ? "1 error" : + errors.size() + " errors")); buffer.append(" :"); for (String s : errors) { buffer.append("\n").append(s); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 8144e1a90aae2841d3b3000d594aa1d887dd3f99 Merge: 04cbd37 da94dcc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 20:53:00 2016 +0100 Fixes #3872 Merge branch 'feature/3872' into develop-2.x .../org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 4 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 44 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm