Author: echatellier Date: 2012-02-15 18:13:34 +0100 (Wed, 15 Feb 2012) New Revision: 2800 Url: http://chorem.org/repositories/revision/jtimer/2800 Log: Anomalie #462: Unable to start JTimer on Ubuntu 11.10 64bits Evolution #454: Update to jna 3.4.0 Added: branches/jtimer-1.3.3/src/license/ branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties Modified: branches/jtimer-1.3.3/pom.xml branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java Modified: branches/jtimer-1.3.3/pom.xml =================================================================== --- branches/jtimer-1.3.3/pom.xml 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/pom.xml 2012-02-15 17:13:34 UTC (rev 2800) @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.7</version> + <version>3.1</version> </parent> <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -60,9 +60,9 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.2</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.2</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/branches/jtimer-1.3.3</url> </scm> <properties> @@ -142,7 +142,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -244,7 +244,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.5</version> + <version>3.4.0</version> <scope>compile</scope> </dependency> <dependency> @@ -307,6 +307,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-common</artifactId> + <version>3.1.3</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> Added: branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties =================================================================== --- branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties (rev 0) +++ branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -0,0 +1,24 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD License +# - BSD style +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL, version 2.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Feb 15 17:04:45 CET 2012 +commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +org.jdesktop--appframework--1.0.3=Lesser General Public License (LPGL) v 2.1 +org.jdesktop--swing-worker--1.1=Lesser General Public License (LPGL) v 2.1 Modified: branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -4,7 +4,7 @@ #�About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2012, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. Modified: branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -1,7 +1,7 @@ #�About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2012, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. Modified: branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java =================================================================== --- branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2012-02-15 17:13:34 UTC (rev 2800) @@ -24,11 +24,10 @@ import java.util.HashSet; import java.util.List; -import junit.framework.Assert; - import org.chorem.jtimer.AbstractJTimerTest; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.testng.Assert; import org.testng.annotations.Test; /**