December 2012 - Lima-commits - mailman.cloud.codelutin.com

r3670 - trunk
by tchemit＠users.chorem.org Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 14:13:28 +0100 (Sat, 29 Dec 2012) New Revision: 3670 Url: http://chorem.org/projects/lima/repository/revisions/3670 Log: Update mavenpom4redmine to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) +++ trunk/pom.xml 2012-12-29 13:13:28 UTC (rev 3670) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.6</version> + <version>3.4.7</version> </parent> <groupId>org.chorem</groupId>

1 0

r3669 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org Dec. 21, 2012

Dec. 21, 2012

Author: tchemit Date: 2012-12-21 17:11:50 +0100 (Fri, 21 Dec 2012) New Revision: 3669 Url: http://chorem.org/projects/lima/repository/revisions/3669 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-12-21 16:11:48 UTC (rev 3668) +++ trunk/lima-business/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-12-21 16:11:48 UTC (rev 3668) +++ trunk/lima-business-api/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-12-21 16:11:48 UTC (rev 3668) +++ trunk/lima-callao/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-12-21 16:11:48 UTC (rev 3668) +++ trunk/lima-swing/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-21 16:11:48 UTC (rev 3668) +++ trunk/pom.xml 2012-12-21 16:11:50 UTC (rev 3669) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -448,11 +448,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6 + scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.6</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <distributionManagement>

1 0

r3668 - in tags: . lima-0.6
by tchemit＠users.chorem.org Dec. 21, 2012

Dec. 21, 2012

Author: tchemit Date: 2012-12-21 17:11:48 +0100 (Fri, 21 Dec 2012) New Revision: 3668 Url: http://chorem.org/projects/lima/repository/revisions/3668 Log: [maven-release-plugin] copy for tag lima-0.6 Added: tags/lima-0.6/ Property changes on: tags/lima-0.6 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3667 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org Dec. 21, 2012

Dec. 21, 2012

Author: tchemit Date: 2012-12-21 17:11:46 +0100 (Fri, 21 Dec 2012) New Revision: 3667 Url: http://chorem.org/projects/lima/repository/revisions/3667 Log: [maven-release-plugin] prepare release lima-0.6 Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-12-18 00:25:24 UTC (rev 3666) +++ trunk/lima-business/pom.xml 2012-12-21 16:11:46 UTC (rev 3667) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-12-18 00:25:24 UTC (rev 3666) +++ trunk/lima-business-api/pom.xml 2012-12-21 16:11:46 UTC (rev 3667) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-12-18 00:25:24 UTC (rev 3666) +++ trunk/lima-callao/pom.xml 2012-12-21 16:11:46 UTC (rev 3667) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-12-18 00:25:24 UTC (rev 3666) +++ trunk/lima-swing/pom.xml 2012-12-21 16:11:46 UTC (rev 3667) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-18 00:25:24 UTC (rev 3666) +++ trunk/pom.xml 2012-12-21 16:11:46 UTC (rev 3667) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> <modules> <module>lima-callao</module> @@ -448,11 +448,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/trunk + scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.6 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.6</url> </scm> <distributionManagement>

1 0

r3666 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by tchemit＠users.chorem.org Dec. 18, 2012

Dec. 18, 2012

Author: tchemit Date: 2012-12-18 01:25:24 +0100 (Tue, 18 Dec 2012) New Revision: 3666 Url: http://chorem.org/projects/lima/repository/revisions/3666 Log: fixes #876: Impossible d'afficher l'?\195?\169cran de lettrage Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-12-18 00:13:03 UTC (rev 3665) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-12-18 00:25:24 UTC (rev 3666) @@ -36,6 +36,7 @@ import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; @@ -310,8 +311,15 @@ List<Date> datesEntree = new ArrayList<Date>(); for (Entry entry : entries){ - datesEntree.add(entry.getFinancialTransaction().getTransactionDate()); - journalEntrees.add(entry.getFinancialTransaction().getEntryBook().getLabel()); + FinancialTransaction financialTransaction = entry.getFinancialTransaction(); + datesEntree.add(financialTransaction.getTransactionDate()); + if (financialTransaction.getEntryBook() == null || + financialTransaction.getEntryBook().getLabel() == null) { + journalEntrees.add(""); + } else { + journalEntrees.add(financialTransaction.getEntryBook().getLabel()); + } + } view.getTableModel().updateEntries(entries, datesEntree, journalEntrees);

1 0

r3665 - in trunk: lima-business/src/site lima-business-api/src/site lima-callao/src/site lima-swing/src/site src/site
by tchemit＠users.chorem.org Dec. 18, 2012

Dec. 18, 2012

Author: tchemit Date: 2012-12-18 01:13:03 +0100 (Tue, 18 Dec 2012) New Revision: 3665 Url: http://chorem.org/projects/lima/repository/revisions/3665 Log: fix site descriptors Modified: trunk/lima-business-api/src/site/site_fr.xml trunk/lima-business/src/site/site_fr.xml trunk/lima-callao/src/site/site_fr.xml trunk/lima-swing/src/site/site_fr.xml trunk/src/site/site_fr.xml Modified: trunk/lima-business/src/site/site_fr.xml =================================================================== --- trunk/lima-business/src/site/site_fr.xml 2012-12-18 00:12:42 UTC (rev 3664) +++ trunk/lima-business/src/site/site_fr.xml 2012-12-18 00:13:03 UTC (rev 3665) @@ -51,11 +51,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/lima-business-api/src/site/site_fr.xml =================================================================== --- trunk/lima-business-api/src/site/site_fr.xml 2012-12-18 00:12:42 UTC (rev 3664) +++ trunk/lima-business-api/src/site/site_fr.xml 2012-12-18 00:13:03 UTC (rev 3665) @@ -51,11 +51,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/lima-callao/src/site/site_fr.xml =================================================================== --- trunk/lima-callao/src/site/site_fr.xml 2012-12-18 00:12:42 UTC (rev 3664) +++ trunk/lima-callao/src/site/site_fr.xml 2012-12-18 00:13:03 UTC (rev 3665) @@ -51,11 +51,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/lima-swing/src/site/site_fr.xml =================================================================== --- trunk/lima-swing/src/site/site_fr.xml 2012-12-18 00:12:42 UTC (rev 3664) +++ trunk/lima-swing/src/site/site_fr.xml 2012-12-18 00:13:03 UTC (rev 3665) @@ -51,11 +51,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-12-18 00:12:42 UTC (rev 3664) +++ trunk/src/site/site_fr.xml 2012-12-18 00:13:03 UTC (rev 3665) @@ -39,7 +39,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> @@ -57,14 +57,14 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="${project.url}/images/jaxx-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> @@ -114,11 +114,11 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r3664 - trunk/lima-business/src/license
by tchemit＠users.chorem.org Dec. 18, 2012

Dec. 18, 2012

Author: tchemit Date: 2012-12-18 01:12:42 +0100 (Tue, 18 Dec 2012) New Revision: 3664 Url: http://chorem.org/projects/lima/repository/revisions/3664 Log: optimize third parties Modified: trunk/lima-business/src/license/THIRD-PARTY.properties Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2012-12-18 00:12:18 UTC (rev 3663) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2012-12-18 00:12:42 UTC (rev 3664) @@ -6,12 +6,12 @@ # - Apache License 2.0 # - Apache Software License - Version 2.0 # - BSD License -# - BSD style # - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 +# - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license @@ -23,6 +23,7 @@ # - MIT License # - MPL 1.1 # - Mozilla Public License +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://asm.ow2.org/license.html @@ -33,9 +34,8 @@ # Please fill the missing licenses for dependencies : # # -#Wed May 16 15:17:45 CEST 2012 +#Tue Dec 18 00:51:14 CET 2012 antlr--antlr--2.7.6=ANTLR 2 License -commons-net--commons-net--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes

1 0

r3663 - trunk/lima-callao
by tchemit＠users.chorem.org Dec. 18, 2012

Dec. 18, 2012

Author: tchemit Date: 2012-12-18 01:12:18 +0100 (Tue, 18 Dec 2012) New Revision: 3663 Url: http://chorem.org/projects/lima/repository/revisions/3663 Log: fixes #867: Updates eugene-maven-plugin to 2.6 Modified: trunk/lima-callao/pom.xml Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-12-18 00:11:39 UTC (rev 3662) +++ trunk/lima-callao/pom.xml 2012-12-18 00:12:18 UTC (rev 3663) @@ -96,7 +96,7 @@ <fullPackagePath>org.chorem.lima</fullPackagePath> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions>

1 0

r3662 - trunk
by tchemit＠users.chorem.org Dec. 18, 2012

Dec. 18, 2012

Author: tchemit Date: 2012-12-18 01:11:39 +0100 (Tue, 18 Dec 2012) New Revision: 3662 Url: http://chorem.org/projects/lima/repository/revisions/3662 Log: fixes #871: Updates Jetty to 9.0.0.M3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-17 23:45:12 UTC (rev 3661) +++ trunk/pom.xml 2012-12-18 00:11:39 UTC (rev 3662) @@ -391,6 +391,7 @@ <openEjbVersion>4.5.1</openEjbVersion> <slf4jVersion>1.7.2</slf4jVersion> <swingxVersion>1.6.4</swingxVersion> + <jettyPluginVersion>9.0.0.M3</jettyPluginVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion>

1 0

r3661 - trunk/lima-swing/src/main/java/org/chorem/lima
by tchemit＠users.chorem.org Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-18 00:45:12 +0100 (Tue, 18 Dec 2012) New Revision: 3661 Url: http://chorem.org/projects/lima/repository/revisions/3661 Log: fixes #873: Quand une erreur survient on ne peut plus rien faire Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2012-12-17 23:44:58 UTC (rev 3660) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2012-12-17 23:45:12 UTC (rev 3661) @@ -65,7 +65,7 @@ } Throwable cause = ex; - while (ex != null && !(cause instanceof LimaBusinessException)) { + while (cause != null && !(cause instanceof LimaBusinessException)) { cause = cause.getCause(); }

1 0