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

r2673 - trunk
by echatellier＠users.chorem.org 08 Oct '09

08 Oct '09

Author: echatellier Date: 2009-10-08 19:09:26 +0200 (Thu, 08 Oct 2009) New Revision: 2673 Modified: trunk/changelog.txt Log: Update changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-08 17:08:35 UTC (rev 2672) +++ trunk/changelog.txt 2009-10-08 17:09:26 UTC (rev 2673) @@ -3,6 +3,7 @@ jTimer (1.3.1) stable; urgency=low + * Fix duration edition (task and alerts) * Fix NPE related to non available systray -- chatellier -- jeu. sept. 24 11:04:36 CEST 2009

1 0

r2672 - trunk/src/main/java/org/chorem/jtimer/ui
by echatellier＠users.chorem.org 08 Oct '09

08 Oct '09

Author: echatellier Date: 2009-10-08 19:08:35 +0200 (Thu, 08 Oct 2009) New Revision: 2672 Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java Log: Fix task duration upper bound. Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2009-10-08 17:08:09 UTC (rev 2671) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2009-10-08 17:08:35 UTC (rev 2672) @@ -376,7 +376,7 @@ */ protected JPanel createSpinnersPanel() { // hours spinner - spinnerH = new JSpinner(new SpinnerNumberModel(0, 0, 12, 1)); + spinnerH = new JSpinner(new SpinnerNumberModel(0, 0, 24, 1)); spinnerH.setEditor(new JSpinner.NumberEditor(spinnerH, "00")); // minutes spinner

1 0

r2671 - in trunk/src/main/java/org/chorem/jtimer/ui: alert widget
by echatellier＠users.chorem.org 08 Oct '09

08 Oct '09

Author: echatellier Date: 2009-10-08 19:08:09 +0200 (Thu, 08 Oct 2009) New Revision: 2671 Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java Log: Fix duration editor bound changes. Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2009-10-02 13:23:49 UTC (rev 2670) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2009-10-08 17:08:09 UTC (rev 2671) @@ -89,7 +89,7 @@ break; case 1: - DurationEditor durationEditor = new DurationEditor(); + DurationEditor durationEditor = new DurationEditor(9999); long duration = ((Long)value).longValue(); durationEditor.setDuration(duration); durationEditor.addPropertyChangeListener("duration", this); Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2009-10-02 13:23:49 UTC (rev 2670) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2009-10-08 17:08:09 UTC (rev 2671) @@ -60,7 +60,7 @@ break; case 1: - DurationEditor durationEditor = new DurationEditor(); + DurationEditor durationEditor = new DurationEditor(9999); long duration = ((Long)value).longValue(); durationEditor.setDuration(duration); c = durationEditor; Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2009-10-02 13:23:49 UTC (rev 2670) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2009-10-08 17:08:09 UTC (rev 2671) @@ -66,12 +66,22 @@ /** * Constructor. + * + * Default hours set to 24. */ public DurationEditor() { + this(24); + } + + /** + * Constructor. + * + * @param maxHourValue max hour value + */ + public DurationEditor(int maxHourValue) { super(new FlowLayout(FlowLayout.CENTER, 0, 0)); - - // hack set 9999 Integer.MAX_VALUE make zone too huge - hourSpinnerModel = new SpinnerNumberModel(0, 0, 9999, 1); + + hourSpinnerModel = new SpinnerNumberModel(0, 0, maxHourValue, 1); hourSpinner = new JSpinner(hourSpinnerModel); add(hourSpinner); @@ -135,7 +145,8 @@ } // down } else if (value < 0) { - if (minuteSpinnerModel.getPreviousValue() != null) { + if (hourSpinnerModel.getNumber().intValue() > 0 || + minuteSpinnerModel.getNumber().intValue() > 0) { secondSpinnerModel.setValue(value + 60); minuteSpinnerModel.setValue(minuteSpinnerModel.getPreviousValue()); } else {

1 0

r2670 - trunk/src/main/java/org/chorem/jtimer/ui
by schorlet＠users.chorem.org 02 Oct '09

02 Oct '09

Author: schorlet Date: 2009-10-02 15:23:49 +0200 (Fri, 02 Oct 2009) New Revision: 2670 Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java Log: bug http://www.chorem.org/issues/show/52 Les minutes sont maintenant incr?\195?\169ment?\195?\169es (d?\195?\169cr?\195?\169ment?\195?\169es) de 1 en 1 On peut aussi modifier les secondes Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2009-09-24 09:07:15 UTC (rev 2669) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2009-10-02 13:23:49 UTC (rev 2670) @@ -380,19 +380,20 @@ spinnerH.setEditor(new JSpinner.NumberEditor(spinnerH, "00")); // minutes spinner - spinnerM = new JSpinner(new SpinnerNumberModel(0, -10, 69, 10)); + spinnerM = new JSpinner(new SpinnerNumberModel(0, -1, 60, 1)); spinnerM.setEditor(new JSpinner.NumberEditor(spinnerM, "00")); spinnerM.setPreferredSize(spinnerH.getPreferredSize()); // seconds spinner - spinnerS = new JSpinner(new SpinnerNumberModel(0, 0, 59, 1)); + spinnerS = new JSpinner(new SpinnerNumberModel(0, -1, 60, 1)); spinnerS.setEditor(new JSpinner.NumberEditor(spinnerS, "00")); - spinnerS.setEnabled(false); + spinnerS.setPreferredSize(spinnerH.getPreferredSize()); // add listener on spinners spinnerListener = new SpinnerListener(); spinnerH.addChangeListener(spinnerListener); spinnerM.addChangeListener(spinnerListener); + spinnerS.addChangeListener(spinnerListener); // create panel JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); @@ -406,7 +407,7 @@ } /** - * Listener on spinnerH and spinnerM + * Listener on spinnerH, spinnerM and spinnerS * */ protected class SpinnerListener implements ChangeListener { @@ -415,22 +416,52 @@ if (e.getSource() == spinnerM) { int value = ((SpinnerNumberModel) spinnerM.getModel()) .getNumber().intValue(); + if (value >= 60) { if (spinnerH.getNextValue() != null) { spinnerM.setValue(value - 60); spinnerH.setValue(spinnerH.getNextValue()); } else { - spinnerM.setValue(value - 10); + spinnerM.setValue(value - 1); } + } else if (value < 0) { if (spinnerH.getPreviousValue() != null) { spinnerM.setValue(value + 60); spinnerH.setValue(spinnerH.getPreviousValue()); } else { - spinnerM.setValue(value + 10); + spinnerM.setValue(0); } } - } + + } else if (e.getSource() == spinnerS) { + int value = ((SpinnerNumberModel) spinnerS.getModel()) + .getNumber().intValue(); + + if (value >= 60) { + if (spinnerM.getNextValue() != null) { + spinnerS.setValue(value - 60); + spinnerM.setValue(spinnerM.getNextValue()); + } else { + spinnerS.setValue(value - 1); + } + + } else if (value < 0) { + int hour = ((SpinnerNumberModel) spinnerH.getModel()) + .getNumber().intValue(); + + int minute = ((SpinnerNumberModel) spinnerM.getModel()) + .getNumber().intValue(); + + if (hour != 0 || minute != 0) { + spinnerS.setValue(value + 60); + spinnerM.setValue(spinnerM.getPreviousValue()); + } else { + spinnerS.setValue(0); + } + } + + } updateTask(); }

1 0

r2669 - trunk
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 11:07:15 +0200 (Thu, 24 Sep 2009) New Revision: 2669 Modified: trunk/changelog.txt Log: Fix null pointer exception Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-24 09:00:10 UTC (rev 2668) +++ trunk/changelog.txt 2009-09-24 09:07:15 UTC (rev 2669) @@ -1,6 +1,12 @@ Changelog ========= +jTimer (1.3.1) stable; urgency=low + + * Fix NPE related to non available systray + + -- chatellier -- jeu. sept. 24 11:04:36 CEST 2009 + jTimer (1.3.0) stable; urgency=low * Fix saving project as task problem (project was appearing in projects subtask)

1 0

r2668 - trunk/src/main/java/org/chorem/jtimer/ui/systray
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 11:00:10 +0200 (Thu, 24 Sep 2009) New Revision: 2668 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 08:59:09 UTC (rev 2667) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 09:00:10 UTC (rev 2668) @@ -296,15 +296,17 @@ * @param start start(true) or stop(false) task */ protected void startStopTask(TimerTask task, boolean start) { - // increment or decrement task - if (start) { - ++nbTasksRunning; - } else { - --nbTasksRunning; - } // display message if (trayIcon != null) { + + // increment or decrement task + if (start) { + ++nbTasksRunning; + } else { + --nbTasksRunning; + } + String message = null; if (nbTasksRunning == 0) { message = resourceMap.getString("tooltipIdleText");

1 0

r2667 - trunk/src/main/java/org/chorem/jtimer/ui/systray
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 10:59:09 +0200 (Thu, 24 Sep 2009) New Revision: 2667 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-16 07:44:32 UTC (rev 2666) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 08:59:09 UTC (rev 2667) @@ -304,21 +304,22 @@ } // display message - String message = null; - if (nbTasksRunning == 0) { - message = resourceMap.getString("tooltipIdleText"); - - trayIcon.setImage(idleImage); - } else { - trayIcon.setImage(runningImage); - if (nbTasksRunning == 1) { - message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + if (trayIcon != null) { + String message = null; + if (nbTasksRunning == 0) { + message = resourceMap.getString("tooltipIdleText"); + + trayIcon.setImage(idleImage); } else { - message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + trayIcon.setImage(runningImage); + if (nbTasksRunning == 1) { + message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + } else { + message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + } } + trayIcon.setToolTip(message); } - trayIcon.setToolTip(message); - } /**

1 0

r2666 - trunk
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:32 +0200 (Wed, 16 Sep 2009) New Revision: 2666 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) +++ trunk/pom.xml 2009-09-16 07:44:32 UTC (rev 2666) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.0</version> + <version>1.3.1-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> <ciManagement>

1 0

r2665 - in tags: . jtimer-1.3.0
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:29 +0200 (Wed, 16 Sep 2009) New Revision: 2665 Added: tags/jtimer-1.3.0/ tags/jtimer-1.3.0/pom.xml Removed: tags/jtimer-1.3.0/pom.xml Log: [maven-release-plugin] copy for tag jtimer-1.3.0 Property changes on: tags/jtimer-1.3.0 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml Added: svn:mergeinfo + /branches/1.3.x:2624-2628 Deleted: tags/jtimer-1.3.0/pom.xml =================================================================== --- trunk/pom.xml 2009-09-15 10:47:18 UTC (rev 2663) +++ tags/jtimer-1.3.0/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) @@ -1,482 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - - <groupId>org.chorem</groupId> - <artifactId>jtimer</artifactId> - <version>1.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>jTimer</name> - <description>jTimer - Project time tracking and report generation tool.</description> - <url>http://maven-site.chorem.org/jtimer</url> - <inceptionYear>2007</inceptionYear> - - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <mailingLists> - <mailingList> - <name>jtimer-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> - <post>jtimer-commits(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> - </mailingList> - - <mailingList> - <name>jtimer-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> - <post>jtimer-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> - </mailingList> - - <mailingList> - <name>jtimer-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> - <post>jtimer-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> - </mailingList> - </mailingLists> - - <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/jtimer/issues</url> - </issueManagement> - - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> - </scm> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> - </site> - </distributionManagement> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> - <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>${jtimer.main.class}</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr,en</locales> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - <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> - </descriptors> - <attach>false</attach> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>assembly-src</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>checkstyle.xml</configLocation> - <excludes>**/package-info.java,**/Xss.java,**/X11.java</excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> -  - <version>2.1.2</version> - <configuration> - <developerConnection>${project.scm.connection}</developerConnection> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>cim</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - <report>issue-tracking</report> - <report>license</report> - <report>mailing-list</report> - <report>project-team</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <configuration> - <type>range</type> - <range>365</range> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${maven.compiler.source}</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> - </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> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jdesktop</groupId> - <artifactId>appframework</artifactId> - <version>1.0.3</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.jdesktop</groupId> - <artifactId>swing-worker</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>3.2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.15</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.15</version> - </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - -  - - <repositories> - <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> - </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> -  - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </pluginRepository> -  - </pluginRepositories> -</project> Copied: tags/jtimer-1.3.0/pom.xml (from rev 2664, trunk/pom.xml) =================================================================== --- tags/jtimer-1.3.0/pom.xml (rev 0) +++ tags/jtimer-1.3.0/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) @@ -0,0 +1,482 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <groupId>org.chorem</groupId> + <artifactId>jtimer</artifactId> + <version>1.3.0</version> + <packaging>jar</packaging> + + <name>jTimer</name> + <description>jTimer - Project time tracking and report generation tool.</description> + <url>http://maven-site.chorem.org/jtimer</url> + <inceptionYear>2007</inceptionYear> + + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> + + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <mailingLists> + <mailingList> + <name>jtimer-commits</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> + <post>jtimer-commits(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> + </mailingList> + + <mailingList> + <name>jtimer-devel</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> + <post>jtimer-devel(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> + </mailingList> + + <mailingList> + <name>jtimer-users</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> + <post>jtimer-users(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> + </mailingList> + </mailingLists> + + <developers> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <issueManagement> + <system>redmine</system> + <url>http://www.chorem.org/projects/jtimer/issues</url> + </issueManagement> + + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> + </scm> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.chorem.org</url> + </ciManagement> + + <distributionManagement> + <repository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/release</url> + </repository> + <snapshotRepository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/snapshot</url> + </snapshotRepository> + <site> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> + </site> + </distributionManagement> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> + <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>${jtimer.main.class}</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <locales>fr,en</locales> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <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> + </descriptors> + <attach>false</attach> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>assembly-src</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>checkstyle.xml</configLocation> + <excludes>**/package-info.java,**/Xss.java,**/X11.java</excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> +  + <version>2.1.2</version> + <configuration> + <developerConnection>${project.scm.connection}</developerConnection> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>cim</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + <report>issue-tracking</report> + <report>license</report> + <report>mailing-list</report> + <report>project-team</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <configuration> + <type>range</type> + <range>365</range> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <targetJdk>${maven.compiler.source}</targetJdk> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.3</version> + </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> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jdesktop</groupId> + <artifactId>appframework</artifactId> + <version>1.0.3</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jdesktop</groupId> + <artifactId>swing-worker</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>3.2.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.15</version> + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + </dependencies> + +  + + <repositories> + <repository> + <id>javanet.repository</id> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </repository> +  + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> +  + </pluginRepositories> +</project>

1 0

r2664 - trunk
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:25 +0200 (Wed, 16 Sep 2009) New Revision: 2664 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release jtimer-1.3.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-15 10:47:18 UTC (rev 2663) +++ trunk/pom.xml 2009-09-16 07:44:25 UTC (rev 2664) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.0</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> </scm> <ciManagement>

1 0