Author: tchemit Date: 2013-09-26 12:40:53 +0200 (Thu, 26 Sep 2013) New Revision: 2943 Url: http://chorem.org/projects/jtimer/repository/revisions/2943 Log: fixes #953: Add jnlp deployement mode + improve site generation (add missing project info) Added: trunk/src/site/en/rst/index.rst.vm trunk/src/site/rst/index.rst.vm Removed: trunk/src/site/en/rst/index.rst trunk/src/site/rst/index.rst Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/pom.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -102,6 +102,9 @@ <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> + <!-- jnlp configuration --> + <jnlpFileName>jTimer.jnlp</jnlpFileName> + </properties> <build> @@ -154,6 +157,11 @@ <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> + <!--FIXME tchemit 2013-10-26 Find out how to make jnlp trusted --> + <manifestEntries> + <Trusted-Only>true</Trusted-Only> + <Trusted-Library>true</Trusted-Library> + </manifestEntries> </archive> </configuration> </plugin> @@ -171,7 +179,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> <configuration> <libPath>lib</libPath> @@ -182,6 +189,7 @@ <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> + <outputFile>${jnlpFileName}</outputFile> </jnlp> <sign> <keystore>${keystorepath}</keystore> @@ -195,28 +203,10 @@ </keystoreConfig> </sign> <gzip>true</gzip> - <unsign>true</unsign> + <unsign>false</unsign> <canUnsign>false</canUnsign> <!--Can't use pack2000 since there is some already signed jar--> - <!--<pack200>true</pack200>--> - <jnlpExtensions> - <!--jnlpExtension> - <name>sun</name> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <includes> - <include>javax.help:javahelp</include> - </includes> - </jnlpExtension--> - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> + <pack200>true</pack200> </configuration> </plugin> </plugins> @@ -250,12 +240,6 @@ <version>${coberturaPluginVersion}</version> </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> @@ -508,10 +492,37 @@ <reporting> <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> + <configuration> + <siteJnlpFile>${jnlpFileName}</siteJnlpFile> + </configuration> </plugin> </plugins> </reporting> Deleted: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/en/rst/index.rst 2013-09-26 10:40:53 UTC (rev 2943) @@ -1,54 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Public License for more details. -.. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. -.. * #L% -.. - - -Presentation -============ - -jTimer is a time tracking tool for projects activities. It also can -generate activities reports. - -Features --------- - * Time spent on projects/tasks - * Idle detection - * Reports generation - * Add notes on tasks - * Alerts setup - * Internationalization (i18n) - * gTimer file format compliant - -Environment ------------ -jTimer is Java based. You need to install JRE 6 environment to use it. - -`Download Java`_. - -Links ------ - * gTimer_. - -.. _Download Java: http://java.sun.com/javase/downloads/index.jsp -.. _gTimer: http://www.k5n.us/gtimer.php -.. _known issue: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html \ No newline at end of file Copied: trunk/src/site/en/rst/index.rst.vm (from rev 2941, trunk/src/site/en/rst/index.rst) =================================================================== --- trunk/src/site/en/rst/index.rst.vm (rev 0) +++ trunk/src/site/en/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) @@ -0,0 +1,66 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + +Presentation +============ + +jTimer is a time tracking tool for projects activities. It also can +generate activities reports. + +Features +-------- + * Time spent on projects/tasks + * Idle detection + * Reports generation + * Add notes on tasks + * Alerts setup + * Internationalization (i18n) + * gTimer file format compliant + +Environment +----------- +jTimer is Java based. You need to install JRE 6 environment to use it. + +`Download Java`_. + +Start +----- + +Since version 1.4.3, you can directly use jTimer without install it by hand, +using the webstart technology. + +`Start jTimer via webstart`_. + +For more information, go to page `jnlp documentation`_. + +Links +----- + * gTimer_. + +.. _Download Java: http://java.sun.com/javase/downloads/index.jsp +.. _gTimer: http://www.k5n.us/gtimer.php +.. _known issue: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html +.. _Starts jTimer via webstart: ../jnlp/${project.jnlpFileName} +.. _jnlp documentation: jnlp-report.html \ No newline at end of file Deleted: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/rst/index.rst 2013-09-26 10:40:53 UTC (rev 2943) @@ -1,55 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Public License for more details. -.. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. -.. * #L% -.. - - -Présentation -============ - -jTimer est un outil de suivit de temps passé sur des projets. Il permet -également de générer des rapports d'activité. - -Fonctionnalités ---------------- - * Gestion du temps passé sur les projets/tâches - * Gestion de l'inactivité - * Génération de rapports - * Ajout de notes sur les tâches - * Mise en place d'alertes - * Internationalisation (i18n) - * Compatibilité avec gTimer - -Environnement -------------- -jTimer est developpé dans le language Java. Vous devez disposer d'un -environnement JRE 6 pour l'utiliser. - -`Telecharger Java`_. - -Liens ------ - * gTimer_. - -.. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp -.. _gTimer: http://www.k5n.us/gtimer.php -.. _bug connu: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html \ No newline at end of file Copied: trunk/src/site/rst/index.rst.vm (from rev 2941, trunk/src/site/rst/index.rst) =================================================================== --- trunk/src/site/rst/index.rst.vm (rev 0) +++ trunk/src/site/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) @@ -0,0 +1,67 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + +Présentation +============ + +jTimer est un outil de suivit de temps passé sur des projets. Il permet +également de générer des rapports d'activité. + +Fonctionnalités +--------------- + * Gestion du temps passé sur les projets/tâches + * Gestion de l'inactivité + * Génération de rapports + * Ajout de notes sur les tâches + * Mise en place d'alertes + * Internationalisation (i18n) + * Compatibilité avec gTimer + +Environnement +------------- +jTimer est developpé dans le language Java. Vous devez disposer d'un +environnement JRE 6 pour l'utiliser. + +`Telecharger Java`_. + +Utiliser +-------- + +Depuis la version 1.4.3, il est possible de démarrer jTimer sans avoir à +l'installer manuellement en utilisant la technologie webstart. + +`Démarrer jTimer via webstart`_. + +Pour plus d'information, aller sur la page de `documentation jnlp`_. + +Liens +----- + * gTimer_. + +.. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp +.. _gTimer: http://www.k5n.us/gtimer.php +.. _bug connu: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html +.. _Démarrer jTimer via webstart: jnlp/${project.jnlpFileName} +.. _documentation jnlp: jnlp-report.html \ No newline at end of file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/site_en.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -64,12 +64,22 @@ <breadcrumbs> <item name="${project.name}" href="index.html" /> - </breadcrumbs> + </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <menu name="Users" inherit="top"> <item name="Home" href="index.html" /> <item name="Screenshots" href="screenshots.html" /> <item name="Download" href="http://www.chorem.org/projects/jtimer/files" /> + <item name="Start (using webstart)" href="../jnlp/${project.jnlpFileName}" /> <item name="Release Notes" href="changes-report.html" /> </menu> @@ -89,5 +99,19 @@ <menu ref="reports" /> + <footer> + + <div id='projectMetas' locale='en' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/site_fr.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -65,11 +65,21 @@ <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <menu name="Utilisateurs" inherit="top"> <item name="Accueil" href="index.html" /> <item name="Copies d'écran" href="screenshots.html" /> <item name="Téléchargement" href="http://www.chorem.org/projects/jtimer/files" /> + <item name="Démarrer (via webstart)" href="./jnlp/${project.jnlpFileName}" /> <item name="Notes de version" href="changes-report.html" /> </menu> @@ -89,5 +99,19 @@ <menu ref="reports" /> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>