May 2014 - Lima-commits - mailman.cloud.codelutin.com

Build failed in Jenkins: lima-nightly #22
by admin+ci-chorem.org＠codelutin.com 03 Jun '14

03 Jun '14

See <http://ci.chorem.org/jenkins/job/lima-nightly/22/changes> Changes: [echatellier] fixes #1026: Update to openejb 4.6.0.2 ------------------------------------------ [...truncated 770 lines...] [INFO] Copying serp-1.14.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-broker-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xbean-bundleutils-3.15.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-el22-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-loader-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-protobuf-1.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-dbcp-1.4.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying nuiton-decorator-3.0-alpha-3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying h2-1.3.176.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hawtbuf-1.9.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-api-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying bval-core-0.5.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-jxpath-1.3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jaxb-impl-2.2.6.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-util-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-ee-common-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-openwire-legacy-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying nuiton-config-3.0-alpha-2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-logging-1.1.3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jboss-transaction-api_1.2_spec-1.0.0.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-jdbc-store-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-client-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-cli-1.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying bval-jsr303-0.5.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying nuiton-utils-3.0-rc-2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying junit-4.11.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying mbean-annotation-api-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying geronimo-transaction-3.1.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-server-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jboss-logging-3.1.3.GA.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying topia-persistence-2.9-rc-1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xbean-naming-3.15.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jboss-logging-annotations-1.2.0.Beta1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jandex-1.1.0.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xbean-finder-shaded-3.15.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-ejb-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jansi-1.8.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-ejbd-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying ehcache-core-2.4.3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying pdfbox-1.8.4.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-http-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-io-2.4.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying dom4j-1.6.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying topia-service-migration-2.9-rc-1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-primitives-1.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying fontbox-1.8.4.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-web-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-continuation-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying javax.servlet-3.0.0.v201112011016.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying lima-business-api-0.8-SNAPSHOT.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-pool-1.5.7.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-jee-accessors-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying sxc-jaxb-core-0.8.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying swizzle-stream-1.6.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-jee-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-security-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-lang-2.6.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hsqldb-2.3.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying quartz-2.2.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying howl-1.0.1-1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jempbox-1.8.4.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying slf4j-api-1.7.7.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-io-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openjpa-2.3.0-nonfinal-1540826.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying log4j-1.2.17.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-server-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xml-apis-1.0.b2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-ra-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying antlr-2.7.7.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying javaee-api-6.0-5.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-spi-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hibernate-commons-annotations-4.0.4.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xbean-reflect-3.15.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying nuiton-i18n-3.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying geronimo-connector-3.1.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hibernate-ehcache-4.3.5.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-beanutils-1.9.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying geronimo-javamail_1.4_mail-1.8.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying sxc-runtime-0.8.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-core-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying slf4j-log4j12-1.7.7.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-collections4-4.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying xbean-asm4-shaded-3.15.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-lang3-3.3.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hamcrest-core-1.3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-jpa-integration-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-javaagent-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying commons-collections-3.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openejb-client-4.6.0.2.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying guava-16.0.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying geronimo-j2ee-connector_1.6_spec-1.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-impl-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hibernate-jpa-2.1-api-1.0.0.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying nuiton-csv-3.0-alpha-3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying javacsv-2.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying opencsv-2.3.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying openwebbeans-ee-1.2.1.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying jetty-servlet-8.1.14.v20131031.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying activemq-kahadb-store-5.9.0.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Copying hibernate-core-4.3.5.Final.jar to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ lima-business --- [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ lima-business --- [WARNING] No license name defined for org.apache.xbean--xbean-asm4-shaded--3.15 [WARNING] No license name defined for org.apache.xbean--xbean-asm4-shaded--3.15 [INFO] Load missing file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/mbea… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/mbean-annotation-api… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-api/4.6.0.2/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-client/4.6.0… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-core/4.6.0.2… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-ejbd/4.6.0.2… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-javaagent/4.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-jee/4.6.0.2/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-jee-accessor… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-jpa-integrat… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-loader/4.6.0… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/apache/openejb/open… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/openejb/openejb-server/4.6.0… [INFO] Detects third party descriptor <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business-api/sr…> [INFO] Load missing file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business-api/sr…> [INFO] Detects third party descriptor <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-callao/src/lice…> [INFO] Load missing file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-callao/src/lice…> [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/i18n/nuiton-… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/i18n/nuiton-i18n/3.1/nuiton-… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (3 KB at 50.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (3 KB at 79.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-persistence/2.9-… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-persistence/2.9-… (3 KB at 6.6 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/topia/topia-persistence/2.9-rc-1/topia-persistence-2.9-rc-1-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/topia/topia-persistence/2.9-rc-1/topia-persistence-2.9-rc-1-third-party.properties [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (2 KB at 12.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (2 KB at 85.2 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-service-migratio… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-service-migratio… (2 KB at 6.8 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/topia/topia-service-migration/2.9-rc-1/topia-service-migration-2.9-rc-1-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/topia/topia-service-migration/2.9-rc-1/topia-service-migration-2.9-rc-1-third-party.properties [INFO] Missing file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> is up-to-date. [WARNING] There is 2 dependencies with no license : [WARNING] - org.metatype.sxc--sxc-jaxb-core--0.8 [WARNING] - org.metatype.sxc--sxc-runtime--0.8 [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/target…> [INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Lima .............................................. SUCCESS [ 11.754 s] [INFO] Lima :: callao .................................... SUCCESS [ 22.440 s] [INFO] Lima :: business API .............................. SUCCESS [ 4.175 s] [INFO] Lima :: business .................................. FAILURE [ 36.549 s] [INFO] Lima :: Swing ..................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:17 min [INFO] Finished at: 2014-05-15T00:55:57+01:00 [INFO] Final Memory: 84M/1009M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal org.codehaus.mojo:license-maven-plugin:1.6:add-third-party (attach-licenses) on project lima-business: There is some dependencies with no license, please fill the file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.codehaus.mojo:license-maven-plugin:1.6:add-third-party (attach-licenses) on project lima-business: There is some dependencies with no license, please fill the file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.MojoFailureException: There is some dependencies with no license, please fill the file <http://ci.chorem.org/jenkins/job/lima-nightly/ws/trunk/lima-business/src/li…> at org.codehaus.mojo.license.AddThirdPartyMojo.doAction(AddThirdPartyMojo.java:253) at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :lima-business Failed to send e-mail to echatellier because no e-mail address is known, and no default e-mail domain is configured Sending e-mails to: lima-commits(a)list.chorem.org channel stopped Skipping sonar analysis due to bad build status FAILURE Failed to send e-mail to echatellier because no e-mail address is known, and no default e-mail domain is configured

1 7

Build failed in Jenkins: lima-nightly » Lima :: callao #23
by admin+ci-chorem.org＠codelutin.com 02 Jun '14

02 Jun '14

See <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/2…> Changes: [athimel] refs #934 merge vs saveOrUpdate [athimel] Rename package [athimel] Fix Dao naming [athimel] refs #934 Green bar ! [athimel] Fix some of the tests [athimel] refs #934 Migrate LimaInterceptor and LimaXAResource [dcosse] refs#934 migration topia3 en cours [dcosse] refs #934 début de migration vers Topia3 ------------------------------------------ [...truncated 46 lines...] [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 53.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/eugene/eugen… (2 KB at 7.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/eugene/eugen… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 39.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/eugene/eugen… (2 KB at 7.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/eugene/eugen… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 47.3 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/eugene/eugen… (2 KB at 8.0 KB/sec) [INFO] Process phase [zargo] [INFO] Generate one file in 41.117ms. [INFO] Process phase [xmi] [INFO] Generate one file in 1.372s. [INFO] Process phase [model] WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:340) loadModelTagValue - Invalid model tag value [model.tagvalue.String] : the tagvalue 'String' is unknown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:340) loadModelTagValue - Invalid model tag value [model.tagvalue.copyright] : the tagvalue 'copyright' is unknown. [INFO] Process phase [generator] [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getHeaderAmount([])<<[]>> throws [] tagvalue: {}] Operation name getHeaderAmount is already reserved for a getter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getSubAmount([])<<[]>> throws [] tagvalue: {}] Operation name getSubAmount is already reserved for a getter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#account] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#entryBook] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#amountWayEnum] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.LetteringFilter#account] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.entity.FinancialStatement#way] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.ReportsDatas#account] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:402) getType - --------- WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:403) getType - You are using a deprecated tagValue (model.tagValue.String), replace it by WARN [pool-1-thread-1 for channel] (EntityHibernateMappingGenerator.java:404) getType - model.tagValue.hibernateAttributeType.String=text [INFO] Apply generator EntityTransformer [INFO] Apply generator JavaBeanTransformer [INFO] Generate 128 files in 390.528ms. [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ lima-callao --- [INFO] Will create or update license file [gpl_v3] to <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ lima-callao --- [INFO] Load missing file <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] Missing file <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> is up-to-date. [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] Will attach third party file from <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ lima-callao --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 2 resources [INFO] Copying 10 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ lima-callao --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] Scan 159 files header done in 161.327ms. [INFO] * uptodate header on 56 files. * add header on 103 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ lima-callao --- [INFO] Compiling 145 source files to <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ lima-callao --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ lima-callao --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ lima-callao --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ lima-callao --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ lima-callao --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ lima-callao --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ lima-callao --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ lima-callao >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ lima-callao --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ lima-callao --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ lima-callao --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.9-SNAPSHOT:generate (generate-entities) @ lima-callao --- [INFO] Process phase [zargo] [INFO] No file generated. [INFO] Process phase [xmi] [INFO] No file generated. [INFO] Process phase [model] WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:340) loadModelTagValue - Invalid model tag value [model.tagvalue.String] : the tagvalue 'String' is unknown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:340) loadModelTagValue - Invalid model tag value [model.tagvalue.copyright] : the tagvalue 'copyright' is unknown. [INFO] Process phase [generator] [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getHeaderAmount([])<<[]>> throws [] tagvalue: {}] Operation name getHeaderAmount is already reserved for a getter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getSubAmount([])<<[]>> throws [] tagvalue: {}] Operation name getSubAmount is already reserved for a getter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#account] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#entryBook] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.FinancialTransactionSearch#amountWayEnum] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.LetteringFilter#account] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.entity.FinancialStatement#way] Cet attribut n'a pas d'inverse. WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [org.chorem.lima.beans.ReportsDatas#account] Cet attribut n'a pas d'inverse. [INFO] Apply generator EntityTransformer [INFO] Apply generator JavaBeanTransformer [INFO] No file generated. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ lima-callao <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ lima-callao --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ lima-callao --- [INFO] 3 warnings [WARNING] Javadoc Warnings [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…>:106: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…>:78: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…>:86: warning - @return tag has no arguments. [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-callao/w…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ lima-callao --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ lima-callao --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ lima-callao --- [INFO] Loaded /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect-artifacts.txt [INFO] Copying lima-callao-0.8-SNAPSHOT.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-callao/lima-callao-0.8-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-callao/THIRD-PARTY.properties [INFO] Copying lima-callao-0.8-SNAPSHOT-sources.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-callao/lima-callao-0.8-SNAPSHOT-sources.jar [INFO] Copying lima-callao-0.8-SNAPSHOT-javadoc.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-callao/lima-callao-0.8-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ lima-callao --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ lima-callao --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ lima-callao --- [INFO] Used declared dependencies found: [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [WARNING] Used undeclared dependencies found: [WARNING] com.google.guava:guava:jar:17.0:compile [JENKINS] Archiving disabled

1 5

r3824 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/importexport
by dcosse＠users.chorem.org 28 May '14

28 May '14

Author: dcosse Date: 2014-05-28 17:51:32 +0200 (Wed, 28 May 2014) New Revision: 3824 Url: http://forge.chorem.org/projects/lima/repository/revisions/3824 Log: refs #1032 refactoring sur Import Export Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-callao/src/main/xmi/accounting-model.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-05-28 15:00:29 UTC (rev 3823) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-05-28 15:51:32 UTC (rev 3824) @@ -50,6 +50,9 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,8 +60,6 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.interactive.form.PDField; import org.chorem.lima.FinancialStatementWayEnum; -import org.chorem.lima.beans.AccountEBP; -import org.chorem.lima.beans.AccountEBPImpl; import org.chorem.lima.beans.ClosedPeriodicEntryBookImport; import org.chorem.lima.beans.ClosedPeriodicEntryBookImportImpl; import org.chorem.lima.beans.EntryEBP; @@ -124,6 +125,19 @@ private static final Log log = LogFactory.getLog(ImportServiceImpl.class); + protected static final Function<Account, String> GET_ACCOUNT_NUMBER = new Function<Account, String>() { + @Override + public String apply(Account input) { + return input.getAccountNumber(); + } + }; + + protected static final Function<EntryBook, String> GET_ENTRY_BOOK_CODE = new Function<EntryBook, String>() { + @Override + public String apply(EntryBook input) { + return input.getCode(); + } + }; protected final String DATE_PATTERN = "dd/MM/yyyy"; @EJB @@ -171,6 +185,18 @@ // use for logs long before = System.currentTimeMillis(); + List<Account> accounts = accountService.getAllAccounts(); + if (accounts == null) { + accounts = Lists.newArrayList(); + } + Map<String, Account> indexedAccounts = Maps.newHashMap(Maps.uniqueIndex(accounts, GET_ACCOUNT_NUMBER)); + + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + if (entryBooks == null) { + entryBooks = Lists.newArrayList(); + } + Map<String, EntryBook> indexedEntryBooks = Maps.newHashMap(Maps.uniqueIndex(entryBooks, GET_ENTRY_BOOK_CODE)); + SimpleDateFormat epbDateFormat = new SimpleDateFormat(DATE_PATTERN); StringBuilder result = new StringBuilder(); CSVReader csvReader = null; @@ -184,14 +210,14 @@ // check if file have a good header List<String> headEntry = new ArrayList<String>(); - headEntry.add("DatEcr"); - headEntry.add("Journal"); - headEntry.add("Compte"); - headEntry.add("Libelle"); - headEntry.add("Piece"); - headEntry.add("Debit"); - headEntry.add("Credit"); - headEntry.add("Lettre"); + headEntry.add(EntryEBP.PROPERTY_DAT_ECR); + headEntry.add(EntryEBP.PROPERTY_JOURNAL); + headEntry.add(EntryEBP.PROPERTY_COMPTE); + headEntry.add(EntryEBP.PROPERTY_LIBELLE); + headEntry.add(EntryEBP.PROPERTY_PIECE); + headEntry.add(EntryEBP.PROPERTY_DEBIT); + headEntry.add(EntryEBP.PROPERTY_CREDIT); + headEntry.add(EntryEBP.PROPERTY_LETTRE); if (!Arrays.asList(strat.getColumnMapping()).containsAll(headEntry)) { throw new LimaBusinessException( t("lima-business.import.ebpnoheader")); @@ -232,7 +258,7 @@ dateEcr = epbDateFormat.parse(entryEBP.getDatEcr()); // account loading - account = accountService.getAccountByNumber(entryEBP.getCompte()); + account = indexedAccounts.get(entryEBP.getCompte()); // if entry date have fiscalperiod open if (dateEcr.compareTo(fiscalPeriods.get(0).getBeginDate()) < 0 @@ -243,6 +269,7 @@ // if account not exist not export -> exception else if (account == null) { + //// TODO DCossé 28/05/14 this message is not displayed on user's error window. throw new LimaBusinessException(t( "lima-business.import.ebpmissingaccount", entryEBP.getCompte())); @@ -282,7 +309,7 @@ entryBookCode = entryEBP.getJournal(); // entryBook loading - entryBook = entryBookService.getEntryBookByCode(entryBookCode); + entryBook = indexedEntryBooks.get(entryBookCode); // if entrybook not exist create it ! if (entryBook == null) { @@ -344,43 +371,59 @@ @Override public String importAccountsChartFromEbp(String datas) throws LimaException { long before = System.currentTimeMillis(); + List<Account> accounts = accountService.getAllAccounts(); + if (accounts == null) { + accounts = Lists.newArrayList(); + } + Map<String, Account> indexedAccounts = Maps.newHashMap(Maps.uniqueIndex(accounts, GET_ACCOUNT_NUMBER)); + StringBuilder result = new StringBuilder(); CSVReader csvReader = null; try { csvReader = new CSVReader(new StringReader(datas)); - ColumnPositionMappingStrategy<AccountEBPImpl> strat = new ColumnPositionMappingStrategy<AccountEBPImpl>(); - strat.setType(AccountEBPImpl.class); - // read header to set strategy mapping - strat.setColumnMapping(csvReader.readNext()); - // check if file have a good header - List<String> headAccount = new ArrayList<String>(); - headAccount.add("Numero"); - headAccount.add("Intitule"); - if (!Arrays.asList(strat.getColumnMapping()).containsAll( - headAccount)) { + + // check header is valid + String[] headers = csvReader.readNext(); + String columnName; + Integer numIndex = null; + Integer intituleIndex = null; + for (int i = 0; i < headers.length; i++) { + columnName = headers[i]; + if (columnName.equalsIgnoreCase("Numero")) { + numIndex = i; + } else if (columnName.equalsIgnoreCase("Intitule")) { + intituleIndex = i; + } + } + + int nbAccountCreated = 0; + if (numIndex != null && intituleIndex != null) { + String[] line; + line = csvReader.readNext(); + while (line != null) { + String accountNumber = line[numIndex]; + String label = line[intituleIndex]; + Account account = indexedAccounts.get(accountNumber); + // an account can be created but not updated. + if (account == null) { + account = new AccountImpl(); + account.setAccountNumber(accountNumber); + account.setLabel(label); + accountService.createAccount(account); + result.append(t("lima-business.import.accountadded", + accountNumber, label)); + nbAccountCreated++; + } + line = csvReader.readNext(); + } + } else { throw new LimaBusinessException( t("lima-business.import.noaccount")); } - // FIXME echatellier 20120424 read csv line by line without - // creating beans instance - CsvToBean<AccountEBPImpl> csv = new CsvToBean<AccountEBPImpl>(); - List<AccountEBPImpl> list = csv.parse(strat, csvReader); - - for (AccountEBP accountEBP : list) { - String accountNumber = accountEBP.getNumero(); - String label = accountEBP.getIntitule(); - Account account = new AccountImpl(); - account.setAccountNumber(accountNumber); - account.setLabel(label); - accountService.createAccount(account); - result.append(t("lima-business.import.accountadded", - accountNumber, label)); - } - if (log.isInfoEnabled()) { long after = System.currentTimeMillis(); - log.info("Imported form EBP : " + list.size() + " accounts in " + log.info("Imported form EBP : " + nbAccountCreated + " accounts in " + (after - before) + " ms"); } @@ -402,15 +445,34 @@ public String importEntryBookFromEbp(String datas) throws LimaException { long before = System.currentTimeMillis(); + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + if (entryBooks == null) { + entryBooks = Lists.newArrayList(); + } + Map<String, EntryBook> indexedEntryBooks = Maps.newHashMap(Maps.uniqueIndex(entryBooks, GET_ENTRY_BOOK_CODE)); + StringBuilder result = new StringBuilder(); CSVReader csvReader = null; try { csvReader = new CSVReader(new StringReader(datas)); + String[] headers = csvReader.readNext(); + String columnName; + Integer entryBookCodeIndex = null; + Integer entryBookLabelIndex = null; + for (int i = 0; i < headers.length; i++) { + columnName = headers[i]; + if (columnName.equalsIgnoreCase("Code")) { + entryBookCodeIndex = i; + } else if (columnName.equalsIgnoreCase("Libelle")) { + entryBookLabelIndex = i; + } + } + // check if file have a good header - String[] headers = csvReader.readNext(); - if (!headers[0].equals("Code") || !headers[2].equals("Libelle")) { + + if (entryBookCodeIndex == null || entryBookLabelIndex == null) { throw new LimaBusinessException( t("lima-business.import.noaccount")); } @@ -419,12 +481,16 @@ int count = 0; String[] line = csvReader.readNext(); while (line != null) { - EntryBook entryBook = new EntryBookImpl(); - entryBook.setCode(StringUtils.trimToNull(line[0])); - entryBook.setLabel(StringUtils.trimToNull(line[2])); - entryBookService.createEntryBook(entryBook); - result.append(t("lima-business.import.accountadded", entryBook.getCode(), entryBook.getLabel())); - count++; + String entryBookCode = line[entryBookCodeIndex]; + EntryBook entryBook = indexedEntryBooks.get(entryBookCode); + if (entryBook == null) { + entryBook = new EntryBookImpl(); + entryBook.setCode(StringUtils.trimToNull(line[entryBookCodeIndex])); + entryBook.setLabel(StringUtils.trimToNull(line[entryBookLabelIndex])); + entryBookService.createEntryBook(entryBook); + result.append(t("lima-business.import.accountadded", entryBook.getCode(), entryBook.getLabel())); + count++; + } line = csvReader.readNext(); } Modified: trunk/lima-callao/src/main/xmi/accounting-model.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-05-28 15:00:29 UTC (rev 3823) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-05-28 15:51:32 UTC (rev 3824) @@ -52,6 +52,7 @@ import com.google.common.base.Strings; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.api.ExportService; @@ -224,7 +225,7 @@ // display result dialog if (verboseMode) { String result = get(); - if (result.equals(null)) { + if (StringUtils.isBlank(result)) { JOptionPane.showMessageDialog(viewComponent, t("lima.ui.importexport.importerror"), t("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE);

1 0

r3823 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-callao/src/main/java/org/chorem/lima/entity
by sbavencoff＠users.chorem.org 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 17:00:29 +0200 (Wed, 28 May 2014) New Revision: 3823 Url: http://forge.chorem.org/projects/lima/repository/revisions/3823 Log: refs #934 : used Topia3 API and refractor code Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -168,7 +168,7 @@ //check financial period locked FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); FinancialPeriod financialPeriod = financialPeriodTopiaDao.findByDate(financialTransaction.getTransactionDate()); - if (financialPeriod != null && financialPeriod.isLocked()) { + if (financialPeriod.isLocked()) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.financialperiodblocked")); } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -25,35 +25,36 @@ package org.chorem.lima.entity; -import com.google.common.collect.Maps; +import com.google.common.collect.Ordering; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.LetteringFilter; import org.nuiton.topia.persistence.HqlAndParametersBuilder; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { private static final Log log = LogFactory.getLog(EntryTopiaDao.class); + public static final String PROPERTY_TRANSACTION_DATE = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE; + + public static final String PROPERTY_ENTRY_BOOK = Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK; + /** * Requete generique qui recupere les entrees equilibrées portant entre * deux dates. * */ - protected String getEquilibredTransactionQuery() { - String query = "FROM " + Entry.class.getName() + " E" + - // equlibrée (somme des débit = somme des crédit) - " WHERE (SELECT sum(E2.amount) FROM " + Entry.class.getName() + " E2 WHERE E2.debit = false AND E2.financialTransaction = E.financialTransaction) = " + - "(SELECT sum(E2.amount) FROM " + Entry.class.getName() + " E2 WHERE E2.debit = true AND E2.financialTransaction = E.financialTransaction)" + - // entre les 2 dates - " AND :beginDate <= E.financialTransaction.transactionDate" + - " AND E.financialTransaction.transactionDate <= :endDate"; - return query; + protected HqlAndParametersBuilder<Entry> getEquilibredTransactionQuery(Date beginDate, Date endDate) { + + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, endDate); + builder.addWhereClause(FinancialTransactionTopiaDao.getBalancedClause(builder.getAlias() + "." + Entry.PROPERTY_FINANCIAL_TRANSACTION, true)); + + return builder; } /** @@ -68,15 +69,10 @@ public List<Entry> findAllEntryOfBalancedTransaction(Account account, Date beginDate, Date endDate) { - String query = getEquilibredTransactionQuery() + - // concerne le compte - " AND E.account = :account"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("account", account); + HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); + builder.addEquals(Entry.PROPERTY_ACCOUNT, account); - List<Entry> entries = findAll(query, args); + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; } @@ -92,18 +88,16 @@ */ public List<Object[]> getDebitCreditOfBalancedTransaction(Account account, Date beginDate, Date endDate) { - String query = "SELECT E.debit, SUM(E.amount) " + - getEquilibredTransactionQuery() + - // concerne le compte - " AND E.account = :account" + - " GROUP BY E.debit"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("account", account); + HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); + builder.addEquals(Entry.PROPERTY_ACCOUNT, account); - List<Object[]> result = findAll(query, args); + String query = "SELECT " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT + ", " + + "SUM(" + builder.getAlias() + "." + Entry.PROPERTY_AMOUNT + ") " + + builder.getHql() + + " GROUP BY " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT ; + + List<Object[]> result = findAll(query, builder.getHqlParameters()); return result; } @@ -117,28 +111,27 @@ */ public List<Entry> findAllEntryOfBalancedTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = getEquilibredTransactionQuery() + - // concerne le journal - " AND E.financialTransaction.entryBook = :entryBook" + - // fix order - " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction.topiaId"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); + HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); + builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, + Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TOPIA_ID); - List<Entry> entries = findAll(query, args); + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; } public List<String> findLetters() { - String query = "SELECT DISTINCT E.lettering FROM " + Entry.class.getName() + " E" + - " WHERE E.lettering <> null" + - " ORDER BY E.lettering DESC"; - List<String> result = new ArrayList<String>(this.<String>findAll(query)); + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addNotNull(Entry.PROPERTY_LETTERING); + builder.setOrderByArguments(Entry.PROPERTY_LETTERING + " DESC"); + String query = "SELECT DISTINCT " + builder.getAlias() + "." + Entry.PROPERTY_LETTERING + " " + + builder.getHql(); + + List<String> result = findAll(query, builder.getHqlParameters()); + if (log.isDebugEnabled()) { log.debug("Size of result : " + result.size()); } @@ -157,18 +150,15 @@ */ public List<Object[]> getDebitCreditOfBalancedTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = "SELECT E.debit, SUM(E.amount) " + - getEquilibredTransactionQuery() + - // concerne le journal - " AND E.financialTransaction.entryBook = :entryBook" + - " GROUP BY E.debit"; + HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); + builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); + String query = "SELECT " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT + ", " + + "SUM(" + builder.getAlias() + "." + Entry.PROPERTY_AMOUNT + ") " + + builder.getHql() + + " GROUP BY " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT ; - List<Object[]> result = findAll(query, args); + List<Object[]> result = findAll(query, builder.getHqlParameters()); return result; } @@ -182,19 +172,12 @@ */ public List<Entry> findAllEntryByDateForEntryBook(EntryBook entryBook, Date beginDate, Date endDate) { - String query = "FROM " + Entry.class.getName() + " E" + - // entre les 2 dates - " WHERE :beginDate <= E.financialTransaction.transactionDate" + - " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le journal - " AND E.financialTransaction.entryBook = :entryBook"; + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); + builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, endDate); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); - - List<Entry> entries = findAll(query, args); + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; } @@ -205,89 +188,47 @@ * */ public List<Entry> findAllEntryByFilter(LetteringFilter filter) { - List<Entry> entries; + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, filter.getDateStart()); + builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, filter.getDateEnd()); + Account account = filter.getAccount(); - if (account != null && account.getTopiaId() == null) { - // case user want to see all accounts - entries = getAllEntryByLetteringAndDateForEntryBook(filter); - } else { - entries = getAllEntryByAccountLetteringAndDateForEntryBook(filter); + if (account == null || account.getTopiaId() != null) { + builder.addLike(Entry.PROPERTY_ACCOUNT + "." + Account.PROPERTY_ACCOUNT_NUMBER, + filter.getAccount().getAccountNumber() + "%"); } - return entries; - } - public List<Entry> getAllEntryByAccountLetteringAndDateForEntryBook(LetteringFilter filter) { - List<Entry> entries; + String alias = builder.getAlias(); + if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - String query = "SELECT E FROM " + Entry.class.getName() + " E " + - " WHERE E.account.accountNumber like :account "; + builder.addWhereClause( alias + "." + Entry.PROPERTY_LETTERING + " is null " + + "OR " + alias + "." + Entry.PROPERTY_LETTERING + " = ''"); - - if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - query += " AND (E.lettering is null OR E.lettering = '') "; } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ - query += " AND (E.lettering is not null OR E.lettering !='') "; - } - query += " AND E.financialTransaction.transactionDate between :beginDate AND :endDate " + - " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; + builder.addWhereClause( alias + "." + Entry.PROPERTY_LETTERING + " is not null " + + "OR " + alias + "." + Entry.PROPERTY_LETTERING + " != ''"); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", filter.getDateStart()); - args.put("endDate", filter.getDateEnd()); - args.put("account", filter.getAccount().getAccountNumber() + "%"); - entries = findAll(query, args); - - return entries; - } - - public List<Entry> getAllEntryByLetteringAndDateForEntryBook(LetteringFilter filter) { - List<Entry> entries; - - String query = "SELECT E FROM " + Entry.class.getName() + " E "; - - query += " WHERE E.financialTransaction.transactionDate BETWEEN :beginDate AND :endDate "; - - if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - query += " AND (E.lettering is null OR E.lettering = '') "; - } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ - query += " AND (E.lettering is not null OR E.lettering !='') "; } + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); - query += " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; - - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", filter.getDateStart()); - args.put("endDate", filter.getDateEnd()); - - entries = findAll(query, args); - return entries; } - /** * Retourne la dernière entrée d'une transaction * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee * */ public Entry getLastEntry(FinancialTransaction financialTransaction) { - List<Entry> entries; - Entry lastEntry = null; - String query = "SELECT E FROM " + Entry.class.getName() + " E" + - " WHERE E.financialTransaction.transactionDate = :financialTransactionDate " + - " AND E.financialTransaction = :financialTransaction" + - " ORDER BY E.topiaCreateDate DESC"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("financialTransactionDate", financialTransaction.getTransactionDate()); - args.put("financialTransaction", financialTransaction); - - entries = findAll(query, args); - if (entries.size() > 0) { - lastEntry = entries.get(0); - } - + Ordering<Entry> o = new Ordering<Entry>() { + @Override + public int compare(Entry left, Entry right) { + return left.getTopiaCreateDate().compareTo(right.getTopiaCreateDate()); + } + }; + Entry lastEntry = o.max(financialTransaction.getEntry()); return lastEntry; } @@ -302,21 +243,18 @@ */ public List<Object[]> getDebitCreditOfTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = "SELECT E.debit, SUM(E.amount) " + - "FROM " + Entry.class.getName() + " E" + - // entre les 2 dates - " WHERE :beginDate <= E.financialTransaction.transactionDate" + - " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le journal - " AND E.financialTransaction.entryBook = :entryBook" + - " GROUP BY E.debit"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, endDate); + builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); - List<Object[]> result = findAll(query, args); + String query = "SELECT " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT + ", " + + "SUM(" + builder.getAlias() + "." + Entry.PROPERTY_AMOUNT + ") " + + builder.getHql() + + " GROUP BY " + builder.getAlias() + "." + Entry.PROPERTY_DEBIT ; + + List<Object[]> result = findAll(query, builder.getHqlParameters()); return result; } @@ -331,9 +269,9 @@ public boolean isExistUnfilledEntry(Date beginDate, Date endDate, EntryBook entryBook) { HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); - builder.addEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); - builder.addGreaterOrEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); - builder.addLowerOrEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); + builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); + builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, endDate); builder.addWhereClause(Entry.PROPERTY_ACCOUNT + " = null " + "OR " + Entry.PROPERTY_VOUCHER + " = null " + "OR " + Entry.PROPERTY_VOUCHER + " = ''" + Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -25,13 +25,12 @@ package org.chorem.lima.entity; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; +import org.nuiton.topia.persistence.TopiaException; + import java.util.Date; import java.util.List; -import java.util.Map; -import com.google.common.collect.Maps; -import org.nuiton.topia.persistence.TopiaException; - public class FinancialPeriodTopiaDao extends AbstractFinancialPeriodTopiaDao<FinancialPeriod> { /** @@ -44,14 +43,11 @@ */ public FinancialPeriod findByDate(Date date) throws TopiaException { - String query = "FROM " + FinancialPeriod.class.getName() + - " WHERE beginDate <= :date" + - " AND :date <= endDate"; + HqlAndParametersBuilder<FinancialPeriod> builder = newHqlAndParametersBuilder(); + builder.addLowerOrEquals(FinancialPeriod.PROPERTY_BEGIN_DATE, date); + builder.addGreaterOrEquals(FinancialPeriod.PROPERTY_END_DATE, date); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("date", date); - // add unique result here - FinancialPeriod financialPeriod = findUnique(query, args); + FinancialPeriod financialPeriod = findUnique(builder.getHql(), builder.getHqlParameters()); return financialPeriod; } @@ -65,16 +61,12 @@ */ public List<FinancialPeriod> findByDates(Date beginDate, Date endDate) throws TopiaException { - String query = "FROM " + FinancialPeriod.class.getName() + - " WHERE :beginDate <= beginDate" + - " AND beginDate <= :endDate" + - " ORDER by beginDate"; + HqlAndParametersBuilder<FinancialPeriod> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialPeriod.PROPERTY_BEGIN_DATE, beginDate); + builder.addLowerOrEquals(FinancialPeriod.PROPERTY_BEGIN_DATE, endDate); + builder.setOrderByArguments(FinancialPeriod.PROPERTY_BEGIN_DATE); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - // add unique result here - List<FinancialPeriod> financialPeriod = findAll(query, args); + List<FinancialPeriod> financialPeriod = findAll(builder.getHql(), builder.getHqlParameters()); return financialPeriod; } @@ -85,11 +77,11 @@ * @throws TopiaException */ public List<FinancialPeriod> findAllOrderByBeginDate() throws TopiaException { - String query = "FROM " + FinancialPeriod.class.getName() + - " ORDER BY beginDate"; - // add unique result here - List<FinancialPeriod> financialPeriod = findAll(query); + List<FinancialPeriod> financialPeriod = newQueryBuilder() + .setOrderByArguments(FinancialPeriod.PROPERTY_BEGIN_DATE) + .findAll(); + return financialPeriod; } @@ -100,12 +92,11 @@ * @throws TopiaException */ public List<FinancialPeriod> findAllUnlockedOrderByBeginDate() throws TopiaException { - String query = "FROM " + FinancialPeriod.class.getName() + - " WHERE locked = false" + - " ORDER BY beginDate"; - // add unique result here - List<FinancialPeriod> financialPeriod = findAll(query); + List<FinancialPeriod> financialPeriod = forLockedEquals(false) + .setOrderByArguments(FinancialPeriod.PROPERTY_BEGIN_DATE) + .findAll(); + return financialPeriod; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -25,10 +25,7 @@ package org.chorem.lima.entity; -import com.google.common.collect.Maps; - import java.util.List; -import java.util.Map; /** @@ -46,9 +43,11 @@ * Find all {@code FinancialStatement} ordered by topia create date. */ public List<FinancialStatement> findAllOrderedByCreateDate() { - String query = "FROM " + FinancialStatement.class.getName() + - " ORDER BY " + FinancialStatement.PROPERTY_TOPIA_CREATE_DATE; - List<FinancialStatement> result = findAll(query); + + List<FinancialStatement> result = newQueryBuilder() + .setOrderByArguments(FinancialStatement.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return result; } @@ -56,24 +55,13 @@ * Find all {@code FinancialStatement} ordered by topia create date. */ public List<FinancialStatement> findChildrenFinancialStatement(FinancialStatement financialStatement) { - String query = "FROM " + FinancialStatement.class.getName(); - - if (financialStatement == null) { - query += " WHERE masterFinancialStatement = null"; - } else { - query += " WHERE masterFinancialStatement = :masterFinancialStatement"; - } - query += " ORDER BY " + FinancialStatement.PROPERTY_TOPIA_CREATE_DATE; - List<FinancialStatement> result; - if (financialStatement == null) { - result = findAll(query); - } else { - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("masterFinancialStatement", financialStatement); - result = findAll(query, args); - } + List<FinancialStatement> result = forMasterFinancialStatementEquals(financialStatement) + .setOrderByArguments(FinancialStatement.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return result; + } } //FinancialStatementDAO Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -49,7 +49,7 @@ private static final Log log = LogFactory.getLog(FinancialTransactionTopiaDao.class); - protected String getBalancedClause(String alias, boolean balanced) { + protected static String getBalancedClause(String alias, boolean balanced) { String hql = "(SELECT sum(" + Entry.PROPERTY_AMOUNT + ") FROM " + Entry.class.getName() + " WHERE " + Entry.PROPERTY_DEBIT + " = true " + " AND " + Entry.PROPERTY_FINANCIAL_TRANSACTION + " = " + alias + ") " + Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -25,11 +25,6 @@ package org.chorem.lima.entity; -import java.util.List; -import java.util.Map; - -import com.google.common.collect.Maps; -import org.hibernate.HibernateException; import org.nuiton.topia.persistence.TopiaException; /** @@ -44,21 +39,6 @@ public class FiscalPeriodTopiaDao extends AbstractFiscalPeriodTopiaDao<FiscalPeriod> { /** - * FIXME echatellier, remove this method when implemented in topia - * just overriden to use merge() instead of saveOrUpdate() - */ - @Override - public FiscalPeriod update(FiscalPeriod fiscalPeriod) throws TopiaException { - try { - fiscalPeriod = (FiscalPeriod)topiaHibernateSupport.getHibernateSession().merge(fiscalPeriod); - topiaFiresSupport.warnOnUpdateEntity(fiscalPeriod); - return fiscalPeriod; - } catch (HibernateException ex) { - throw new TopiaException(ex); - } - } - - /** * Find fiscal period by financial period. * * @param financialPeriod financial period @@ -66,17 +46,9 @@ * @throws TopiaException */ public FiscalPeriod findByFinancialPeriod(FinancialPeriod financialPeriod) throws TopiaException { - String query = "FROM " + FiscalPeriod.class.getName() + - " WHERE :financialPeriod in elements(financialPeriod)"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("financialPeriod", financialPeriod); + FiscalPeriod result = forFinancialPeriodContains(financialPeriod).findUniqueOrNull(); - List<FiscalPeriod> fiscalPeriods = findAll(query, args); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } return result; } @@ -87,14 +59,10 @@ * @throws TopiaException */ public FiscalPeriod getLastFiscalPeriod() throws TopiaException { - String query = "FROM " + FiscalPeriod.class.getName() + - " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = findAll(query); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } + FiscalPeriod result = newQueryBuilder() + .setOrderByArguments(FinancialPeriod.PROPERTY_END_DATE + " DESC") + .findFirstOrNull(); return result; } @@ -106,14 +74,10 @@ * @throws TopiaException */ public FiscalPeriod getFirstFiscalPeriod() throws TopiaException { - String query = "FROM " + FiscalPeriod.class.getName() + - " ORDER BY endDate"; + FiscalPeriod result = newQueryBuilder() + .setOrderByArguments(FinancialPeriod.PROPERTY_END_DATE) + .findFirstOrNull(); - List<FiscalPeriod> fiscalPeriods = findAll(query); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } return result; } @@ -124,15 +88,11 @@ * @throws TopiaException */ public FiscalPeriod getLastUnlockedFiscalPeriod() throws TopiaException { - String query = "FROM " + FiscalPeriod.class.getName() + - " WHERE locked = false" + - " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = findAll(query); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } + FiscalPeriod result = forLockedEquals(false) + .setOrderByArguments(FinancialPeriod.PROPERTY_END_DATE + " DESC") + .findFirstOrNull(); + return result; } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java 2014-05-28 15:00:29 UTC (rev 3823) @@ -25,10 +25,9 @@ package org.chorem.lima.entity; -import com.google.common.collect.Maps; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; import java.util.List; -import java.util.Map; /** @@ -46,9 +45,11 @@ * Find all {@code VatStatement} ordered by topia create date. */ public List<VatStatement> findAllOrderedByCreateDate() { - String query = "FROM " + VatStatement.class.getName() + - " ORDER BY " + VatStatement.PROPERTY_TOPIA_CREATE_DATE; - List<VatStatement> result = findAll(query); + + List<VatStatement> result = newQueryBuilder() + .setOrderByArguments(VatStatement.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return result; } @@ -59,23 +60,11 @@ * @return children VatStatement */ public List<VatStatement> getChildrenVatStatement(VatStatement masterVatStatement) { - String query = "FROM " + VatStatement.class.getName(); - - if (masterVatStatement == null) { - query += " WHERE masterVatStatement = null"; - } else { - query += " WHERE masterVatStatement = :masterVatStatement"; - } - - query += " ORDER BY " + VatStatement.PROPERTY_TOPIA_CREATE_DATE; - List<VatStatement> result; - if (masterVatStatement == null) { - result = findAll(query); - } else { - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("masterVatStatement", masterVatStatement); - result = findAll(query, args); - } + + List<VatStatement> result = forMasterVatStatementEquals(masterVatStatement) + .setOrderByArguments(VatStatement.PROPERTY_TOPIA_CREATE_DATE) + .findAll(); + return result; } @@ -88,15 +77,11 @@ * @return statement like label */ public VatStatement findVatStatementByLabel(String label) { - String query = "FROM " + VatStatement.class.getName() + - " WHERE label LIKE :label"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("label", "%" + label + "%"); - List<VatStatement> statements = findAll(query, args); - VatStatement result = null; - if (!statements.isEmpty()) { - result = statements.get(0); - } + + HqlAndParametersBuilder<VatStatement> builder = newHqlAndParametersBuilder(); + builder.addLike(VatStatement.PROPERTY_LABEL, "%" + label + "%"); + VatStatement result = findAnyOrNull(builder.getHql(), builder.getHqlParameters()); + return result; }

1 0

r3822 - in trunk: . lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/test/java/org/chorem/lima/entity lima-callao/src/main/java/org/chorem/lima/entity
by sbavencoff＠users.chorem.org 28 May '14

28 May '14

Author: sbavencoff Date: 2014-05-28 14:30:23 +0200 (Wed, 28 May 2014) New Revision: 3822 Url: http://forge.chorem.org/projects/lima/repository/revisions/3822 Log: refs #934 : used Topia3 API and refractor code Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -48,7 +48,6 @@ import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.nuiton.topia.persistence.TopiaException; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -216,37 +215,33 @@ try { FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); + EntryTopiaDao entryDao = getDaoHelper().getEntryDao(); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); // reload object in current transaction closedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.findByTopiaId(closedPeriodicEntryBook.getTopiaId()); // Check if all financial transactions of closedperiodicentrybook are equilibrate - // FIXME echatellier 20120504 unutile de recuperer une liste - // entiere juste pour tester l'existence FinancialPeriod period = closedPeriodicEntryBook.getFinancialPeriod(); - List<FinancialTransaction> result = financialTransactionTopiaDao.getAllUnbalancedTransaction(period.getBeginDate(), - period.getEndDate(), closedPeriodicEntryBook.getEntryBook()); - if (result.size() > 0) { + if (financialTransactionTopiaDao.isExistUnbalancedTransaction( + period.getBeginDate(), + period.getEndDate(), + closedPeriodicEntryBook.getEntryBook())) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.blockerrorequillibrate")); } // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in - result = financialTransactionTopiaDao.getAllUnfilledTransaction(period.getBeginDate(), - period.getEndDate(), closedPeriodicEntryBook.getEntryBook()); - // FIXME echatellier 20120504 unutile de recuperer une liste - // entiere juste pour tester l'existence - if (result.size() > 0) { + if (entryDao.isExistUnfilledEntry( + period.getBeginDate(), + period.getEndDate(), + closedPeriodicEntryBook.getEntryBook())) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.missingelements")); } // Check if all financial transactions have EntryBooks - result = financialTransactionTopiaDao.getAllTransactionWithoutEntryBook(period.getBeginDate(), - period.getEndDate()); - // FIXME echatellier 20120504 unutile de recuperer une liste - // entiere juste pour tester l'existence - if (result.size() > 0) { - FinancialTransaction transaction = result.get(0); - throw new LimaBusinessException(t("lima-business.defaultaccountingrules.missingentrybook", transaction.getTransactionDate())); + if (financialTransactionTopiaDao.isExistTransactionWithoutEntryBook( + period.getBeginDate(), + period.getEndDate())) { + throw new LimaBusinessException(t("lima-business.defaultaccountingrules.missingentrybook")); } } catch (TopiaException ex) { Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -23,8 +23,6 @@ package org.chorem.lima.entity; -import java.util.List; - import org.chorem.lima.business.AbstractLimaTest; import org.chorem.lima.business.LimaException; import org.junit.Assert; @@ -62,8 +60,9 @@ LimaCallaoTopiaPersistenceContext context = getTestContext().newPersistenceContext(); FinancialTransactionTopiaDao ftDAO = context.getFinancialTransactionDao(); - List<FinancialTransaction> fTransactions = ftDAO.getAllUnbalancedTransaction(financialPeriod.getBeginDate(), - financialPeriod.getEndDate(), journalDesVentes); - Assert.assertNotNull(fTransactions); + Assert.assertFalse(ftDAO.isExistUnbalancedTransaction( + financialPeriod.getBeginDate(), + financialPeriod.getEndDate(), + journalDesVentes)); } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -25,6 +25,11 @@ package org.chorem.lima.entity; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; +import org.nuiton.topia.persistence.TopiaException; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -33,10 +38,6 @@ import java.util.Set; import java.util.StringTokenizer; -import com.google.common.collect.Maps; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.persistence.TopiaException; - public class AccountTopiaDao extends AbstractAccountTopiaDao<Account> { /** @@ -89,11 +90,11 @@ */ protected List<Account> findIntervalAccountByNumber(String accountNumberLow, String accountNumberHigh) throws TopiaException { - String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("accountNumberLow", accountNumberLow); - args.put("accountNumberHigh", accountNumberHigh); - return findAll(query, args); + HqlAndParametersBuilder<Account> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(Account.PROPERTY_ACCOUNT_NUMBER, accountNumberLow); + builder.addLowerOrEquals(Account.PROPERTY_ACCOUNT_NUMBER, accountNumberHigh); + List<Account> accounts = forHql(builder.getHql(), builder.getHqlParameters()).findAll(); + return accounts; } /** @@ -104,12 +105,10 @@ * @throws TopiaException */ public List<Account> findAllSubAccounts(Account account) throws TopiaException { - - String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("accountNumber", account.getAccountNumber()); - List<Account> accounts = findAll(query, args); + HqlAndParametersBuilder<Account> builder = newHqlAndParametersBuilder(); + builder.addLike(Account.PROPERTY_ACCOUNT_NUMBER, account.getAccountNumber() + "_%"); + List<Account> accounts = forHql(builder.getHql(), builder.getHqlParameters()).findAll(); return accounts; } @@ -154,7 +153,7 @@ if (leafAccountsMode) { account = findLeafAccountByNumber(s); } else { - account = findByAccountNumber(s); + account = forAccountNumberEquals(s).findUniqueOrNull(); } //if exist if (account != null) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -25,16 +25,20 @@ package org.chorem.lima.entity; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; + import java.util.Date; import java.util.List; -import java.util.Map; -import com.google.common.collect.Maps; -import org.hibernate.HibernateException; -import org.nuiton.topia.persistence.TopiaException; - public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntryBookTopiaDao<ClosedPeriodicEntryBook> { + protected static final String PROPERTY_BEGIN_DATE = ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD + "." + FinancialPeriod.PROPERTY_BEGIN_DATE; + + protected static final String PROPERTY_END_DATE = ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD + "." + FinancialPeriod.PROPERTY_END_DATE; + + /** * Find all ClosedPeriodicEntryBook with common EntryBook. * @@ -58,31 +62,19 @@ EntryBook entryBook, FinancialPeriod financialPeriod) throws TopiaException { - String query = "FROM " + ClosedPeriodicEntryBook.class.getName(); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<ClosedPeriodicEntryBook> queryStep = newQueryBuilder(); - Map<String, Object> args = Maps.newLinkedHashMap(); - ClosedPeriodicEntryBook result = null; if (entryBook != null) { - args.put("entryBook", entryBook); - query += " WHERE entryBook = :entryBook"; - if (financialPeriod != null) { - args.put("financialPeriod", financialPeriod); - query += " AND financialPeriod = :financialPeriod"; - result = findUniqueOrNull(query, args); + queryStep = queryStep.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); + } - } else { - result = findAnyOrNull(query, args); - } - } else { - if (financialPeriod != null) { - args.put("financialPeriod", financialPeriod); - query += " WHERE financialPeriod = :financialPeriod"; - } - - result = findAnyOrNull(query, args); + if (financialPeriod != null) { + queryStep = queryStep.addEquals(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, financialPeriod); } - return result; + ClosedPeriodicEntryBook closedPeriodicEntryBook = queryStep.findFirstOrNull(); + + return closedPeriodicEntryBook; } /** @@ -97,16 +89,13 @@ public List<ClosedPeriodicEntryBook> findAllByDates(Date beginDate, Date endDate) throws TopiaException { - String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + - " WHERE :beginDate <= financialPeriod.beginDate " + - " AND financialPeriod.beginDate <= :endDate" + - " ORDER BY entryBook.code"; + HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); + builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.setOrderByArguments(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - - return findAll(query, args); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); + return closedPeriodicEntryBooks; } /** @@ -122,16 +111,13 @@ public List<ClosedPeriodicEntryBook> findAllByEntryBookAndDates(EntryBook entryBook, Date beginDate, Date endDate) throws TopiaException { - String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + - " WHERE :beginDate <= financialPeriod.beginDate " + - " AND financialPeriod.beginDate <= :endDate" + - " AND entryBook = :entryBook"; + HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); + builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); - return findAll(query, args); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); + return closedPeriodicEntryBooks; } /** @@ -147,17 +133,14 @@ public List<ClosedPeriodicEntryBook> findAllByEntryBookAndDatesLocked(EntryBook entryBook, Date beginDate, Date endDate) throws TopiaException { - String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + - " WHERE :beginDate <= financialPeriod.beginDate " + - " AND financialPeriod.beginDate <= :endDate" + - " AND entryBook = :entryBook" + - " AND locked = true"; + HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); + builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); + builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_LOCKED, true); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate", beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); - return findAll(query, args); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); + return closedPeriodicEntryBooks; } /** @@ -167,14 +150,13 @@ * @throws TopiaException */ public List<ClosedPeriodicEntryBook> findAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod() throws TopiaException { - String query = "SELECT C FROM " + ClosedPeriodicEntryBook.class.getName() + " C" + - ", " + FiscalPeriod.class.getName() + " F" + - " WHERE C.financialPeriod IN ELEMENTS (F.financialPeriod)" + - " AND F.locked = false" + - " ORDER BY C.financialPeriod.beginDate"; - - List<ClosedPeriodicEntryBook> result = findAll(query); - return result; + + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = + forEquals(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD + "." + FinancialPeriod.PROPERTY_LOCKED, false) + .setOrderByArguments(PROPERTY_BEGIN_DATE) + .findAll(); + + return closedPeriodicEntryBooks; } /** @@ -184,18 +166,12 @@ * @throws TopiaException */ public List<ClosedPeriodicEntryBook> findAllClosedPeriodicEntryBooksFromFiscalPeriod(FiscalPeriod fiscalPeriod) throws TopiaException { - String query = "SELECT C FROM " + ClosedPeriodicEntryBook.class.getName() + " C" + - ", " + FiscalPeriod.class.getName() + " F" + - " WHERE C.financialPeriod IN ELEMENTS (F.financialPeriod)" + - " AND F = :fiscalPeriod" + - " ORDER BY C.financialPeriod.beginDate"; + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = + forEquals(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, fiscalPeriod) + .setOrderByArguments(PROPERTY_BEGIN_DATE) + .findAll(); - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("fiscalPeriod", fiscalPeriod); - - List<ClosedPeriodicEntryBook> result = findAll(query, args); - - return result; + return closedPeriodicEntryBooks; } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.LetteringFilter; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; import java.util.ArrayList; import java.util.Date; @@ -318,4 +319,30 @@ List<Object[]> result = findAll(query, args); return result; } + + /** + * if exist entry where some field are not filled in. + * + * @param beginDate begin date + * @param endDate end date + * @param entryBook entry book + * @return has entry where some field are not filled in + */ + public boolean isExistUnfilledEntry(Date beginDate, Date endDate, EntryBook entryBook) { + + HqlAndParametersBuilder<Entry> builder = newHqlAndParametersBuilder(); + builder.addEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); + builder.addGreaterOrEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); + builder.addWhereClause(Entry.PROPERTY_ACCOUNT + " = null " + + "OR " + Entry.PROPERTY_VOUCHER + " = null " + + "OR " + Entry.PROPERTY_VOUCHER + " = ''" + + "OR " + Entry.PROPERTY_DESCRIPTION + " = null " + + "OR " + Entry.PROPERTY_DESCRIPTION + " = ''" ); + + boolean exists = exists(builder.getHql(), builder.getHqlParameters()); + + return exists; + } + } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-28 12:30:23 UTC (rev 3822) @@ -29,8 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.Filter.Filter; -import org.hibernate.HibernateException; -import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; import java.util.Date; import java.util.List; @@ -50,6 +49,18 @@ private static final Log log = LogFactory.getLog(FinancialTransactionTopiaDao.class); + protected String getBalancedClause(String alias, boolean balanced) { + String hql = "(SELECT sum(" + Entry.PROPERTY_AMOUNT + ") FROM " + Entry.class.getName() + + " WHERE " + Entry.PROPERTY_DEBIT + " = true " + + " AND " + Entry.PROPERTY_FINANCIAL_TRANSACTION + " = " + alias + ") " + + (balanced ? "=" : "!=") + " " + + "(SELECT sum(" + Entry.PROPERTY_AMOUNT + ") FROM " + Entry.class.getName() + + " WHERE " + Entry.PROPERTY_DEBIT + " = false " + + " AND " + Entry.PROPERTY_FINANCIAL_TRANSACTION + " = " + alias + ")"; + + return hql; + } + /** * Return how many transaction are found with specified entryBook. * @@ -57,11 +68,8 @@ * @return transaction referencing entry book */ public long getCountByEntryBook(EntryBook entryBook) { - String query = "SELECT count(*) FROM " + FinancialTransaction.class.getName() + " t WHERE t.entryBook = :entryBook"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("entryBook", entryBook); - Number count = (Number)findAll(query, args).get(0); - return count.longValue(); + long count = forEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook).count(); + return count; } /** @@ -72,15 +80,13 @@ * @return unbalanced transactions */ public List<FinancialTransaction> findAllByDates(Date beginDate, Date endDate) { - String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate" + - " ORDER BY T.transactionDate, T." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); - List<FinancialTransaction> result = findAll(query,args); - return result; + + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + List<FinancialTransaction> transactions = findAll(builder.getHql(), builder.getHqlParameters()); + return transactions; } /** @@ -92,49 +98,38 @@ * @return unbalanced transactions */ public List<FinancialTransaction> findAllByDates(Date beginDate, Date endDate, EntryBook entryBook) { - String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate" + - " AND T.entryBook = :entryBook" + - " ORDER BY T.transactionDate, T." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); - List<FinancialTransaction> result = findAll(query, args); - return result; + + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); + builder.addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + List<FinancialTransaction> transactions = findAll(builder.getHql(), builder.getHqlParameters()); + return transactions; + } - + /** - * Find all unbalanced transactions. + * Find if has unbalanced transactions. * * @param beginDate beginDate * @param endDate endDate * @param entryBook entry book (can be null) - * @return unbalanced transactions + * @return if exist unbalanced transactions */ - public List<FinancialTransaction> getAllUnbalancedTransaction(Date beginDate, Date endDate, + public boolean isExistUnbalancedTransaction(Date beginDate, Date endDate, EntryBook entryBook) { - String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = true AND financialTransaction = T) != " + - " (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = false AND financialTransaction = T)" + - " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); + + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); if (entryBook != null) { - args.put("entryBook", entryBook); - query += " AND T.entryBook = :entryBook"; - result = findAll(query, args); - } else { - result = findAll(query, args); + builder.addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); } - - return result; + builder.addWhereClause(getBalancedClause(builder.getAlias(), false)); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + boolean exists = exists(builder.getHql(), builder.getHqlParameters()); + return exists; } /** @@ -147,27 +142,17 @@ */ public List<FinancialTransaction> getAllBalancedTransaction(Date beginDate, Date endDate, EntryBook entryBook) { - String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = true AND financialTransaction = T) = " + - " (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = false AND financialTransaction = T)" + - " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); if (entryBook != null) { - args.put("entryBook", entryBook); - query += " AND T.entryBook = :entryBook"; - result = findAll(query, args); - } else { - result = findAll(query, args); + builder.addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); } - - return result; + builder.addWhereClause(getBalancedClause(builder.getAlias(), true)); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + List<FinancialTransaction> transactions = findAll(builder.getHql(), builder.getHqlParameters()); + return transactions; } /** @@ -182,10 +167,8 @@ EntryBook entryBook) { String query = "SELECT distinct T FROM " + FinancialTransaction.class.getName() + " T"+ " LEFT JOIN T.entry AS E" + - " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = true AND financialTransaction = T) != " + - " (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = false AND financialTransaction = T)" + + " WHERE (" + + getBalancedClause("T", false) + " OR (SELECT sum(amount) FROM " + Entry.class.getName() + " WHERE debit = true AND financialTransaction = T) IS NULL" + " OR (SELECT sum(amount) FROM " + Entry.class.getName() + @@ -214,61 +197,21 @@ } /** - * Find all transaction where some field are not filled in. + * if exist transaction without entry book. * * @param beginDate begin date * @param endDate end date - * @param entryBook entry book - * @return unfilled transaction + * @return exist transaction without entry books */ - public List<FinancialTransaction> getAllUnfilledTransaction(Date beginDate, - Date endDate, EntryBook entryBook) { - String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ - " LEFT JOIN T.entry AS E" + - " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = true AND financialTransaction = T) != " + - " (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = false AND financialTransaction = T) OR E.account = null" + - " OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = '')" + - " AND T.entryBook = :entryBook" + - " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; + public boolean isExistTransactionWithoutEntryBook(Date beginDate, Date endDate) { - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); - args.put("entryBook", entryBook); - List<FinancialTransaction> result = findAll(query, args); - return result; - } + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.addGreaterOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate); + builder.addLowerOrEquals(FinancialTransaction.PROPERTY_TRANSACTION_DATE, endDate); + builder.addNull(FinancialTransaction.PROPERTY_ENTRY_BOOK); + boolean exists = exists(builder.getHql(), builder.getHqlParameters()); + return exists; - /** - * Find all transaction without entry book. - * - * @param beginDate begin date - * @param endDate end date - * @return transaction without entry books - */ - public List<FinancialTransaction> getAllTransactionWithoutEntryBook(Date beginDate, - Date endDate) { - - String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ - " LEFT JOIN T.entry AS E" + - " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = true AND financialTransaction = T) != " + - " (SELECT sum(amount) FROM " + Entry.class.getName() + - " WHERE debit = false AND financialTransaction = T) OR E.account = null" + - " OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = '')" + - " AND entryBook = null" + - " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; - Map<String, Object> args = Maps.newLinkedHashMap(); - args.put("beginDate",beginDate); - args.put("endDate", endDate); - - List<FinancialTransaction> result = findAll(query, args); - - return result; } /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 11:53:32 UTC (rev 3821) +++ trunk/pom.xml 2014-05-28 12:30:23 UTC (rev 3822) @@ -163,13 +163,13 @@  <jettyVersion>${jettyPluginVersion}</jettyVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> <eugeneVersion>2.9</eugeneVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <topiaVersion>3.0-beta-4</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <swinglabsVersion>3.0.4</swinglabsVersion> <h2Version>1.3.176</h2Version>

1 0

r3821 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima/ui/accountsreports lima-swing/src/main/java/org/chorem/lima/ui/balance lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport lima-swing/src/main/java/org/chorem/lima/ui/ledger lima-swing/src/main/java/org/chorem/lima/ui/vatreports
by dcosse＠users.chorem.org 28 May '14

28 May '14

Author: dcosse Date: 2014-05-28 13:53:32 +0200 (Wed, 28 May 2014) New Revision: 3821 Url: http://forge.chorem.org/projects/lima/repository/revisions/3821 Log: Utilisation De org.nuiton.util.DesktopUtil ?\195?\160 la place de java.awt.Desktop; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -32,14 +32,12 @@ import org.chorem.lima.business.migration.DatabaseMigrationClass; import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.nuiton.topia.persistence.TopiaConfigurationConstants; -import org.nuiton.topia.migration.TopiaMigrationEngine; import org.nuiton.topia.migration.TopiaMigrationService; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import org.nuiton.config.ArgumentsParserException; import java.io.File; -import java.util.Properties; import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -25,7 +25,6 @@ package org.chorem.lima.ui.accountsreports; -import java.awt.Desktop; import java.io.IOException; import java.net.URI; import java.net.URLEncoder; @@ -46,6 +45,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; /** @@ -113,7 +113,7 @@ if (log.isDebugEnabled()) { log.debug("URI : " + uri); } - Desktop.getDesktop().browse(uri); + DesktopUtil.browse(uri); } catch (IOException e) { log.error("Can't open browser", e); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -25,8 +25,6 @@ package org.chorem.lima.ui.balance; -import java.awt.Desktop; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; @@ -44,6 +42,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; /** * Handler associated with accounts reports view. @@ -98,9 +97,7 @@ + dateFormat.format(beginDate) + "&endDate=" + dateFormat.format(endDate) + "&format=.html&model=" + DocumentsEnum.BALANCE.getFileName(); - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); + DesktopUtil.browse(new URI(url)); } catch (URISyntaxException e) { log.error("Can't create news URI", e); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -25,8 +25,6 @@ package org.chorem.lima.ui.entrybooksreports; -import java.awt.Desktop; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; @@ -46,6 +44,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; /** * Handler associated with accounts reports view. @@ -105,17 +104,15 @@ + "&endDate=" + dateFormat.format(endDate) + "&format=.html&model=" + DocumentsEnum.ENTRYBOOKS.getFileName(); - Desktop.getDesktop().browse(new URI(url)); + DesktopUtil.browse(new URI(url)); String url2 = "http://" + address + ":" + port + "/?beginDate=" + dateFormat.format(beginDate) + "&endDate=" + dateFormat.format(endDate) + "&format=.html&model=" + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName(); - Desktop.getDesktop().browse(new URI(url2)); + DesktopUtil.browse(new URI(url2)); - } catch (IOException e) { - log.error("Can't open browser", e); } catch (URISyntaxException e) { log.error("Can't create news URI", e); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -26,8 +26,6 @@ package org.chorem.lima.ui.financialstatementreport; -import java.awt.Desktop; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; @@ -44,6 +42,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; /** * Handler associated with accounts reports view. @@ -101,9 +100,7 @@ + "&format=.html&model=" + DocumentsEnum.FINANCIALSTATEMENT.getFileName(); try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); + DesktopUtil.browse(new URI(url)); } catch (URISyntaxException e) { log.error("Can't create news URI", e); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -25,40 +25,24 @@ package org.chorem.lima.ui.ledger; -import static org.nuiton.i18n.I18n.t; - -import java.awt.Desktop; -import java.io.IOException; -import java.math.BigDecimal; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; -import javax.swing.JOptionPane; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.beans.BalanceTrial; -import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialPeriodService; -import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.HttpServerService; -import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.utils.DocumentsEnum; -import org.chorem.lima.business.utils.EntryComparator; -import org.chorem.lima.business.utils.FormatsEnum; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; /** * Handler associated with accounts reports view. @@ -114,9 +98,7 @@ + "&endDate=" + dateFormat.format(endDate) + "&format=.html&model=" + DocumentsEnum.LEDGER.getFileName(); - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); + DesktopUtil.browse(new URI(url)); } catch (URISyntaxException e) { log.error("Can't create news URI", e); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2014-05-28 09:52:22 UTC (rev 3820) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2014-05-28 11:53:32 UTC (rev 3821) @@ -24,8 +24,6 @@ */ package org.chorem.lima.ui.vatreports; -import java.awt.Desktop; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; @@ -42,6 +40,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.DesktopUtil; public class VatReportViewHandler { /** log. */ @@ -90,9 +89,7 @@ + "&endDate=" + dateFormat.format(view.getIntervalPanel().getEndDate()) + "&format=.pdf&model=" + DocumentsEnum.VAT.getFileName() + "&autocomplete=" + view.getAutoComplete(); - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); + DesktopUtil.browse(new URI(url)); } catch (URISyntaxException e) { log.error("Can't create news URI", e); }

1 0

r3820 - trunk
by echatellier＠users.chorem.org 28 May '14

28 May '14

Author: echatellier Date: 2014-05-28 11:52:22 +0200 (Wed, 28 May 2014) New Revision: 3820 Url: http://forge.chorem.org/projects/lima/repository/revisions/3820 Log: Remove snapshots Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 22:02:37 UTC (rev 3819) +++ trunk/pom.xml 2014-05-28 09:52:22 UTC (rev 3820) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7-SNAPSHOT</version> + <version>5.0.7</version> </parent> <groupId>org.chorem</groupId> @@ -163,13 +163,13 @@  <jettyVersion>${jettyPluginVersion}</jettyVersion> - <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> - <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.9</eugeneVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-4</topiaVersion> <swinglabsVersion>3.0.4</swinglabsVersion> <h2Version>1.3.176</h2Version>

1 0

r3819 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/utils lima-business/src/test/java/org/chorem/lima/business lima-callao/src/main/java/org/chorem/lima/entity lima-callao/src/main/xmi
by dcosse＠users.chorem.org 26 May '14

26 May '14

Author: dcosse Date: 2014-05-27 00:02:37 +0200 (Tue, 27 May 2014) New Revision: 3819 Url: http://forge.chorem.org/projects/lima/repository/revisions/3819 Log: refs #934 some refactoring Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java trunk/lima-callao/src/main/xmi/accounting-model.zargo Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -169,29 +169,35 @@ //check financial period locked FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); FinancialPeriod financialPeriod = financialPeriodTopiaDao.findByDate(financialTransaction.getTransactionDate()); - if (financialPeriod.isLocked()) { + if (financialPeriod != null && financialPeriod.isLocked()) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.financialperiodblocked")); } //check all entrybook of his financial period are blocked //FIXME echatellier 20120509 il doit y avoir moyen de faire plus //simple que de recuperer 2 listes et de comparer leur nombres - List<EntryBook> entryBooks = new ArrayList<EntryBook>(); - List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); +// List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); - entryBooks = entryBookTopiaDao.findAll(); - for (EntryBook entryBook : entryBooks) { - ClosedPeriodicEntryBook closedPeriodicEntryBook = - closedPeriodicEntryBookTopiaDao.findByEntryBookAndFinancialPeriod( - entryBook, financialPeriod); - if (closedPeriodicEntryBook.isLocked()) { - closedEntryBooks.add(entryBook); - } - } - if (entryBooks.size() == closedEntryBooks.size()) { +// List<EntryBook> entryBooks = entryBookTopiaDao.findAll(); + // The following code should do the work but i'm not 100% sure. + long nbEntryBooksClosed = closedPeriodicEntryBookTopiaDao.forProperties( + ClosedPeriodicEntryBook.PROPERTY_LOCKED, true, + ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, financialPeriod).addNotNull(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK).count(); + +// for (EntryBook entryBook : entryBooks) { +// ClosedPeriodicEntryBook closedPeriodicEntryBook = +// closedPeriodicEntryBookTopiaDao.findByEntryBookAndFinancialPeriod( +// entryBook, financialPeriod); +// if (closedPeriodicEntryBook.isLocked()) { +// closedEntryBooks.add(entryBook); +// } +// } + + long nbEntryBooks = entryBookTopiaDao.count(); + if (nbEntryBooks == nbEntryBooksClosed) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.allentrybookclosed")); } } catch (TopiaException ex) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -117,8 +117,8 @@ while (account == null && accountNumber.length() > 1) { - accountNumber = accountNumber.substring(0, accountNumber.length() - 1); - account = AccountTopiaDao.findByAccountNumber(accountNumber); + accountNumber = accountNumber.substring(0); + account = AccountTopiaDao.forAccountNumberEquals(accountNumber).findUniqueOrNull(); } } catch (TopiaException ex) { @@ -129,12 +129,12 @@ /** Permet d'obtenir un compte suivant son numero */ @Override - public Account getAccountByNumber(String number) throws LimaException { + public Account getAccountByNumber(String accountNumber) throws LimaException { Account account; try { AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); - account = AccountTopiaDao.findByAccountNumber(number); + account = AccountTopiaDao.forAccountNumberEquals(accountNumber).findUniqueOrNull(); } catch (Exception ex) { throw new LimaException("Can't get master account", ex); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -675,7 +675,7 @@ if (!entryBookCode.equals(generalEntryBooksDataInList.getCode())) { entryBookCode = generalEntryBooksDataInList.getCode(); code = entryBookCode; - description = Strings.isNullOrEmpty(generalEntryBooksDataInList.getDescription()) == true ? "" : generalEntryBooksDataInList.getDescription(); + description = Strings.isNullOrEmpty(generalEntryBooksDataInList.getDescription()) ? "" : generalEntryBooksDataInList.getDescription(); } else { code = ""; description = ""; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -67,8 +67,7 @@ // check if entrybook with is name already exist EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); - result = - entryBookTopiaDao.findByCode(entryBook.getCode()); + result = entryBookTopiaDao.forCodeEquals(entryBook.getCode()).findUniqueOrNull(); if (result != null) { log.error( t("lima-business.entrybook.entrybookalreadyexist", @@ -83,7 +82,8 @@ FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); // for all unblocked financialperiod - for (FinancialPeriod financialPeriod : financialPeriodTopiaDao.findAllByLocked(false)) { + List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, true).findAll(); + for (FinancialPeriod financialPeriod : financialPeriods) { //new closed periodic entrybook ClosedPeriodicEntryBook closedPeriodicEntryBook = @@ -187,7 +187,7 @@ EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); // creation du EntryBook - entryBook = entryBookTopiaDao.findByCode(code); + entryBook = entryBookTopiaDao.forCodeEquals(code).findUniqueOrNull(); } catch (Exception ex) { throw new LimaException("Can't get entry book", ex); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -50,6 +50,8 @@ import org.chorem.lima.entity.FinancialTransactionTopiaDao; import org.chorem.lima.entity.FiscalPeriod; import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import javax.ejb.EJB; import javax.ejb.Remote; @@ -551,21 +553,8 @@ //check rules accountingRules.updateEntryRules(entry, entryOld); - //get new entry amounts - BigDecimal entryAmount = entry.getAmount(); - Boolean entryAmountIsDebit = entry.isDebit(); - - //FIXME PEPIN 20100520 conflict object already instanciate - // Exist best solution ? - entryOld.setAccount(entry.getAccount()); - entryOld.setAmount(entryAmount); - entryOld.setDebit(entryAmountIsDebit); - entryOld.setDescription(entry.getDescription()); - entryOld.setVoucher(entry.getVoucher()); - entryOld.setFinancialTransaction(entry.getFinancialTransaction()); - entryOld.setPosition(entry.getPosition()); - entryOld.setLettering(entry.getLettering()); - + final Binder<Entry, Entry> binder = BinderFactory.newBinder(Entry.class, Entry.class); + binder.copyExcluding(entry, entryOld, Entry.PROPERTY_TOPIA_ID, Entry.PROPERTY_TOPIA_CREATE_DATE); //update entry entryTopiaDao.update(entryOld); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -179,7 +179,7 @@ try { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - result = fiscalPeriodTopiaDao.findAllByLocked(true); + result = fiscalPeriodTopiaDao.forLockedEquals(true).findAll(); } catch (Exception ex) { throw new LimaException("Can't create period", ex); } @@ -197,7 +197,7 @@ try { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - result = fiscalPeriodTopiaDao.findAllByLocked(false); + result = fiscalPeriodTopiaDao.forLockedEquals(false).findAll(); } catch (Exception ex) { throw new LimaException("Can't get periods", ex); } @@ -326,20 +326,9 @@ throw new LimaException("Can't find fiscal period", ex); } - //Sets entryBook - //search for the entryBook to use using param - boolean found = false; - List<EntryBook> entryBooksList = entryBookService.getAllEntryBooks(); - for (EntryBook entry : entryBooksList) { - if (!found && entry.getCode().equals(entryBook.getCode())) { - entryBook = entry; - found = true; - } - } - //if entrybook isn't found //then create it - if (!found) { + if (!entryBook.isPersisted()) { entryBook = entryBookService.createEntryBook(entryBook); } @@ -388,7 +377,6 @@ FinancialPeriod beginfinancialPeriod = null; //look for the first financial period on the new fiscal year which is unlocked - found = false; List<ClosedPeriodicEntryBook> resultsArray = new ArrayList<ClosedPeriodicEntryBook>(); List<ClosedPeriodicEntryBook> closedPeriodicEntryBook = @@ -401,16 +389,16 @@ // - date after the closing fiscal year // - unlocked entrybook // - right code and label - if (!found && !cPeriodicEntryBook.getFinancialPeriod().isLocked() + if (!cPeriodicEntryBook.getFinancialPeriod().isLocked() && cPeriodicEntryBook.getFinancialPeriod().getBeginDate().after(localFiscalPeriod.getEndDate()) && !cPeriodicEntryBook.isLocked() && cPeriodicEntryBook.getEntryBook().getCode().equals(entryBook.getCode()) && cPeriodicEntryBook.getEntryBook().getLabel().equals(entryBook.getLabel())) { - found = true; beginfinancialPeriod = cPeriodicEntryBook.getFinancialPeriod(); + break; } } - if (!found) { + if (beginfinancialPeriod == null) { throw new LimaBusinessException(t("lima-business.fiscalperiod.newfinancialperioderror")); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -34,7 +34,7 @@ private static final long serialVersionUID = 1L; - /** sort by accout number in lexicographical order */ + /** sort by account number in lexicographical order */ @Override public int compare(Account o1, Account o2) { return o1.getAccountNumber().compareTo(o2.getAccountNumber()); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -295,7 +295,7 @@ tr1Entry1.setFinancialTransaction(transaction1); tr1Entry1.setDescription("test desc"); tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + financialTransactionService.createEntry(tr1Entry1); Entry tr1Entry2 = new EntryImpl(); tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); @@ -304,7 +304,7 @@ tr1Entry2.setFinancialTransaction(transaction1); tr1Entry2.setDescription("test desc"); tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + financialTransactionService.createEntry(tr1Entry2); } /** Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -96,7 +96,7 @@ tr1Entry1.setFinancialTransaction(transaction1); //tr1Entry1.setDescription("test desc"); tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + financialTransactionService.createEntry(tr1Entry1); Entry tr1Entry2 = new EntryImpl(); tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); @@ -105,7 +105,7 @@ tr1Entry2.setFinancialTransaction(transaction1); tr1Entry2.setDescription("test desc"); tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + financialTransactionService.createEntry(tr1Entry2); // one in period FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); @@ -138,7 +138,7 @@ tr1Entry1.setFinancialTransaction(transaction1); tr1Entry1.setDescription("test desc"); tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + financialTransactionService.createEntry(tr1Entry1); // one in period FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -36,20 +36,6 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntryBookTopiaDao<ClosedPeriodicEntryBook> { /** - * FIXME echatellier, remove this method when implemented in topia - * just overriden to use merge() instead of saveOrUpdate() - */ - public ClosedPeriodicEntryBook merge(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws TopiaException { - try { - closedPeriodicEntryBook = (ClosedPeriodicEntryBook)topiaHibernateSupport.getHibernateSession().merge(closedPeriodicEntryBook); - topiaFiresSupport.warnOnUpdateEntity(closedPeriodicEntryBook); - return closedPeriodicEntryBook; - } catch (HibernateException ex) { - throw new TopiaException(ex); - } - } - - /** * Find all ClosedPeriodicEntryBook with common EntryBook. * * @param entryBook entry book property @@ -72,22 +58,20 @@ EntryBook entryBook, FinancialPeriod financialPeriod) throws TopiaException { - List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; String query = "FROM " + ClosedPeriodicEntryBook.class.getName(); Map<String, Object> args = Maps.newLinkedHashMap(); - + ClosedPeriodicEntryBook result = null; if (entryBook != null) { args.put("entryBook", entryBook); query += " WHERE entryBook = :entryBook"; if (financialPeriod != null) { args.put("financialPeriod", financialPeriod); query += " AND financialPeriod = :financialPeriod"; - //find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = findAll(query, args); + result = findUniqueOrNull(query, args); + } else { - //find(query, 0, 0, "entryBook", entryBook); - closedPeriodicEntryBooks = findAll(query, args); + result = findAnyOrNull(query, args); } } else { if (financialPeriod != null) { @@ -95,15 +79,9 @@ query += " WHERE financialPeriod = :financialPeriod"; } - //find(query, 0, 0, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = findAll(query, args); + result = findAnyOrNull(query, args); } - // get only first one - ClosedPeriodicEntryBook result = null; - if (!closedPeriodicEntryBooks.isEmpty()) { - result = closedPeriodicEntryBooks.get(0); - } return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -43,14 +43,12 @@ * Requete generique qui recupere les entrees equilibrées portant entre * deux dates. * - * @param beginDate begin date - * @param endDate end date */ - protected String getEquilibredTransactionQuery(Date beginDate, Date endDate) { + protected String getEquilibredTransactionQuery() { String query = "FROM " + Entry.class.getName() + " E" + // equlibrée (somme des débit = somme des crédit) - " WHERE (select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + - "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)" + + " WHERE (SELECT sum(E2.amount) FROM " + Entry.class.getName() + " E2 WHERE E2.debit = false AND E2.financialTransaction = E.financialTransaction) = " + + "(SELECT sum(E2.amount) FROM " + Entry.class.getName() + " E2 WHERE E2.debit = true AND E2.financialTransaction = E.financialTransaction)" + // entre les 2 dates " AND :beginDate <= E.financialTransaction.transactionDate" + " AND E.financialTransaction.transactionDate <= :endDate"; @@ -69,7 +67,7 @@ public List<Entry> findAllEntryOfBalancedTransaction(Account account, Date beginDate, Date endDate) { - String query = getEquilibredTransactionQuery(beginDate, endDate) + + String query = getEquilibredTransactionQuery() + // concerne le compte " AND E.account = :account"; Map<String, Object> args = Maps.newLinkedHashMap(); @@ -93,8 +91,8 @@ */ public List<Object[]> getDebitCreditOfBalancedTransaction(Account account, Date beginDate, Date endDate) { - String query = "SELECT E.debit, sum(E.amount) " + - getEquilibredTransactionQuery(beginDate, endDate) + + String query = "SELECT E.debit, SUM(E.amount) " + + getEquilibredTransactionQuery() + // concerne le compte " AND E.account = :account" + " GROUP BY E.debit"; @@ -118,7 +116,7 @@ */ public List<Entry> findAllEntryOfBalancedTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = getEquilibredTransactionQuery(beginDate, endDate) + + String query = getEquilibredTransactionQuery() + // concerne le journal " AND E.financialTransaction.entryBook = :entryBook" + // fix order @@ -134,9 +132,9 @@ } public List<String> findLetters() { - String query = "Select distinct E.lettering FROM " + Entry.class.getName() + " E" + - " where E.lettering <> null" + - " order by E.lettering desc"; + String query = "SELECT DISTINCT E.lettering FROM " + Entry.class.getName() + " E" + + " WHERE E.lettering <> null" + + " ORDER BY E.lettering DESC"; List<String> result = new ArrayList<String>(this.<String>findAll(query)); @@ -158,8 +156,8 @@ */ public List<Object[]> getDebitCreditOfBalancedTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = "SELECT E.debit, sum(E.amount) " + - getEquilibredTransactionQuery(beginDate, endDate) + + String query = "SELECT E.debit, SUM(E.amount) " + + getEquilibredTransactionQuery() + // concerne le journal " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; @@ -221,18 +219,18 @@ public List<Entry> getAllEntryByAccountLetteringAndDateForEntryBook(LetteringFilter filter) { List<Entry> entries; - String query = "Select E from " + Entry.class.getName() + " E " + - " where E.account.accountNumber like :account "; + String query = "SELECT E FROM " + Entry.class.getName() + " E " + + " WHERE E.account.accountNumber like :account "; if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - query += " and (E.lettering is null or E.lettering = '') "; + query += " AND (E.lettering is null OR E.lettering = '') "; } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ - query += " and (E.lettering is not null or E.lettering !='') "; + query += " AND (E.lettering is not null OR E.lettering !='') "; } - query += " and E.financialTransaction.transactionDate between :beginDate and :endDate " + - " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; + query += " AND E.financialTransaction.transactionDate between :beginDate AND :endDate " + + " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; Map<String, Object> args = Maps.newLinkedHashMap(); args.put("beginDate", filter.getDateStart()); @@ -246,17 +244,17 @@ public List<Entry> getAllEntryByLetteringAndDateForEntryBook(LetteringFilter filter) { List<Entry> entries; - String query = "Select E from " + Entry.class.getName() + " E "; + String query = "SELECT E FROM " + Entry.class.getName() + " E "; - query += " WHERE E.financialTransaction.transactionDate BETWEEN :beginDate and :endDate "; + query += " WHERE E.financialTransaction.transactionDate BETWEEN :beginDate AND :endDate "; if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - query += " and (E.lettering is null or E.lettering = '') "; + query += " AND (E.lettering is null OR E.lettering = '') "; } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ - query += " and (E.lettering is not null or E.lettering !='') "; + query += " AND (E.lettering is not null OR E.lettering !='') "; } - query += " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; + query += " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE; Map<String, Object> args = Maps.newLinkedHashMap(); args.put("beginDate", filter.getDateStart()); @@ -275,10 +273,10 @@ public Entry getLastEntry(FinancialTransaction financialTransaction) { List<Entry> entries; Entry lastEntry = null; - String query = "Select E from " + Entry.class.getName() + " E" + - " where E.financialTransaction.transactionDate = :financialTransactionDate " + - " and E.financialTransaction = :financialTransaction" + - " order by E.topiaCreateDate desc"; + String query = "SELECT E FROM " + Entry.class.getName() + " E" + + " WHERE E.financialTransaction.transactionDate = :financialTransactionDate " + + " AND E.financialTransaction = :financialTransaction" + + " ORDER BY E.topiaCreateDate DESC"; Map<String, Object> args = Maps.newLinkedHashMap(); args.put("financialTransactionDate", financialTransaction.getTransactionDate()); @@ -303,7 +301,7 @@ */ public List<Object[]> getDebitCreditOfTransaction(EntryBook entryBook, Date beginDate, Date endDate) { - String query = "SELECT E.debit, sum(E.amount) " + + String query = "SELECT E.debit, SUM(E.amount) " + "FROM " + Entry.class.getName() + " E" + // entre les 2 dates " WHERE :beginDate <= E.financialTransaction.transactionDate" + Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -51,7 +51,7 @@ Map<String, Object> args = Maps.newLinkedHashMap(); args.put("date", date); // add unique result here - FinancialPeriod financialPeriod = (FinancialPeriod)findUnique(query, args); + FinancialPeriod financialPeriod = findUnique(query, args); return financialPeriod; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-26 15:08:04 UTC (rev 3818) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-26 22:02:37 UTC (rev 3819) @@ -51,20 +51,6 @@ private static final Log log = LogFactory.getLog(FinancialTransactionTopiaDao.class); /** - * FIXME echatellier, remove this method when implemented in topia - * just overriden to use merge() instead of saveOrUpdate() - */ - public FinancialTransaction merge(FinancialTransaction financialTransaction) { - try { - financialTransaction = (FinancialTransaction)topiaHibernateSupport.getHibernateSession().merge(financialTransaction); - topiaFiresSupport.warnOnUpdateEntity(financialTransaction); - return financialTransaction; - } catch (HibernateException ex) { - throw new TopiaException(ex); - } - } - - /** * Return how many transaction are found with specified entryBook. * * @param entryBook entry book Modified: trunk/lima-callao/src/main/xmi/accounting-model.zargo =================================================================== (Binary files differ)

1 0

r3818 - trunk
by dcosse＠users.chorem.org 26 May '14

26 May '14

Author: dcosse Date: 2014-05-26 17:08:04 +0200 (Mon, 26 May 2014) New Revision: 3818 Url: http://forge.chorem.org/projects/lima/repository/revisions/3818 Log: corrige le build Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-19 13:40:41 UTC (rev 3817) +++ trunk/pom.xml 2014-05-26 15:08:04 UTC (rev 3818) @@ -163,7 +163,7 @@  <jettyVersion>${jettyPluginVersion}</jettyVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion>

1 0

r3817 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima
by dcosse＠users.chorem.org 19 May '14

19 May '14

Author: dcosse Date: 2014-05-19 15:40:41 +0200 (Mon, 19 May 2014) New Revision: 3817 Url: http://forge.chorem.org/projects/lima/repository/revisions/3817 Log: refs #934 d?\195?\169sactivation du service de migration tant que celui-ci n''est pas fonctionnel. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-05-19 09:14:17 UTC (rev 3816) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-05-19 13:40:41 UTC (rev 3817) @@ -39,6 +39,7 @@ import org.nuiton.config.ArgumentsParserException; import java.io.File; +import java.util.Properties; import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; @@ -66,8 +67,10 @@ // load default options super(Option.class, null, null, null); - setOption("topia.service.migration", TopiaMigrationEngine.class.getName()); + // TODO DCossé 19/05/14 disabled until migration service is refactored. + //setOption("topia.service.migration", TopiaMigrationEngine.class.getName()); setOption(TopiaMigrationService.MIGRATION_CALLBACK, DatabaseMigrationClass.class.getName()); + setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-05-19 09:14:17 UTC (rev 3816) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-05-19 13:40:41 UTC (rev 3817) @@ -151,7 +151,7 @@ } } instance.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - LimaCallaoEntityEnum.getImplementationClassesAsString()); + LimaCallaoEntityEnum.getImplementationClassesAsString()); } @Override

1 0