September 2009 - Cash-commits - mailman.cloud.codelutin.com

r33 - trunk/src/site
by jcouteau＠users.chorem.org Sept. 25, 2009

Sept. 25, 2009

Author: jcouteau Date: 2009-09-25 09:55:33 +0200 (Fri, 25 Sep 2009) New Revision: 33 Modified: trunk/src/site/site.xml Log: Download link point on files list on redmine instead of maven repo Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-24 14:22:24 UTC (rev 32) +++ trunk/src/site/site.xml 2009-09-25 07:55:33 UTC (rev 33) @@ -23,8 +23,7 @@ </menu> <menu name="Download"> - <item name="Stable" href="http://maven.chorem.org/release/org/chorem/cash"/> - <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/cash"/> + <item name="Download" href="http://chorem.org/projects/list_files/cash"/> </menu> <menu name="Trackers">

1 0

r32 - trunk/src/site
by jcouteau＠users.chorem.org Sept. 24, 2009

Sept. 24, 2009

Author: jcouteau Date: 2009-09-24 16:22:24 +0200 (Thu, 24 Sep 2009) New Revision: 32 Modified: trunk/src/site/site.xml Log: Add download links on maven-site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-09-09 13:16:49 UTC (rev 31) +++ trunk/src/site/site.xml 2009-09-24 14:22:24 UTC (rev 32) @@ -22,7 +22,10 @@ <item name="Accueil" href="index.html"/> </menu> - <menu ref="modules"/> + <menu name="Download"> + <item name="Stable" href="http://maven.chorem.org/release/org/chorem/cash"/> + <item name="Snapshot" href="http://maven.chorem.org/snapshot/org/chorem/cash"/> + </menu> <menu name="Trackers"> <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/>

1 0

r31 - in trunk/cash-business/src: . site site/rst
by tchemit＠users.chorem.org Sept. 9, 2009

Sept. 9, 2009

Author: tchemit Date: 2009-09-09 15:16:49 +0200 (Wed, 09 Sep 2009) New Revision: 31 Added: trunk/cash-business/src/site/ trunk/cash-business/src/site/rst/ trunk/cash-business/src/site/rst/index.rst trunk/cash-business/src/site/site.xml Log: [Evolution #47] : faire le site maven, optimisation des dependances, ajout license, bump mavenpom to 1.0.2 Added: trunk/cash-business/src/site/rst/index.rst =================================================================== --- trunk/cash-business/src/site/rst/index.rst (rev 0) +++ trunk/cash-business/src/site/rst/index.rst 2009-09-09 13:16:49 UTC (rev 31) @@ -0,0 +1,4 @@ +Ca$h-business +============= + +A faire :) \ No newline at end of file Added: trunk/cash-business/src/site/site.xml =================================================================== --- trunk/cash-business/src/site/site.xml (rev 0) +++ trunk/cash-business/src/site/site.xml 2009-09-09 13:16:49 UTC (rev 31) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r30 - in trunk: . cash-business cash-ui/src cash-ui/src/site cash-ui/src/site/rst src src/site src/site/rst
by tchemit＠users.chorem.org Sept. 9, 2009

Sept. 9, 2009

Author: tchemit Date: 2009-09-09 15:13:50 +0200 (Wed, 09 Sep 2009) New Revision: 30 Added: trunk/cash-ui/src/site/ trunk/cash-ui/src/site/rst/ trunk/cash-ui/src/site/rst/index.rst trunk/cash-ui/src/site/site.xml trunk/src/ trunk/src/site/ trunk/src/site/rst/ trunk/src/site/rst/index.rst trunk/src/site/site.xml Modified: trunk/ trunk/cash-business/pom.xml trunk/pom.xml Log: [Evolution #47] : faire le site maven, optimisation des dependances, ajout license, bump mavenpom to 1.0.2 Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/cash-business/pom.xml =================================================================== --- trunk/cash-business/pom.xml 2009-09-02 19:42:34 UTC (rev 29) +++ trunk/cash-business/pom.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -1,7 +1,7 @@ <?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   @@ -31,8 +31,8 @@ <artifactId>oasis-ciq-api</artifactId> </dependency> <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> </dependency>  <dependency> @@ -57,6 +57,11 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> </dependencies>   @@ -65,7 +70,8 @@ <name>Ca$h Business</name> <description>Métier de l'application Cash. Implémentation des services et gestion Base de données. - Les entités, services et DTO sont générés par ToPIA</description> + Les entités, services et DTO sont générés par ToPIA + </description>  <developers> Added: trunk/cash-ui/src/site/rst/index.rst =================================================================== --- trunk/cash-ui/src/site/rst/index.rst (rev 0) +++ trunk/cash-ui/src/site/rst/index.rst 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,4 @@ +Ca$h-ui +======= + +A faire :) \ No newline at end of file Added: trunk/cash-ui/src/site/site.xml =================================================================== --- trunk/cash-ui/src/site/site.xml (rev 0) +++ trunk/cash-ui/src/site/site.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-02 19:42:34 UTC (rev 29) +++ trunk/pom.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -1,6 +1,6 @@ <?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>org.chorem</groupId> @@ -48,6 +48,39 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-soa</artifactId> <version>${topia.version}</version> + <exclusions> +  + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-aegis</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + </exclusion> + +  + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -55,9 +88,9 @@ <version>${lang.version}</version> </dependency> <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.4.0</version> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -81,10 +114,10 @@ <artifactId>chenillekit-tapestry</artifactId> <version>${chenillekit.version}</version> <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -166,9 +199,13 @@  <tapestry.version>5.1.0.5</tapestry.version> <chenillekit.version>1.0.2</chenillekit.version> + +  + <license.licenseName>gpl_v3</license.licenseName> + </properties> - <build> + <build> <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> @@ -178,7 +215,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> Added: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst (rev 0) +++ trunk/src/site/rst/index.rst 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,4 @@ +Ca$h +==== + +A faire :) \ No newline at end of file Added: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml (rev 0) +++ trunk/src/site/site.xml 2009-09-09 13:13:50 UTC (rev 30) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu name="Utilisateurs"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu ref="modules"/> + + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=1"/> + <item name="Améliorations" href="${project.issueManagement.url}?query_id=2"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r29 - in trunk/cash-business/src/main: java/org/chorem/cash/business java/org/chorem/cash/impl xmi
by fdesbois＠users.chorem.org Sept. 2, 2009

Sept. 2, 2009

Author: fdesbois Date: 2009-09-02 21:42:34 +0200 (Wed, 02 Sep 2009) New Revision: 29 Modified: trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java trunk/cash-business/src/main/xmi/cash.zargo Log: [FIX] http://chorem.org/issues/show/41 Add composite between Categ and Entry for delete Modified: trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java 2009-08-31 16:38:06 UTC (rev 28) +++ trunk/cash-business/src/main/java/org/chorem/cash/business/EntryHelper.java 2009-09-02 19:42:34 UTC (rev 29) @@ -184,7 +184,7 @@ public static void addEntryForMonth(EntryEntity entity, Date currentDate, Map<String, List<Entry>> results, String pattern) throws ConvertException { /*if (log.isDebugEnabled() && entity.getEntryFrequencyEntity() != null) { log.debug("PERIODIC ENTRY : beginDate = " + entity.getEntryDate() + " _ current = " + currentDate); - }*/ + }*/ Entry result = EntryHelper.getEntry(entity, currentDate); String month = DateUtils.formatDate(currentDate, pattern); List<Entry> current = results.get(month); Modified: trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java =================================================================== --- trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-08-31 16:38:06 UTC (rev 28) +++ trunk/cash-business/src/main/java/org/chorem/cash/impl/ServiceEntryImpl.java 2009-09-02 19:42:34 UTC (rev 29) @@ -237,8 +237,13 @@ List<EntryEntity> entries = dao.findAllBetweenDates(period.getFromDate(), period.getThruDate()); + int nbBadEntries = 0; for (EntryEntity entity : entries) { - EntryHelper.addEntryForMonth(entity, entity.getEntryDate(), results, period.getPattern()); + if (entity.getCategoryEntity() != null) { // Temporary FIX for Unbound entries with category + EntryHelper.addEntryForMonth(entity, entity.getEntryDate(), results, period.getPattern()); + } else { + nbBadEntries++; + } } List<EntryEntity> periodicEntries = dao.findUnlimitedPeriodicEntries(); @@ -275,42 +280,47 @@ results = helper.execute(results); }*/ + if (periodicEntry.getCategoryEntity() != null) { // Temporary FIX for Unbound entries with category - Calendar calendar = new GregorianCalendar(); - calendar.setTime(periodicEntry.getEntryDate()); - // Si entryDate est contenu dans la periode, l'entree sera deja dans la liste des entries - calendar.add(Calendar.MONTH, frequency.getInterval()); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(periodicEntry.getEntryDate()); + // Si entryDate est contenu dans la periode, l'entree sera deja dans la liste des entries + calendar.add(Calendar.MONTH, frequency.getInterval()); - Periodicity periodicity = Periodicity.valueOf(frequency.getPeriodicity()); + Periodicity periodicity = Periodicity.valueOf(frequency.getPeriodicity()); - if (frequency.getUnlimited()) { - while (period.beforeEnd(calendar)) { - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + if (frequency.getUnlimited()) { + while (period.beforeEnd(calendar)) { + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } + calendar.add(Calendar.MONTH, frequency.getInterval()); } - calendar.add(Calendar.MONTH, frequency.getInterval()); - } - } else if (frequency.getNbTimes() > 0) { - int count = 0; - while (period.beforeEnd(calendar) && count < frequency.getNbTimes()) { - calendar.add(Calendar.MONTH, frequency.getInterval()); - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } else if (frequency.getNbTimes() > 0) { + int count = 0; + while (period.beforeEnd(calendar) && count < frequency.getNbTimes()) { + calendar.add(Calendar.MONTH, frequency.getInterval()); + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } + count++; } - count++; - } - } else if (frequency.getUntilDate() != null) { - Date untilDate = frequency.getUntilDate(); - while (period.beforeEnd(calendar) && (calendar.getTime().before(untilDate) || untilDate.equals(calendar.getTime()))) { - calendar.add(Calendar.MONTH, frequency.getInterval()); - if (period.afterBegin(calendar)) { - EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } else if (frequency.getUntilDate() != null) { + Date untilDate = frequency.getUntilDate(); + while (period.beforeEnd(calendar) && (calendar.getTime().before(untilDate) || untilDate.equals(calendar.getTime()))) { + calendar.add(Calendar.MONTH, frequency.getInterval()); + if (period.afterBegin(calendar)) { + EntryHelper.addEntryForMonth(periodicEntry, calendar.getTime(), results, period.getPattern()); + } } } + } else { + nbBadEntries++; } } if (log.isDebugEnabled()) { + log.debug("Bad entries : " + nbBadEntries); log.debug("NbEntries find : " + entries.size()); log.debug("NbPeriodicEntries find : " + periodicEntries.size()); log.debug("Results added : " + results.size() + " _ keys = " + results.keySet()); Modified: trunk/cash-business/src/main/xmi/cash.zargo =================================================================== (Binary files differ)

1 0