April 2012 - Jtimer-commits - mailman.cloud.codelutin.com

r2865 - trunk/src/main/assembly
by echatellier＠users.chorem.org 16 Apr '12

16 Apr '12

Author: echatellier Date: 2012-04-16 18:12:46 +0200 (Mon, 16 Apr 2012) New Revision: 2865 Url: http://chorem.org/repositories/revision/jtimer/2865 Log: closes #515 : jtimer sh script can't handle simlink on executable Modified: trunk/src/main/assembly/jtimer Modified: trunk/src/main/assembly/jtimer =================================================================== --- trunk/src/main/assembly/jtimer 2012-04-12 09:44:20 UTC (rev 2864) +++ trunk/src/main/assembly/jtimer 2012-04-16 16:12:46 UTC (rev 2865) @@ -1,5 +1,11 @@ #!/bin/sh -cd `dirname $0` + +dirlocation=$0 +while [ -L "$dirlocation" ]; do + dirlocation=`readlink -e "$dirlocation"` +done + +cd `dirname $dirlocation` if [ -n "$JAVA_HOME" ]; then $JAVA_HOME/bin/java -jar ./jtimer.jar $* else

1 0

r2864 - trunk
by maven-release＠users.chorem.org 12 Apr '12

12 Apr '12

Author: maven-release Date: 2012-04-12 11:44:20 +0200 (Thu, 12 Apr 2012) New Revision: 2864 Url: http://chorem.org/repositories/revision/jtimer/2864 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-12 09:44:19 UTC (rev 2863) +++ trunk/pom.xml 2012-04-12 09:44:20 UTC (rev 2864) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.0</version> + <version>1.4.1-SNAPSHOT</version> <name>jTimer</name> <description> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.0</connection> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.0 + scm:svn:http://svn.chorem.org/svn/jtimer/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.4.0</url> + <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> <distributionManagement>

1 0

r2863 - in tags: . jtimer-1.4.0
by maven-release＠users.chorem.org 12 Apr '12

12 Apr '12

Author: maven-release Date: 2012-04-12 11:44:19 +0200 (Thu, 12 Apr 2012) New Revision: 2863 Url: http://chorem.org/repositories/revision/jtimer/2863 Log: [maven-release-plugin] copy for tag jtimer-1.4.0 Added: tags/jtimer-1.4.0/ Property changes on: tags/jtimer-1.4.0 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath *.properties *testng*.xml *.ipr *.iws *.iml Added: svn:mergeinfo + /branches/1.4.0-ttalgo:2840-2847

1 0

r2862 - trunk
by maven-release＠users.chorem.org 12 Apr '12

12 Apr '12

Author: maven-release Date: 2012-04-12 11:44:17 +0200 (Thu, 12 Apr 2012) New Revision: 2862 Url: http://chorem.org/repositories/revision/jtimer/2862 Log: [maven-release-plugin] prepare release jtimer-1.4.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-12 09:29:27 UTC (rev 2861) +++ trunk/pom.xml 2012-04-12 09:44:17 UTC (rev 2862) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> <name>jTimer</name> <description> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.0</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.0 </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.4.0</url> </scm> <distributionManagement>

1 0

r2861 - trunk/src/site
by echatellier＠users.chorem.org 12 Apr '12

12 Apr '12

Author: echatellier Date: 2012-04-12 11:29:27 +0200 (Thu, 12 Apr 2012) New Revision: 2861 Url: http://chorem.org/repositories/revision/jtimer/2861 Log: Fix fr dateformat Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-12 08:58:42 UTC (rev 2860) +++ trunk/src/site/site_fr.xml 2012-04-12 09:29:27 UTC (rev 2861) @@ -26,7 +26,7 @@ <project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"> - <publishDate position="right"/> + <publishDate format="dd/MM/yyyy" position="right"/> <version position="right" /> <skin>

1 0

r2859 - trunk/src/site/resources/images
by echatellier＠users.chorem.org 12 Apr '12

12 Apr '12

Author: echatellier Date: 2012-04-12 10:58:30 +0200 (Thu, 12 Apr 2012) New Revision: 2859 Url: http://chorem.org/repositories/revision/jtimer/2859 Log: Add missing logo Added: trunk/src/site/resources/images/jrst-logo.png Added: trunk/src/site/resources/images/jrst-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r2858 - trunk/src/main/java/org/chorem/jtimer/ui
by echatellier＠users.chorem.org 12 Apr '12

12 Apr '12

Author: echatellier Date: 2012-04-12 10:56:05 +0200 (Thu, 12 Apr 2012) New Revision: 2858 Url: http://chorem.org/repositories/revision/jtimer/2858 Log: Fix javadoc Modified: trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2012-04-12 08:55:25 UTC (rev 2857) +++ trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2012-04-12 08:56:05 UTC (rev 2858) @@ -88,7 +88,7 @@ /** * Get UI main component. * - * @return + * @return view's main component */ protected JComponent getMainComponent() {

1 0

r2857 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org 12 Apr '12

12 Apr '12

Author: echatellier Date: 2012-04-12 10:55:25 +0200 (Thu, 12 Apr 2012) New Revision: 2857 Url: http://chorem.org/repositories/revision/jtimer/2857 Log: Fix javadoc Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-04-12 08:49:39 UTC (rev 2856) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-04-12 08:55:25 UTC (rev 2857) @@ -251,7 +251,7 @@ /** * Add task delta. * - * @param oldUserActivity time when delta was notified + * @param from time when delta was notified * @param delta delta to add */ protected void addTaskDelta(long from, long delta) {

1 0

r2856 - in trunk: . src/site
by echatellier＠users.chorem.org 12 Apr '12

12 Apr '12

Author: echatellier Date: 2012-04-12 10:49:39 +0200 (Thu, 12 Apr 2012) New Revision: 2856 Url: http://chorem.org/repositories/revision/jtimer/2856 Log: Update site with fluido skin to release. Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-05 19:47:05 UTC (rev 2855) +++ trunk/pom.xml 2012-04-12 08:49:39 UTC (rev 2856) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.2.1</version> </parent> <groupId>org.chorem</groupId> @@ -14,7 +14,7 @@ <name>jTimer</name> <description> - jTimer - Project time tracking and report generation tool. + jTimer - Time tracking tool. </description> <url>http://maven-site.chorem.org/jtimer</url> <inceptionYear>2007</inceptionYear> @@ -154,7 +154,7 @@ </archive> </configuration> </plugin> -  + </plugin> </plugins> </pluginManagement> </build> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-05 19:47:05 UTC (rev 2855) +++ trunk/src/site/site_en.xml 2012-04-12 08:49:39 UTC (rev 2856) @@ -23,16 +23,29 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project name="${project.name}"> +<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"> <publishDate format="MM-dd-yyyy" /> + <version position="right" /> <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${nuitonSkinVersion}</version> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <topBarIcon> + <name>jTimer</name> + <href>index.html</href> + </topBarIcon> + </fluidoSkin> + </custom> + <bannerLeft> <src alt="jTimer logo">../images/jtimer-logo-orange-little.jpg</src> <href>/index.html</href> @@ -45,14 +58,14 @@ <body> <links> - <item name="fr" href="../index.html" /> - <item name="en" href="index.html" /> + <item name="Français" href="../index.html" /> + <item name="English" href="index.html" /> </links> - + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> - + <menu name="Users" inherit="top"> <item name="Home" href="index.html" /> <item name="Screenshots" href="screenshots.html" /> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-05 19:47:05 UTC (rev 2855) +++ trunk/src/site/site_fr.xml 2012-04-12 08:49:39 UTC (rev 2856) @@ -23,14 +23,28 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project name="${project.name}"> +<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"> + <version position="right" /> + <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${nuitonSkinVersion}</version> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <topBarIcon> + <name>jTimer</name> + <href>index.html</href> + </topBarIcon> + </fluidoSkin> + </custom> + <bannerLeft> <src alt="jTimer logo">images/jtimer-logo-orange-little.jpg</src> <href>/index.html</href> @@ -43,8 +57,8 @@ <body> <links> - <item name="fr" href="index.html" /> - <item name="en" href="en/index.html" /> + <item name="Français" href="index.html" /> + <item name="English" href="en/index.html" /> </links> <breadcrumbs>

1 0

r2855 - trunk/src/site/resources/images/screen
by echatellier＠users.chorem.org 05 Apr '12

05 Apr '12

Author: echatellier Date: 2012-04-05 21:47:05 +0200 (Thu, 05 Apr 2012) New Revision: 2855 Url: http://chorem.org/repositories/revision/jtimer/2855 Log: Retouche des images pour suppression du fond d'?\195?\169cran. Modified: trunk/src/site/resources/images/screen/jtimer.jpg trunk/src/site/resources/images/screen/jtimeralert.jpg trunk/src/site/resources/images/screen/jtimeridle.jpg trunk/src/site/resources/images/screen/jtimerreport.jpg Modified: trunk/src/site/resources/images/screen/jtimer.jpg =================================================================== (Binary files differ) Modified: trunk/src/site/resources/images/screen/jtimeralert.jpg =================================================================== (Binary files differ) Modified: trunk/src/site/resources/images/screen/jtimeridle.jpg =================================================================== (Binary files differ) Modified: trunk/src/site/resources/images/screen/jtimerreport.jpg =================================================================== (Binary files differ)

1 0