- Nuiton-decorator-commits - mailman.cloud.codelutin.com

r2605 - trunk
by tchemit＠users.nuiton.org Feb. 4, 2014

Feb. 4, 2014

Author: tchemit Date: 2014-02-04 10:22:38 +0100 (Tue, 04 Feb 2014) New Revision: 2605 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2605 Log: [maven-release-plugin] prepare release nuiton-decorator-3.0-alpha-3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 09:19:41 UTC (rev 2604) +++ trunk/pom.xml 2014-02-04 09:22:38 UTC (rev 2605) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-decorator</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-3</version> <name>Nuiton Decorator</name> <description>Simple Decorator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.0-a… </connection> <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.0-a… </developerConnection> - <url>https://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-decorator/repository/show/tags/nuiton-de…</url> </scm> <distributionManagement> <site>

1 0

r2604 - trunk
by tchemit＠users.nuiton.org Feb. 4, 2014

Feb. 4, 2014

Author: tchemit Date: 2014-02-04 10:19:41 +0100 (Tue, 04 Feb 2014) New Revision: 2604 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2604 Log: fixes #3037: Updates mavenpom to 4.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 06:43:05 UTC (rev 2603) +++ trunk/pom.xml 2014-02-04 09:19:41 UTC (rev 2604) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.6</version> + <version>4.7</version> </parent> <artifactId>nuiton-decorator</artifactId>

1 0

r2603 - in trunk: . src/site
by tchemit＠users.nuiton.org Feb. 4, 2014

Feb. 4, 2014

Author: tchemit Date: 2014-02-04 07:43:05 +0100 (Tue, 04 Feb 2014) New Revision: 2603 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2603 Log: fixes #3037: Updates mavenpom to 4.6 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-09-30 15:52:30 UTC (rev 2602) +++ trunk/LICENSE.txt 2014-02-04 06:43:05 UTC (rev 2603) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 15:52:30 UTC (rev 2602) +++ trunk/pom.xml 2014-02-04 06:43:05 UTC (rev 2603) @@ -5,11 +5,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-3-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Decorator</name> <description>Simple Decorator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> </scm> <distributionManagement> <site> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-09-30 15:52:30 UTC (rev 2602) +++ trunk/src/site/site_fr.xml 2014-02-04 06:43:05 UTC (rev 2603) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <links> @@ -95,7 +95,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -104,7 +104,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>

1 0

Build failed in Jenkins: nuiton-decorator #1
by admin+ci-nuiton.org＠codelutin.com Jan. 26, 2014

Jan. 26, 2014

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/1/> ------------------------------------------ Started by an SCM change Building in workspace <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/> Checking out a fresh workspace because <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk> doesn't exist Cleaning local Directory trunk Checking out http://svn.nuiton.org/svn/nuiton-decorator/trunk at revision '2014-01-26T00:53:47.271 +0100' AU LICENSE.txt A src A src/test A src/test/java A src/test/java/org A src/test/java/org/nuiton A src/test/java/org/nuiton/decorator AU src/test/java/org/nuiton/decorator/DecoratorMulti18nProviderTest.java AU src/test/java/org/nuiton/decorator/MapPropertyHandlerTest.java AU src/test/java/org/nuiton/decorator/JXPathDecoratorTest.java AU src/test/java/org/nuiton/decorator/Data.java AU src/test/java/org/nuiton/decorator/JXPathContextTester.java AU src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java AU src/test/java/org/nuiton/decorator/DecoratorProviderTest.java A src/test/resources AU src/test/resources/log4j.properties A src/main A src/main/java A src/main/java/org A src/main/java/org/nuiton A src/main/java/org/nuiton/decorator AU src/main/java/org/nuiton/decorator/DecoratorMulti18nProvider.java AU src/main/java/org/nuiton/decorator/DecoratorUtil.java AU src/main/java/org/nuiton/decorator/MapPropertyHandler.java AU src/main/java/org/nuiton/decorator/JXPathDecorator.java AU src/main/java/org/nuiton/decorator/Decorator.java AU src/main/java/org/nuiton/decorator/package-info.java AU src/main/java/org/nuiton/decorator/PropertyDecorator.java AU src/main/java/org/nuiton/decorator/MultiJXPathDecorator.java AU src/main/java/org/nuiton/decorator/DecoratorProvider.java A src/main/resources A src/site A src/site/apt AU src/site/apt/index.apt AU src/site/apt/versions.apt AU src/site/site_fr.xml AU pom.xml AU README.txt U . At revision 2602 Parsing POMs Discovered a new module org.nuiton:nuiton-decorator Nuiton Decorator Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Djava.awt.headless=true -cp /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/tomcat/nuiton.org/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 47333 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/pom.xml> -s /var/local/forge/data/nuiton.org/maven/settings.xml -e -U clean verify [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Decorator 3.0-alpha-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-decorator --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-decorator --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-decorator --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-decorator --- [INFO] Compiling 9 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/classes> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…>: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…> uses unchecked or unsafe operations. [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ nuiton-decorator --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/surefi…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ nuiton-decorator --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ nuiton-decorator --- [INFO] Compiling 7 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/test-c…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/test/java…>: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/test/java…> uses unchecked or unsafe operations. [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/test/java…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:2.15:test (default-test) @ nuiton-decorator --- [INFO] Surefire report directory: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/surefi…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.decorator.MapPropertyHandlerTest INFO [main] (MapPropertyHandlerTest.java:72) setUp - init map : {one=true, two=false} INFO [main] (MapPropertyHandlerTest.java:72) setUp - init map : {one=true, two=false} INFO [main] (MapPropertyHandlerTest.java:72) setUp - init map : {one=true, two=false} Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.145 sec - in org.nuiton.decorator.MapPropertyHandlerTest Running org.nuiton.decorator.DecoratorMulti18nProviderTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.04 sec - in org.nuiton.decorator.DecoratorMulti18nProviderTest Running org.nuiton.decorator.MultiJXPathDecoratorTest s=((%1$s) - %2$d) - 2 s=2 - (%1$d - (%2$s)) s=((%1$s) - %2$d) - 2 Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec - in org.nuiton.decorator.MultiJXPathDecoratorTest Running org.nuiton.decorator.JXPathDecoratorTest Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec - in org.nuiton.decorator.JXPathDecoratorTest Running org.nuiton.decorator.DecoratorProviderTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.nuiton.decorator.DecoratorProviderTest Results : Tests run: 31, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ nuiton-decorator --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/nuiton…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-decorator --- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 6.023s [INFO] Finished at: Sun Jan 26 00:53:57 CET 2014 [INFO] Final Memory: 21M/239M [INFO] ------------------------------------------------------------------------ channel stopped [trunk] $ /opt/maven3/bin/mvn -f pom.xml -s /var/local/forge/data/nuiton.org/maven/settings.xml -e clean deploy -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Decorator 3.0-alpha-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-decorator --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ nuiton-decorator --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ nuiton-decorator --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] 22 dependencies to check. [INFO] 22 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 3.218s [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-decorator --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ nuiton-decorator --- [INFO] Exporting server [redmine-nuiton.org] username in ${redmine.username} [INFO] Exporting server [redmine-nuiton.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ nuiton-decorator --- [INFO] Will create or update license file [lgpl_v3] to <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/LICENSE.txt> [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ nuiton-decorator --- [INFO] Writing third-party file to <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/genera…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-decorator --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.5:update-file-header (update-file-header) @ nuiton-decorator --- [INFO] Will search files to update from root <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src> [INFO] Will search files to update from root <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/genera…> [INFO] Scan 20 files header done in 64.823ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-decorator --- [INFO] Compiling 9 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/target/classes> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…>: <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…> uses unchecked or unsafe operations. [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-decorator/ws/trunk/src/main/java…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ nuiton-decorator --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ nuiton-decorator --- [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 7.294s [INFO] Finished at: Sun Jan 26 00:54:06 CET 2014 [INFO] Final Memory: 36M/439M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project nuiton-decorator: the version '3.0-alpha-3' could not be retrieve from redmine server. -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project nuiton-decorator: the version '3.0-alpha-3' could not be retrieve from redmine server. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214) at org.apache.maven.cli.MavenCli.main(MavenCli.java:158) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) Caused by: org.apache.maven.plugin.MojoExecutionException: the version '3.0-alpha-3' could not be retrieve from redmine server. at org.nuiton.jredmine.plugin.AbstractRedmineMojo.failIfSafe(AbstractRedmineMojo.java:396) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion.init(AbstractRedmineMojoWithProjectAndVersion.java:119) at org.nuiton.jredmine.plugin.GenerateChangesMojo.init(GenerateChangesMojo.java:348) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:106) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Build step 'Invoke top-level Maven targets' marked build as failure

1 1

[ANN] - Nuiton Decorator 3.0-alpha-2 released
by nuiton.org Release Notification Sept. 30, 2013

Sept. 30, 2013

The Nuiton Decorator team is pleased to announce the nuiton-decorator-3.0-alpha-2 release! Simple Decorator API Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-decorator Changes ------- Changes in this version include: New features: o Add a way in MultiJxPath to keep the order of context, when changing it Issue: 2858. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/nuiton-decorator/files * nuiton-decorator-3.0-alpha-2-deps.zip - http://nuiton.org/attachments/download/968 * nuiton-decorator-3.0-alpha-2-full.zip - http://nuiton.org/attachments/download/969 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|nuiton-decorator|3.0-al… Have fun! -Nuiton Decorator team

1 0

r2602 - trunk
by maven-release＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 17:52:30 +0200 (Mon, 30 Sep 2013) New Revision: 2602 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2602 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 15:52:27 UTC (rev 2601) +++ trunk/pom.xml 2013-09-30 15:52:30 UTC (rev 2602) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-alpha-3-SNAPSHOT</version> <name>Nuiton Decorator</name> <description>Simple Decorator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.… + scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.… + scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-decorator/repository/show/tags/nuiton-dec…</url> + <url>http://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2601 - in tags: . nuiton-decorator-3.0-alpha-2
by maven-release＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 17:52:27 +0200 (Mon, 30 Sep 2013) New Revision: 2601 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2601 Log: [maven-release-plugin] copy for tag nuiton-decorator-3.0-alpha-2 Added: tags/nuiton-decorator-3.0-alpha-2/ Property changes on: tags/nuiton-decorator-3.0-alpha-2 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2600 - trunk
by maven-release＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 17:52:24 +0200 (Mon, 30 Sep 2013) New Revision: 2600 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2600 Log: [maven-release-plugin] prepare release nuiton-decorator-3.0-alpha-2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-28 14:27:50 UTC (rev 2599) +++ trunk/pom.xml 2013-09-30 15:52:24 UTC (rev 2600) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-decorator</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-2</version> <name>Nuiton Decorator</name> <description>Simple Decorator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.… </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-decorator/tags/nuiton-decorator-3.… </developerConnection> - <url>http://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-decorator/repository/show/tags/nuiton-dec…</url> </scm> <distributionManagement> <site>

1 0

r2599 - in trunk/src: main/java/org/nuiton/decorator test/java/org/nuiton/decorator
by tchemit＠users.nuiton.org Sept. 28, 2013

Sept. 28, 2013

Author: tchemit Date: 2013-09-28 16:27:50 +0200 (Sat, 28 Sep 2013) New Revision: 2599 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2599 Log: fixes #2858: Add a way in MultiJxPath to keep the order of context, when changing it Modified: trunk/src/main/java/org/nuiton/decorator/DecoratorUtil.java trunk/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java Modified: trunk/src/main/java/org/nuiton/decorator/DecoratorUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/decorator/DecoratorUtil.java 2013-08-09 09:04:09 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/decorator/DecoratorUtil.java 2013-09-28 14:27:50 UTC (rev 2599) @@ -124,6 +124,25 @@ return decorator; } + /** + * Build a new multi jx path decorator which uise a cycling order while changing the context index. + * <p/> + * For example, having a initial expression: + * <pre>A - B - C</pre> + * <p/> + * When setting conext index to 1, then we will us this expression: + * <pre>B - C - A</pre> + * + * @param type type of bean + * @param expression initial expression + * @param separator expression context separator + * @param separatorReplacement context separator replacement in decorator + * @param <O> type of bean + * @return the new decorator + * @throws IllegalArgumentException ... + * @throws NullPointerException ... + * @since 3.0 + */ public static <O> MultiJXPathDecorator<O> newMultiJXPathDecorator( Class<O> type, String expression, @@ -145,6 +164,45 @@ } /** + * Build a new multi jx path decorator which keep order of incoming expression while changing the context index. + * <p/> + * For example, having a initial expression: + * <pre>A - B - C</pre> + * <p/> + * When setting conext index to 1, then we will us this expression: + * <pre>B - A - C</pre> + * + * @param type type of bean + * @param expression initial expression + * @param separator expression context separator + * @param separatorReplacement context separator replacement in decorator + * @param <O> type of bean + * @return the new decorator + * @throws IllegalArgumentException ... + * @throws NullPointerException ... + * @since 3.0 + */ + public static <O> MultiJXPathDecorator<O> newMultiJXPathDecoratorKeepingOrder( + Class<O> type, + String expression, + String separator, + String separatorReplacement) + throws IllegalArgumentException, NullPointerException { + + Context<O>[] contexts = createMultiJXPathContextKeepingOrder( + expression, + separator, + separatorReplacement); + + return new MultiJXPathDecorator<O>( + type, + expression, + separator, + separatorReplacement, + contexts); + } + + /** * Sort a list of data based on the first token property of a given context * in a given decorator. * @@ -291,6 +349,81 @@ return contexts; } + public static <O> Context<O>[] createMultiJXPathContextKeepingOrder( + String expression, + String separator, + String separatorReplacement) { + int sep = expression.indexOf(separator); + if (sep == -1) { + Context<O>[] result = newInstance(1); + result[0] = createJXPathContext(expression); + return result; + } + + List<String> tokens = new ArrayList<String>(); + StringTokenizer stk = new StringTokenizer(expression, separator); + while (stk.hasMoreTokens()) { + tokens.add(stk.nextToken()); + } + + int nbTokens = tokens.size(); + Context<O>[] contexts = newInstance(nbTokens); + if (log.isDebugEnabled()) { + log.debug("Will prepare " + nbTokens + " contexts from [" + expression + "]"); + } + for (int i = 0; i < nbTokens; i++) { + StringBuilder buffer = new StringBuilder(expression.length()); + + { + // first set the i context, then keep context in order + int index = i; + String str = tokens.get(index); + + //replace all '%(index+1)$' pattern with '%(1)$' + Pattern p = Pattern.compile("\\%(" + (index + 1) + ")\\$"); + Matcher matcher = p.matcher(str); + String safeStr = matcher.replaceAll("\\%" + (1) + "\\$"); + + if (log.isDebugEnabled()) { + log.debug("[" + (index + 1) + "-->" + (1) + "] " + str + + " transformed to " + safeStr); + } + buffer.append(separatorReplacement).append(safeStr); + } + for (int j = 0; j < nbTokens; j++) { + if (j == i) { + + // already done + continue; + } + + int index = j; + + String str = tokens.get(index); + + int againstIndex = j < i ? j + 1 : j; + + //replace all '%(index+1)$' pattern with '%(againstIndex+1)$' + Pattern p = Pattern.compile("\\%(" + (index + 1) + ")\\$"); + Matcher matcher = p.matcher(str); + String safeStr = matcher.replaceAll("\\%" + (againstIndex + 1) + "\\$"); + + if (log.isDebugEnabled()) { + log.debug("[" + (index + 1) + "-->" + (againstIndex + 1) + "] " + str + + " transformed to " + safeStr); + } + buffer.append(separatorReplacement).append(safeStr); + } + String expr = buffer.substring(separatorReplacement.length()); + if (log.isDebugEnabled()) { + log.debug("context [" + i + "] : " + expr); + } + contexts[i] = createJXPathContext( + expr); + } + return contexts; + } + @SuppressWarnings("unchecked") protected static <O> Context<O>[] newInstance(int size) { // fixme how to instanciate a typed array with no checking warning ? Modified: trunk/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java 2013-08-09 09:04:09 UTC (rev 2598) +++ trunk/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java 2013-09-28 14:27:50 UTC (rev 2599) @@ -198,6 +198,35 @@ } @Test + public void testMultiDecoratorWithMultiRefKeepingOrder() throws Exception { + + decorator = DecoratorUtil.newMultiJXPathDecoratorKeepingOrder(JXPathDecorator.class, "${expression}$s#${nbToken}$d#${separator}$s %3$s", "#", " - "); + + assertEquals("%1$s - %2$d - %3$s %3$s", decorator.getExpression()); + assertTokens("expression", "nbToken", "separator"); + assertEquals(3, decorator.contexts.length); + + expected = String.format(decorator.getExpression(), decorator.getExpression(), decorator.getNbToken(), decorator.getSeparator()); + result = decorator.toString(decorator); + assertEquals(expected, result); + + decorator.setContextIndex(1); + assertEquals("%1$d - %2$s - %3$s %3$s", decorator.getExpression()); + assertTokens("nbToken", "expression", "separator"); + expected = String.format(decorator.getExpression(), decorator.getNbToken(), decorator.getExpression(), decorator.getSeparator()); + result = decorator.toString(decorator); + assertEquals(expected, result); + + decorator.setContextIndex(2); + assertEquals("%1$s %1$s - %2$s - %3$d", decorator.getExpression()); + assertTokens("separator", "expression", "nbToken"); + + expected = String.format(decorator.getExpression(), decorator.getSeparator(), decorator.getExpression(), decorator.getNbToken()); + result = decorator.toString(decorator); + assertEquals(expected, result); + } + + @Test public void testSort() throws Exception { List<Data> datas = Data.generate(10);

1 0

r2598 - trunk
by tchemit＠users.nuiton.org Aug. 9, 2013

Aug. 9, 2013

Author: tchemit Date: 2013-08-09 11:04:09 +0200 (Fri, 09 Aug 2013) New Revision: 2598 Url: http://nuiton.org/projects/nuiton-decorator/repository/revisions/2598 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:48:18 UTC (rev 2597) +++ trunk/pom.xml 2013-08-09 09:04:09 UTC (rev 2598) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <artifactId>nuiton-decorator</artifactId> @@ -58,6 +58,8 @@  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies>

1 0