March 2014 - Chorem-commits - mailman.cloud.codelutin.com

Build failed in Jenkins: chorem-nightly #1
by admin+ci-chorem.org＠codelutin.com 11 Apr '14

11 Apr '14

1 8

Build failed in Jenkins: chorem-nightly » Chorem :: webmotion #6
by admin+ci-chorem.org＠codelutin.com 11 Apr '14

11 Apr '14

See <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> Changes: [ymartel] review dependencies ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Chorem :: webmotion 0.3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… (2 KB at 1.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… (609 B at 1.1 KB/sec) [WARNING] The POM for org.antlr:stringtemplate:jar:3.2.1 is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ chorem-webmotion --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ chorem-webmotion --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ chorem-webmotion --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ chorem-webmotion --- [INFO] Exporting server [redmine-chorem.org] username in ${redmine.username} [INFO] Exporting server [redmine-chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- maven-processor-plugin:1.1:process (default) @ chorem-webmotion --- [INFO] Processing 44 files(s). [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ chorem-webmotion --- [INFO] Will create or update license file [agpl_v3] to <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ chorem-webmotion --- [WARNING] Unable to obtain POM for artifact : org.antlr:stringtemplate:jar:3.2.1:compile org.apache.maven.project.InvalidProjectModelException: 1 problem was encountered while building the effective model [FATAL] Non-readable POM /var/local/forge/data/chorem.org/maven/repository/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.pom: input contained no data @ for project for project at org.apache.maven.project.DefaultMavenProjectBuilder.transformError(DefaultMavenProjectBuilder.java:193) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromRepository(DefaultMavenProjectBuilder.java:240) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromRepository(DefaultMavenProjectBuilder.java:251) at org.codehaus.mojo.license.api.DefaultDependenciesTool.loadProjectDependencies(DefaultDependenciesTool.java:206) at org.codehaus.mojo.license.api.DefaultThirdPartyHelper.loadDependencies(DefaultThirdPartyHelper.java:152) at org.codehaus.mojo.license.AddThirdPartyMojo.loadDependencies(AddThirdPartyMojo.java:288) at org.codehaus.mojo.license.AbstractAddThirdPartyMojo.init(AbstractAddThirdPartyMojo.java:386) at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:174) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) 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:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) 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.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) 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 hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) [INFO] Load missing file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> [WARNING] dependency [javax.servlet--servlet-api--2.5] does not exist in project, remove it from the missing file. [WARNING] dependency [jakarta-regexp--jakarta-regexp--1.4] does not exist in project, remove it from the missing file. [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/com/google/code/g… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/tho… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/com/thoughtworks/… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/thoughtworks/paranamer/paranamer/2.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/commons… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-configura… [INFO] Downloading: http://repo.maven.apache.org/maven2/commons-configuration/commons-configura… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/javax/s… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/javax/servlet/jst… [INFO] Downloading: http://repo.maven.apache.org/maven2/javax/servlet/jstl/1.2/jstl-1.2-third-p… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/javax/v… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/javax/validation/… [INFO] Downloading: http://repo.maven.apache.org/maven2/javax/validation/validation-api/1.0.0.G… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/net/sourceforge/j… [INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/javacsv/javacsv/2.0/jav… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ant… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/antlr/ST4/4.0… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.4/ST4-4.0.4-third-par… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ant… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/antlr/antlr-r… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.3/antlr-runti… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/bou… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/bouncycastle/… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcpr… [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/jenkins/workspace/chorem-nightly/trunk/chorem-entities/src/license/THIRD-PARTY.properties [INFO] Load missing file /var/local/forge/data/chorem.org/jenkins/workspace/chorem-nightly/trunk/chorem-entities/src/license/THIRD-PARTY.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-http/8.1.1.v201… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-io/8.1.1.v20120… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/8.1.1.v201… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-websocket/8.1.1… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/hibernate/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-validator/4.2.0… [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (884 B at 21.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/nuiton… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/nuiton… (884 B at 34.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-csv/3.0-alpha-3/nuito… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-csv/3.0-alpha-3/nuito… (884 B at 2.6 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (859 B at 30.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… (859 B at 24.0 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-angularjs/1.2.1… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-angularjs/1.2.1… (859 B at 2.5 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-angularjs/1.2.12-1/nuiton-js-angularjs-1.2.12-1-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-angularjs/1.2.12-1/nuiton-js-angularjs-1.2.12-1-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-bootstrap/2.3.2… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jqplot/1.0.4r11… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jquery/1.8.3-1/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jquery-ui/1.9.2… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (2 KB at 58.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… (2 KB at 82.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-wro/1.0.2/nuito… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-wro/1.0.2/nuito… (2 KB at 3.5 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-wro/1.0.2/nuiton-js-wro-1.0.2-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-wro/1.0.2/nuiton-js-wro-1.0.2-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-api/3.11-SNAPSHOT/wikitty-api-3.11-SNAPSHOT-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-api/3.11-SNAPSHOT/wikitty-api-3.11-SNAPSHOT-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-generators/3.11-SNAPSHOT/wikitty-generators-3.11-SNAPSHOT-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-generators/3.11-SNAPSHOT/wikitty-generators-3.11-SNAPSHOT-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-jdbc/3.11-SNAPSHOT/wikitty-jdbc-3.11-SNAPSHOT-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-jdbc/3.11-SNAPSHOT/wikitty-jdbc-3.11-SNAPSHOT-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/wik… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/wik… (2 KB at 24.1 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-solr/3.11-SNAPSHOT/wikitty-solr-3.11-SNAPSHOT-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-solr/3.11-SNAPSHOT/wikitty-solr-3.11-SNAPSHOT-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ref… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/reflections/r… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/reflections/reflections/0.9.8/refle… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/slf4j/slf4j-a… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/slf4j/slf4j-l… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/ro/isdc… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/ro/isdc/wro4j/wro… [INFO] Downloading: http://repo.maven.apache.org/maven2/ro/isdc/wro4j/wro4j-core/1.7.2/wro4j-co… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xml-api… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/xml-apis/xml-apis… [INFO] Downloading: http://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b… [INFO] Missing file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> is up-to-date. [WARNING] There is 1 dependencies with no license : [WARNING] - dom4j--dom4j--1.6.1 [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> [INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> [JENKINS] Archiving disabled

1 3

Build failed in Jenkins: chorem-nightly » Chorem :: entities #2
by admin+ci-chorem.org＠codelutin.com 13 Mar '14

13 Mar '14

1 4

r409 - in trunk: . chorem-entities chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales
by ymartel＠users.chorem.org 13 Mar '14

13 Mar '14

Author: ymartel Date: 2014-03-13 16:19:41 +0100 (Thu, 13 Mar 2014) New Revision: 409 Url: http://forge.chorem.org/projects/chorem/repository/revisions/409 Log: review dependencies Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-entities/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -62,6 +62,12 @@ </dependency> <dependency> + <groupId>org.parboiled</groupId> + <artifactId>parboiled-core</artifactId> + <version>1.1.6</version> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-webmotion/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -43,6 +43,11 @@ </dependency> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409) @@ -23,7 +23,12 @@ * #L% */ -import org.apache.commons.lang.time.DateUtils; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.time.DateUtils; import org.chorem.ChoremClient; import org.chorem.entities.Accepted; import org.debux.webmotion.server.WebMotionController; @@ -32,13 +37,7 @@ import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; -import org.nuiton.wikitty.query.conditions.Aggregate; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - /** * @author jcouteau <couteau(a)codelutin.com> */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-12 17:19:26 UTC (rev 408) +++ trunk/pom.xml 2014-03-13 15:19:41 UTC (rev 409) @@ -106,6 +106,8 @@ <nuitonjsJqplot.version>1.0.4r1121-1</nuitonjsJqplot.version> <nuitonjsBootstrap.version>2.3.2-1</nuitonjsBootstrap.version> + <gsonVersion>2.2.4</gsonVersion> +  <license.licenseName>agpl_v3</license.licenseName> @@ -286,6 +288,12 @@ </dependency> --> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gsonVersion}</version> + </dependency> + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> <version>${webmotionVersion}</version>

1 0

r408 - in trunk: . chorem-entities/src/main/java/org/chorem chorem-entities/src/main/java/org/chorem/project chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by ymartel＠users.chorem.org 12 Mar '14

12 Mar '14

Author: ymartel Date: 2014-03-12 18:19:26 +0100 (Wed, 12 Mar 2014) New Revision: 408 Url: http://forge.chorem.org/projects/chorem/repository/revisions/408 Log: clean some code Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/pom.xml Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,6 +22,12 @@ */ package org.chorem; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import org.chorem.entities.Attachment; import org.chorem.entities.ChoremUser; import org.chorem.entities.Company; @@ -51,12 +57,6 @@ import org.nuiton.wikitty.query.WikittyQueryResult; import org.parboiled.common.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - /** * Proxy pour l'application. Certaines methodes specifiques pour l'application * peuvent y etre ajoutees (ex: des find particulier) @@ -447,7 +447,7 @@ double dailyHoursWorked = 0; - if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && + if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { dailyHoursWorked = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,12 +22,11 @@ */ package org.chorem; +import java.util.Arrays; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.config.ApplicationConfig; -import java.util.Arrays; - /** * * @author poussin @@ -49,7 +48,8 @@ // args = "--reindex".split(" "); System.out.println(String.format("Launching ChoremMain ... (args: %s)", Arrays.toString(args))); // getConfig do all: parse and doAllAction - ApplicationConfig config = ChoremConfig.getConfig(null, args); + //XXX ymartel 2014/03/12 : not used. +// ApplicationConfig config = ChoremConfig.getConfig(null, args); System.exit(0); } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -119,17 +119,20 @@ */ public Map<Employee, Double> getTimePercentages() { Map<Employee, Double> times = getTimes(); - Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(); + Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(times.size()); double sum = 0; - Set<Employee> keySet = times.keySet(); - for (Employee key : keySet) { - sum+= times.get(key); + Set<Employee> employees = times.keySet(); + for (Employee employee : employees) { + sum+= times.get(employee); } - for (Employee key : keySet) { - timePercentages.put(key, (times.get(key)/sum)*100); + // calculate percentage + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee employee = employeeTime.getKey(); + Double time = employeeTime.getValue(); + timePercentages.put(employee, (time /sum)*100); + } - return timePercentages; } /** @@ -163,11 +166,12 @@ } double realReturn = 0; Set<Employee> keySet = times.keySet(); - for(Employee key : keySet) { + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee key = employeeTime.getKey(); double srp = client.getDailyReturn(key); double hoursPerDay = client.getDailyHoursWorked(key); - realReturn += srp* ( times.get(key) / hoursPerDay ) ; + realReturn += srp* ( employeeTime.getValue() / hoursPerDay ) ; } realReturn = realReturn/getRealDays(); Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -69,16 +69,15 @@ for(Task t : tasks) { Map<Employee, Double> taskPercentages = new TaskCalculation(t, client).getPercentages(); - for(Employee emp : taskPercentages.keySet()) { + for (Map.Entry<Employee, Double> employeeTime : taskPercentages.entrySet()) { double rate = (t.getEstimatedDays()/totalDays); - if(percentages.containsKey(emp)) { - //We temporaly put the sum in the map. - percentages.put(emp, percentages.get(emp) + taskPercentages.get(emp)*rate); + Employee emp = employeeTime.getKey(); + Double employeePercentage = percentages.get(emp); + if (employeePercentage == null) { + // the value was not found : init to 0 + employeePercentage = 0d; } - else { - percentages.put(emp, taskPercentages.get(emp)*rate); - } - + percentages.put(emp, employeePercentage + employeeTime.getValue() * rate); } } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-03-12 17:19:26 UTC (rev 408) @@ -27,12 +27,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import org.chorem.entities.*; import java.util.Map; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; +import org.chorem.entities.EmployeeHR; +import org.chorem.entities.Vacation; +import org.chorem.entities.VacationRequest; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.WikittyUtil; @@ -51,7 +54,6 @@ */ static private Log log = LogFactory.getLog(HrAction.class); private Map<String, Object> params = new HashMap<String, Object>(); - private String dateDuJour = ""; // mettre isAnswer à true si on arrive en tant qu'administrateur pour saisir une réponse private boolean isAnswer = true; @@ -95,6 +97,14 @@ } // ajout des id Vacation liés à la VacationRequest + for (Map.Entry<String, List<Wikitty>> relatedEntry : wRelated.entrySet()) { + List<Wikitty> relatedWikitties = relatedEntry.getValue(); + int size = relatedWikitties.size(); + for (int ii = 0; ii < size; ii++) { + String wid = relatedWikitties.get(ii).getWikittyId(); + ids += separator + wid; + } + } for (String ws : wRelated.keySet()) { int size = wRelated.get(ws).size(); for (int ii = 0; ii < size; ii++) { @@ -120,7 +130,7 @@ String typeLeave = ""; Wikitty wEmployeeReq = null; - this.dateDuJour = WikittyUtil.toString((new java.util.Date())); + String dateDuJour = WikittyUtil.toString((new java.util.Date())); this.params = call.getExtractParameters(); String keyParams = ""; @@ -147,7 +157,7 @@ if (!this.isAnswer) { // on enregistre la date de demande updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, dateDuJour); // pour chaque période (Vacation) on enregistre le champ vacationRequest pour lier la période à la demande updateVacationRequestField(w, Vacation.EXT_VACATION, Vacation.FIELD_VACATION_VACATIONREQUEST, idVR); @@ -155,7 +165,7 @@ } else { // on enregistre la date de réponse updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, dateDuJour); // si l'ancien status de la demande est différent de "ACCEPTEE" ou "FERMETURE ANNUELLE" // si le nouveau status (réponse) est "ACCEPTEE" : pour chaque période demandée on met à jour les soldes de l'Employé Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-03-12 17:19:26 UTC (rev 408) @@ -23,31 +23,31 @@ package org.wikitty.web.jsptag; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.DynamicAttributes; +import javax.servlet.jsp.tagext.SimpleTagSupport; + import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.io.IOException; -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * * @author poussin @@ -173,11 +173,11 @@ } protected String getDynamicAttribute() { - String result = ""; + StringBuilder result = new StringBuilder(); for (Map.Entry<String, Object> e : dynamicAttribute.entrySet()) { - result += " " + e.getKey() + "=\"" + e.getValue() + "\""; + result.append(" " + e.getKey() + "=\"" + e.getValue() + "\""); } - return result; + return result.toString(); } @@ -392,18 +392,19 @@ } String sep = ""; - String prePopulate = "["; + StringBuilder builder = new StringBuilder("["); if (values != null) { for (Wikitty w :values) { if (w != null) { - prePopulate += String.format("%s{id:'%s', label:'%s'}", sep, + builder.append(String.format("%s{id:'%s', label:'%s'}", sep, StringEscapeUtils.escapeEcmaScript(w.getWikittyId()), - StringEscapeUtils.escapeEcmaScript(w.toString())); + StringEscapeUtils.escapeEcmaScript(w.toString()))); sep = ","; } } } - prePopulate += "]"; + builder.append("]"); + String prePopulate = builder.toString(); /*{ <script type="text/javascript"> $(document).ready(function () { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/pom.xml 2014-03-12 17:19:26 UTC (rev 408) @@ -115,6 +115,8 @@  <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties>

1 0