Author: tchemit Date: 2010-01-13 16:17:45 +0100 (Wed, 13 Jan 2010) New Revision: 2719 Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Log: Evolution #102: utilisation de mavenpom + fix some javadoc warnings Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/pom.xml 2010-01-13 15:17:45 UTC (rev 2719) @@ -2,6 +2,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> <version>1.3.2-SNAPSHOT</version> @@ -12,10 +18,18 @@ <url>http://maven-site.chorem.org/jtimer</url> <inceptionYear>2007</inceptionYear> - <organization> + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> + + <!--organization> <name>CodeLutin</name> <url>http://www.codelutin.com/</url> - </organization> + </organization-> <licenses> <license> @@ -49,7 +63,7 @@ <post>jtimer-users@list.chorem.org</post> <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> </mailingList> - </mailingLists> + </mailingLists--> <developers> <developer> @@ -72,12 +86,22 @@ <role>Développeur</role> </roles> </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> - <issueManagement> + <!--issueManagement> <system>redmine</system> <url>http://www.chorem.org/projects/jtimer/issues</url> - </issueManagement> + </issueManagement--> <scm> <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> @@ -85,12 +109,12 @@ <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> - <ciManagement> + <!--ciManagement> <system>hudson</system> <url>http://hudson.chorem.org</url> - </ciManagement> + </ciManagement--> - <distributionManagement> + <!--distributionManagement> <repository> <id>nuiton</id> <url>scpexe://chorem.org/var/lib/maven/release</url> @@ -103,18 +127,42 @@ <id>nuiton</id> <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> </site> - </distributionManagement> + </distributionManagement--> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- redmine platform --> + <platform>chorem.org</platform> + + <!--Main class in JAR --> + <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> + + <!-- license to use --> + <license.licenseName>gpl_v3</license.licenseName> + + <!--Multilanguage maven-site --> + <maven.site.locales>fr,en</maven.site.locales> + + <!-- files to deploy to redmine --> + <redmine.releaseFiles> + target/${project.artifactId}-${project.version}-bin.zip, + target/${project.artifactId}-${project.version}-src.zip, + </redmine.releaseFiles> + + <!-- version to use of javadoc plugin --> + <javadoc.version>2.6.1</javadoc.version> + + <!--project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> <exec.mainClass>org.chorem.jtimer.JTimer</exec.mainClass> <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.target>1.6</maven.compiler.target--> </properties> <build> <resources> + <!-- TODO ce qui doit être filtree devrait etre dans src/main/filters --> + <!-- TODO en plus ce veut pas dire grand chose d'avoir deux fois la meme resource ??? c quoi ce hack ? --> <resource> <directory>src/main/resources</directory> <filtering>true</filtering> @@ -133,7 +181,7 @@ <pluginManagement> <plugins> - <plugin> + <!--plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -144,11 +192,12 @@ </manifest> </archive> </configuration> - </plugin> + </plugin--> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> + <!-- TODO on pourrait peut-etre le mettre dans mavenpom pour tout le monde ? --> <property> <name>java.io.tmpdir</name> <value>${project.build.directory}/surefire-workdir</value> @@ -158,18 +207,23 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> + <!--<version>2.0.1</version> <configuration> <locales>fr,en</locales> - </configuration> + </configuration--> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> + <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.0-beta-3</version> + </plugin--> </plugins> </pluginManagement> @@ -177,7 +231,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> + <!--<version>1.0-beta-3</version>--> <executions> <execution> <phase>validate</phase> @@ -193,7 +247,7 @@ </execution> </executions> </plugin> - <plugin> + <!--plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -211,7 +265,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin--> </plugins> </build> @@ -225,7 +279,7 @@ <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> </configuration> </plugin> - <plugin> + <!--plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> <configuration> @@ -246,8 +300,8 @@ </reports> </reportSet> </reportSets> - </plugin> - <plugin> + </plugin--> + <!--plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.6.1</version> <configuration> @@ -255,8 +309,8 @@ <link>http://java.sun.com/javase/6/docs/api/</link> </links> </configuration> - </plugin> - <plugin> + </plugin--> + <!--plugin> <artifactId>maven-changelog-plugin</artifactId> <version>2.1</version> <configuration> @@ -274,35 +328,41 @@ </reports> </reportSet> </reportSets> - </plugin> - <plugin> + </plugin--> + <!--plugin> <artifactId>maven-pmd-plugin</artifactId> <version>2.4</version> <configuration> <targetJdk>${maven.compiler.source}</targetJdk> </configuration> - </plugin> - <plugin> + </plugin--> + <!--plugin> <artifactId>maven-jxr-plugin</artifactId> <version>2.1</version> </plugin> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.4.3</version> - </plugin> + </plugin--> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.3</version> </plugin> - <plugin> + <!--plugin> <groupId>org.codehaus.sonar-plugins</groupId> <artifactId>maven-report</artifactId> <version>0.1</version> <configuration> <sonar.host.url>http://hudson.chorem.org/sonar</sonar.host.url> </configuration> - </plugin> + </plugin--> + <!-- TODO Use this when jnlp will be ok --> + <!--plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin--> </plugins> </reporting> @@ -420,7 +480,28 @@ </activation> <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-bin</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + <!-- FIXME : utiliser le profile de mavenpom --> + <!--plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>1.0-alpha-2</version> @@ -463,7 +544,7 @@ </goals> </execution> </executions> - </plugin> + </plugin--> </plugins> </build> </profile> Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -27,7 +27,8 @@ * * @author chatellier * @version $Revision$ - * + * + * FIXME-TC2010011" : javadoc plugin says there is a missing closing tag ? * @see <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/windowsuserinterface/userinput/keyboardinput/keyboardinputreference/keyboardinputstructures/lastinputinfo.asp">Windows API</a> * * Last update : $Date$ Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -33,7 +33,7 @@ */ public class Win32SystemInfo implements SystemInfo { - /** User32 {@link lastInputInfo}. */ + /** {@link User32.LASTINPUTINFO}. */ protected User32.LASTINPUTINFO lastInputInfo; /** Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -110,7 +110,7 @@ * * Protected to force use of show static method. * - * @param parent parent application + * @param application parent application */ protected IdleDialog(SingleFrameApplication application) { // don't make reference on other parent Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -395,7 +395,9 @@ /** * Display alert message without breaking UI. * - * @param alertMessage alert message + * @param task + * @param alertType + * @param alertDuration */ protected void displayAlert(final TimerTask task, final Type alertType, final long alertDuration) { @@ -434,7 +436,7 @@ * @return stopping flag */ public boolean isStopping() { - boolean stopping = false; + boolean stopping; synchronized (bWantToStop) { stopping = bWantToStop.booleanValue(); }