February 2014 - Jtimer-commits - mailman.cloud.codelutin.com

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

16 Feb '14

See <http://ci.chorem.org/jenkins/job/jtimer-nightly/1/> ------------------------------------------ [...truncated 203 lines...] AU src/main/java/org/chorem/jtimer/ui/systray/package-info.java AU src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java A src/main/config A src/main/config/checkstyle.xml A src/main/resources A src/main/resources/ftl A src/main/resources/ftl/reportByDay_fr.ftl A src/main/resources/ftl/reportByMonth.ftl A src/main/resources/ftl/reportByProject.ftl A src/main/resources/ftl/reportByYear_fr.ftl A src/main/resources/ftl/reportByWeek.ftl A src/main/resources/ftl/reportByMonth_fr.ftl A src/main/resources/ftl/reportByDay.ftl A src/main/resources/ftl/reportByProject_fr.ftl A src/main/resources/ftl/reportByYear.ftl A src/main/resources/ftl/reportByWeek_fr.ftl A src/main/resources/jtimer.properties A src/main/resources/org A src/main/resources/org/chorem A src/main/resources/org/chorem/jtimer A src/main/resources/org/chorem/jtimer/resources AU src/main/resources/org/chorem/jtimer/resources/bookmark-new.png AU src/main/resources/org/chorem/jtimer/resources/bell.png AU src/main/resources/org/chorem/jtimer/resources/go-next.png AU src/main/resources/org/chorem/jtimer/resources/process-stop.png AU src/main/resources/org/chorem/jtimer/resources/running.gif AU src/main/resources/org/chorem/jtimer/resources/JTimer.properties AU src/main/resources/org/chorem/jtimer/resources/jtimer-40-orange.png AU src/main/resources/org/chorem/jtimer/resources/document-new.png AU src/main/resources/org/chorem/jtimer/resources/notes.png AU src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties A src/main/resources/org/chorem/jtimer/ui A src/main/resources/org/chorem/jtimer/ui/tasks A src/main/resources/org/chorem/jtimer/ui/tasks/resources A src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties AU src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-jump.png A src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties AU src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png AU src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png A src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties AU src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png A src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties AU src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png A src/main/resources/org/chorem/jtimer/ui/alert A src/main/resources/org/chorem/jtimer/ui/alert/resources A src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties A src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties A src/main/resources/org/chorem/jtimer/ui/treetable A src/main/resources/org/chorem/jtimer/ui/treetable/dnd A src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources A src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties A src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties A src/main/resources/org/chorem/jtimer/ui/treetable/resources A src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties A src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties A src/main/resources/org/chorem/jtimer/ui/ws A src/main/resources/org/chorem/jtimer/ui/ws/resources A src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties A src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties A src/main/resources/org/chorem/jtimer/ui/resources AU src/main/resources/org/chorem/jtimer/ui/resources/jtimer-logo-orange.jpg A src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties A src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties A src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties A src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties A src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties A src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties A src/main/resources/org/chorem/jtimer/ui/report A src/main/resources/org/chorem/jtimer/ui/report/resources AU src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties AU src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png AU src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png AU src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties AU src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png AU src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png A src/main/resources/org/chorem/jtimer/ui/systray A src/main/resources/org/chorem/jtimer/ui/systray/resources AU src/main/resources/org/chorem/jtimer/ui/systray/resources/jtimer-40-grey.png AU src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties AU src/main/resources/org/chorem/jtimer/ui/systray/resources/jtimer-40-orange.png AU src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties AU src/main/resources/org/chorem/jtimer/ui/systray/resources/jtimer-40-green.png AU src/main/resources/log4j.properties A src/site A src/site/en A src/site/en/rst A src/site/en/rst/devel A src/site/en/rst/devel/fileformat.rst A src/site/en/rst/devel/saf.rst A src/site/en/rst/devel/idledetection.rst A src/site/en/rst/devel/roadmap.rst A src/site/en/rst/devel/index.rst A src/site/en/rst/index.rst.vm A src/site/en/rst/screenshots.rst A src/site/en/rst/contribute A src/site/en/rst/contribute/i18n.rst A src/site/site_en.xml A src/site/rst A src/site/rst/devel A src/site/rst/devel/fileformat.rst A src/site/rst/devel/saf.rst A src/site/rst/devel/roadmap.rst A src/site/rst/devel/index.rst AU src/site/rst/index.rst.vm A src/site/rst/screenshots.rst A src/site/rst/contribute A src/site/rst/contribute/i18n.rst A src/site/resources A src/site/resources/images A src/site/resources/images/screen AU src/site/resources/images/screen/jtimeralert.jpg AU src/site/resources/images/screen/jtimerreport.jpg AU src/site/resources/images/screen/jtimeridle.jpg AU src/site/resources/images/screen/jtimersystray.jpg AU src/site/resources/images/screen/jtimer.jpg AU src/site/resources/images/jrst-logo.png AU src/site/resources/images/jtimer-logo-orange-little.jpg AU src/site/site_fr.xml AU pom.xml A README.txt U . At revision 2954 Parsing POMs Discovered a new module org.chorem:jtimer jTimer Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/chorem.org/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/chorem.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/exec/tomcat-chorem.org/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/chorem.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/chorem.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 45175 <===[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.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/pom.xml> -s /var/local/forge/data/chorem.org/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building jTimer 1.4.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ jtimer --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ jtimer --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ jtimer --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ jtimer --- [INFO] Exporting server [redmine-chorem.org] username in ${redmine.username} [INFO] Exporting server [redmine-chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- maven-dependency-plugin:2.8:copy-dependencies (copy-dependencies) @ jtimer --- [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ jtimer --- [INFO] Will create or update license file [gpl_v3] to <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/LICENSE.txt> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ jtimer --- [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/target/generated-s…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ jtimer --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 26 resources [INFO] Copying 31 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ jtimer --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/src> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/target/generated-s…> [INFO] Scan 152 files header done in 442.508ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ jtimer --- [INFO] Compiling 82 source files to <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/target/classes> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/src/main/java/org/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/jtimer-nightly/ws/trunk/src/main/java/org/…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ jtimer --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… (3 KB at 47.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… (3 KB at 88.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… (32 KB at 819.0 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… (5 KB at 123.0 KB/sec) [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ jtimer --- [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 45.613s [INFO] Finished at: Sat Feb 15 02:39:53 CET 2014 [JENKINS] Archiving disabled [INFO] Final Memory: 37M/425M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project jtimer: the user 'hudson' 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 jtimer: the user 'hudson' 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.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) Waiting for Jenkins to finish collecting data 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) Caused by: org.apache.maven.plugin.MojoExecutionException: the user 'hudson' could not be retrieve from redmine server. at org.nuiton.jredmine.plugin.AbstractRedmineMojo.failIfSafe(AbstractRedmineMojo.java:396) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProject.init(AbstractRedmineMojoWithProject.java:114) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion.init(AbstractRedmineMojoWithProjectAndVersion.java:101) 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) ... 30 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 Sending e-mails to: jtimer-commits(a)list.chorem.org channel stopped Skipping sonar analysis due to bad build status FAILURE

1 1

Build failed in Jenkins: jtimer-nightly » jTimer #1
by admin+ci-chorem.org＠codelutin.com 16 Feb '14

16 Feb '14

See <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/1/> ------------------------------------------ <===[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.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/pom.xml> -s /var/local/forge/data/chorem.org/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building jTimer 1.4.4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ jtimer --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ jtimer --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ jtimer --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ jtimer --- [INFO] Exporting server [redmine-chorem.org] username in ${redmine.username} [INFO] Exporting server [redmine-chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- maven-dependency-plugin:2.8:copy-dependencies (copy-dependencies) @ jtimer --- [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ jtimer --- [INFO] Will create or update license file [gpl_v3] to <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/LICENS…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ jtimer --- [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/target…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ jtimer --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 26 resources [INFO] Copying 31 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ jtimer --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/src> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/target…> [INFO] Scan 152 files header done in 442.508ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ jtimer --- [INFO] Compiling 82 source files to <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/target…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/src/ma…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/jtimer-nightly/org.chorem$jtimer/ws/src/ma…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ jtimer --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… (3 KB at 47.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… (3 KB at 88.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.10/a… (32 KB at 819.0 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… (5 KB at 123.0 KB/sec) [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ jtimer --- [JENKINS] Archiving disabled

1 1

r2954 - in trunk: . src/main/java/org/chorem/jtimer/ui/report/tree src/main/java/org/chorem/jtimer/ui/treetable src/site
by tchemit＠users.chorem.org 11 Feb '14

11 Feb '14

Author: tchemit Date: 2014-02-12 00:20:29 +0100 (Wed, 12 Feb 2014) New Revision: 2954 Url: http://chorem.org/projects/jtimer/repository/revisions/2954 Log: fixes #984: updates nuiton-config to 3.0-alpha-2 fixes #985: updates commons-collections to 4.0 fixes #957: Updates mavenpom to 4.7 Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/pom.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.2</version> + <version>4.7</version> </parent> <groupId>org.chorem</groupId> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:https://chorem.org/svn/jtimer/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:https://chorem.org/svn/jtimer/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>https://chorem.org/repositories/browse/jtimer/trunk</url> </scm> <distributionManagement> @@ -106,9 +106,6 @@  <jnlpFileName>jTimer.jnlp</jnlpFileName> -  - <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> - </properties> <build> @@ -182,15 +179,16 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> - <verbose>false</verbose> +  <updateManifestEntries> <Application-Name>jTimer ${project.version}</Application-Name> - <Permissions>all-permissions</Permissions> + <Permissions>all-permissions</Permissions> <Codebase>*</Codebase> +  +  </updateManifestEntries> -  -  - <jnlp> + <outputJarVersions>false</outputJarVersions> + <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> @@ -253,7 +251,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> <exclusions> <exclusion> @@ -340,8 +338,8 @@  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -445,6 +443,7 @@ </property> </activation> <build> + <defaultGoal>package</defaultGoal> <plugins>  <plugin> @@ -477,7 +476,7 @@ <id>generate-jnlp</id> <phase>package</phase> <goals> - <goal>jnlp-inline</goal> + <goal>jnlp-single</goal> </goals> </execution> </executions> Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -32,8 +32,8 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.TimerCore; Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -36,8 +36,8 @@ import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_en.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Users" inherit="top"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_fr.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Utilisateurs" inherit="top">

1 0

r2953 - in trunk/src: main/java/org/chorem/jtimer/ui/report main/resources/ftl main/resources/org/chorem/jtimer/ui/report/resources test/java/org/chorem/jtimer/ui/report
by tchemit＠users.chorem.org 11 Feb '14

11 Feb '14

Author: tchemit Date: 2014-02-12 00:19:49 +0100 (Wed, 12 Feb 2014) New Revision: 2953 Url: http://chorem.org/projects/jtimer/repository/revisions/2953 Log: fixes #983: Add report option to include intermediate total time Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java trunk/src/main/resources/ftl/reportByDay.ftl trunk/src/main/resources/ftl/reportByDay_fr.ftl trunk/src/main/resources/ftl/reportByMonth.ftl trunk/src/main/resources/ftl/reportByMonth_fr.ftl trunk/src/main/resources/ftl/reportByProject.ftl trunk/src/main/resources/ftl/reportByProject_fr.ftl trunk/src/main/resources/ftl/reportByWeek.ftl trunk/src/main/resources/ftl/reportByWeek_fr.ftl trunk/src/main/resources/ftl/reportByYear.ftl trunk/src/main/resources/ftl/reportByYear_fr.ftl trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -97,11 +97,13 @@ * @param end end date * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time - * + * @param includeIntermediateTotalTime include intermediate total time + * * @return report text */ public String getReportText(Type reportType, List<TimerProject> projects, - Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime) { + Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime, + boolean includeIntermediateTotalTime) { Template template = null; String content = null; @@ -131,7 +133,7 @@ } content = getReportContent(template, projects, begin, end, - includeAnnotate, includeAnnotateTime); + includeAnnotate, includeAnnotateTime, includeIntermediateTotalTime); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get freemarker template", e); @@ -154,7 +156,8 @@ * @param template freemarker template to use * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time - * + * @param includeIntermediateTotalTime include middle man total time + * * @return string content * * @throws IOException if i/o exception occurs @@ -164,7 +167,8 @@ */ protected String getReportContent(Template template, List<TimerProject> projects, Date begin, Date end, - boolean includeAnnotate, boolean includeAnnotateTime) throws TemplateException, IOException { + boolean includeAnnotate, boolean includeAnnotateTime, + boolean includeIntermediateTotalTime) throws TemplateException, IOException { // Create the root hash Map<String, Object> root = new HashMap<String, Object>(); @@ -174,6 +178,7 @@ root.put("end", end); root.put("annotations", includeAnnotate); root.put("annotationsTime", includeAnnotateTime); + root.put("intermediateTotalTime", includeIntermediateTotalTime); root.put("utils", new ReportUtils()); Writer out = new StringWriter(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -110,6 +110,8 @@ protected JCheckBox checkIncludesAnnotations; /** Include annotations time on reports */ protected JCheckBox checkIncludesAnnotationsTime; + /** Include middle man total time on reports */ + protected JCheckBox checkIncludeIntermediateTotalTime; /** Date pickers, from... to */ protected JXDatePicker datePickerFrom, datePickerTo; @@ -261,6 +263,11 @@ panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + checkIncludeIntermediateTotalTime = new JCheckBox(getResourceMap().getString( + "reportIntermediateTotalTime")); + panelOption.add(checkIncludeIntermediateTotalTime, + new GridBagConstraints(0, 6, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); // panel form projects JPanel panelProjects = new JPanel(new BorderLayout()); @@ -431,9 +438,10 @@ // make report String report = reportGenerator.getReportText(reportType, - selectedProjects, datePickerFrom.getDate(), datePickerTo - .getDate(), checkIncludesAnnotations.isSelected(), - checkIncludesAnnotationsTime.isSelected()); + selectedProjects, datePickerFrom.getDate(), datePickerTo + .getDate(), checkIncludesAnnotations.isSelected(), + checkIncludesAnnotationsTime.isSelected(), + checkIncludeIntermediateTotalTime.isSelected()); if (report != null && !report.isEmpty()) { reportArea.setText(report); Modified: trunk/src/main/resources/ftl/reportByDay.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByDay.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getDailyTotalTaskTime(project, period?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByDay_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByDay_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getDailyTotalTaskTime(project, period?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByMonth.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByMonth.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getMonthlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByMonth_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getMonthlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -39,7 +39,7 @@ <#local subtaskPeriodTime=utils.getDailyTaskTime(subtask, period?date)/> <#local taskTime=taskTime+subtaskPeriodTime/> </#list> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#list periods as period> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -39,7 +39,7 @@ <#local subtaskPeriodTime=utils.getDailyTaskTime(subtask, period?date)/> <#local taskTime=taskTime+subtaskPeriodTime/> </#list> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#list periods as period> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByWeek.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getWeeklyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByWeek_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getWeeklyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByYear.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByYear.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,8 @@ <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> + <#local totalTaskTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && totalTaskTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(totalTaskTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +60,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getYearlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByYear_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByYear_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,8 @@ <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> + <#local totalTaskTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && totalTaskTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(totalTaskTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +60,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getYearlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2014-02-11 23:19:49 UTC (rev 2953) @@ -33,6 +33,7 @@ reportYearly=Yearly reportByProject=By project reportAnnotationsTime=with time +reportIntermediateTotalTime=Add intermediate total times reportProjects=Projects reportContent=Report reportProjectsList=Projects list Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2014-02-11 23:19:49 UTC (rev 2953) @@ -34,6 +34,7 @@ reportByProject=Par projet reportAnnotationsTime=avec l'heure +reportIntermediateTotalTime=Ajout des temps totaux intermédiaires reportProjects=Projets reportContent=Rapport reportProjectsList=Liste des projets Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -72,7 +72,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -123,7 +123,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, true, true); + projects, d1, d2, true, true, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -161,7 +161,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, - projects, d1, d2, true, false); + projects, d1, d2, true, false, false); if (log.isDebugEnabled()) { log.debug("Weekly report = " + content); @@ -208,7 +208,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, true, true); + projects, d1, d2, true, true, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -245,7 +245,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -291,7 +291,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Yearly report = " + content); @@ -338,7 +338,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, - projects, d1, d2, true, false); + projects, d1, d2, true, false, false); if (log.isDebugEnabled()) { log.debug("Project report = " + content);

1 0

r2952 - in branches/ng-jtimer: . jtimer-server jtimer-server/src/main/go jtimer-server/src/main/webapp/css jtimer-server/src/main/webapp/js
by echatellier＠users.chorem.org 06 Feb '14

06 Feb '14

Author: echatellier Date: 2014-02-06 21:44:47 +0100 (Thu, 06 Feb 2014) New Revision: 2952 Url: http://chorem.org/projects/jtimer/repository/revisions/2952 Log: Update libs Modified: branches/ng-jtimer/ branches/ng-jtimer/jtimer-server/ branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/jtimer-server/src/main/go/readme.txt branches/ng-jtimer/jtimer-server/src/main/webapp/css/ branches/ng-jtimer/jtimer-server/src/main/webapp/js/ branches/ng-jtimer/pom.xml Property changes on: branches/ng-jtimer ___________________________________________________________________ Added: svn:ignore + .settings target .project Property changes on: branches/ng-jtimer/jtimer-server ___________________________________________________________________ Modified: svn:ignore - .settings .classpath .project + .settings .classpath .project target Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/jtimer-server/pom.xml 2014-02-06 20:44:47 UTC (rev 2952) @@ -30,17 +30,17 @@ <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet</artifactId> - <version>2.2-M5</version> + <version>2.2-M6</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.2-M5</version> + <version>2.2-M6</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>9.0.5.v20130815</version> + <version>9.1.1.v20140108</version> <scope>provided</scope> </dependency> </dependencies> @@ -50,7 +50,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.0.5.v20130815</version> + <version>9.1.1.v20140108</version> </plugin> <plugin> <groupId>ro.isdc.wro4j</groupId> Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2014-02-06 20:44:47 UTC (rev 2952) @@ -1,6 +1,8 @@ Compilation do client go ======================== +export GOPATH=$HOME/gocode + Packages necessaires -------------------- go get github.com/BurntSushi/xgb/screensaver Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/css ___________________________________________________________________ Added: svn:ignore + jtimer.css Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/js ___________________________________________________________________ Added: svn:ignore + jtimer.js Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/pom.xml 2014-02-06 20:44:47 UTC (rev 2952) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.7</version> </parent> <groupId>org.chorem</groupId> @@ -43,22 +43,22 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.0</version> + <version>1.7.3</version> <dependencies> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-wro</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular</artifactId> - <version>1.2.0-rc2-1</version> + <artifactId>nuiton-js-angularjs</artifactId> + <version>1.2.11-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery</artifactId> - <version>2.0.3-1</version> + <version>2.1.0-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -78,7 +78,7 @@ <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-extensions</artifactId> - <version>1.7.0</version> + <version>1.7.3</version> </dependency> </dependencies> </plugin> @@ -91,7 +91,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.173</version> + <version>1.3.175</version> </dependency> </dependencies> </dependencyManagement>

1 0