January 2016 - Jaxx-commits - mailman.cloud.codelutin.com

branch release/2.28.2 deleted (was a58200f)
by nuiton.org scm 20 Jan '16

20 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.28.2 in repository jaxx. See http://git.nuiton.org/jaxx.git was a58200f [jgitflow-maven-plugin]updating poms for branch'release/2.28.2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

annotated tag jaxx-2.28.2 created (now 2d7ac3f)
by nuiton.org scm 20 Jan '16

20 Jan '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag jaxx-2.28.2 in repository jaxx. See http://git.nuiton.org/jaxx.git at 2d7ac3f (tag) tagging 99632ca5ac89cd4ce945bb76311d49afc73dfe70 (commit) replaces jaxx-2.28.1 tagged by Maven Release on Wed Jan 20 21:07:17 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.28.2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

branch release/2.28.2 updated (63f1cd4 -> a58200f)
by nuiton.org scm 20 Jan '16

20 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.28.2 in repository jaxx. See http://git.nuiton.org/jaxx.git from 63f1cd4 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions adds a58200f [jgitflow-maven-plugin]updating poms for branch'release/2.28.2' with non-snapshot versions No new revisions were added by this update. Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

branch master-2.x updated (d462746 -> 99632ca)
by nuiton.org scm 20 Jan '16

20 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch master-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from d462746 [jgitflow-maven-plugin]merging 'release/2.28.1' into 'master-2.x' adds 977d0a2 [jgitflow-maven-plugin]updating poms for 2.29-SNAPSHOT development adds 7b8d020 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2ac759f [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' adds 4d199b2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 04cbd37 Improve code adds da94dcc Use the cssExtension to scan if files are modified (See #3872) adds 8144e1a Fixes #3872 Merge branch 'feature/3872' into develop-2.x adds 63f1cd4 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions adds a58200f [jgitflow-maven-plugin]updating poms for branch'release/2.28.2' with non-snapshot versions adds 99632ca [jgitflow-maven-plugin]merging 'release/2.28.2' into 'master-2.x' No new revisions were added by this update. Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- .../org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 4 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 47 ++++++++++++---------- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 43 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

branch develop-2.x updated (8144e1a -> 14cae66)
by nuiton.org scm 20 Jan '16

20 Jan '16

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 8144e1a Fixes #3872 Merge branch 'feature/3872' into develop-2.x new 6b3927e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 63f1cd4 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions new a58200f [jgitflow-maven-plugin]updating poms for branch'release/2.28.2' with non-snapshot versions new 99632ca [jgitflow-maven-plugin]merging 'release/2.28.2' into 'master-2.x' new fa1ee48 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' new 14cae66 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 14cae66e0d076166e182c936c34c529b8717e0b2 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 21:07:22 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit fa1ee481dc07126d4cce92e285f030470a1699e9 Merge: 6b3927e 99632ca Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 21:07:21 2016 +0100 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' commit 6b3927e346f22d6f1f693021e2e22e9030413e97 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 21:07:20 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 99632ca5ac89cd4ce945bb76311d49afc73dfe70 Merge: d462746 a58200f Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 21:07:15 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.28.2' into 'master-2.x' commit a58200f9f0a70323b58e660b8071d1d88695d80d Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 20:58:30 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.28.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 5

[ANN] - JAXX 2.28.2 released
by nuiton.org Release Notification 20 Jan '16

20 Jan '16

The JAXX team is pleased to announce the jaxx-2.28.2 release! JAXX Project Documentation of the project can be found here: https://jaxx.nuiton.org Changes ------- Changes in this version include: Fixed Bugs: o If css file extension is changed, then jaxx files are not recompiled if only a css file changed Issue: 3872. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.nuiton.org/projects/jaxx/files * jaxx-widgets-extra-2.28.2-deps.zip - http://forge.nuiton.org/attachments/download/1218 * jaxx-widgets-extra-2.28.2-full.zip - http://forge.nuiton.org/attachments/download/1219 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2 Find us at * http://search.maven.org/#artifactdetails|org.nuiton|jaxx|2.28.2|jar Have fun! -JAXX team

1 0

branch release/2.28.2 created (now 63f1cd4)
by nuiton.org scm 20 Jan '16

20 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/2.28.2 in repository jaxx. See http://git.nuiton.org/jaxx.git at 63f1cd4 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions This branch includes the following new commits: new 63f1cd4 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions The 1 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 63f1cd4e075f872e0dc6417e5854a477e5d15e43 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 20 20:57:56 2016 +0100 [jgitflow-maven-plugin]updating poms for 2.28.2 branch with snapshot versions -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

03/03: Fixes #3872 Merge branch 'feature/3872' into develop-2.x
by nuiton.org scm 20 Jan '16

20 Jan '16

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(a)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(a)nuiton.org>.

1 0

02/03: Use the cssExtension to scan if files are modified (See #3872)
by nuiton.org scm 20 Jan '16

20 Jan '16

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(a)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(a)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(a)nuiton.org>.

1 0

branch develop-2.x updated (4d199b2 -> 8144e1a)
by nuiton.org scm 20 Jan '16

20 Jan '16

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(a)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(a)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(a)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(a)nuiton.org>.

1 1