April 2013 - Tutti-commits - mailman.cloud.codelutin.com

r819 - in trunk: . tutti-persistence
by tchemit＠users.forge.codelutin.com April 18, 2013

April 18, 2013

Author: tchemit Date: 2013-04-18 08:34:25 +0200 (Thu, 18 Apr 2013) New Revision: 819 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/819 Log: optimize dependencies Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-17 17:10:39 UTC (rev 818) +++ trunk/pom.xml 2013-04-18 06:34:25 UTC (rev 819) @@ -309,12 +309,6 @@ </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.3</version> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-17 17:10:39 UTC (rev 818) +++ trunk/tutti-persistence/pom.xml 2013-04-18 06:34:25 UTC (rev 819) @@ -96,11 +96,6 @@ </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </dependency> - - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency>

1 0

r818 - trunk/src/site/rst
by tchemit＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: tchemit Date: 2013-04-17 19:10:39 +0200 (Wed, 17 Apr 2013) New Revision: 818 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/818 Log: refs #2281: [TECH] - R?\195?\169percution des nouveaut?\195?\169s du mod?\195?\168le adagio Modified: trunk/src/site/rst/referential.rst Modified: trunk/src/site/rst/referential.rst =================================================================== --- trunk/src/site/rst/referential.rst 2013-04-17 17:04:44 UTC (rev 817) +++ trunk/src/site/rst/referential.rst 2013-04-17 17:10:39 UTC (rev 818) @@ -61,11 +61,11 @@ +-----------------------------------------------------+-------+-----------------------------------------------------+ | [REF-11] Catégorie Maturité | OK | | +-----------------------------------------------------+-------+-----------------------------------------------------+ -| [REF-12] Liste des espèces | OK | A vérifier | +| [REF-12] Liste des espèces (avec code rubin) | OK | | +-----------------------------------------------------+-------+-----------------------------------------------------+ -| [REF-13] Liste des espèces vernaculaires | OK | A vérifier | +| [REF-13] Liste des espèces vernaculaires | OK | | +-----------------------------------------------------+-------+-----------------------------------------------------+ -| [REF-14] Liste des ports | OK | A vérifier | +| [REF-14] Liste des ports | OK | | +-----------------------------------------------------+-------+-----------------------------------------------------+ [REF-01] Liste des strates / sous-strates / localités @@ -236,55 +236,20 @@ [REF-12] Liste des espèces -------------------------- -:: +Utilisation de la méthode d'adagio-core *TaxonNameExtendDao.getAllTaxonNames* +avec transcribingTypeId = *TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE* - SELECT - t.id, - t.reference_taxon_fk, - t.complete_name, - trans.external_code as "code rubin", - t.is_referent - FROM - taxon_name t - LEFT JOIN (select object_id, external_code from transcribing_item ti, transcribing_item_type tt - where ti.transcribing_item_type_fk = tt.id - and tt.name = 'TAXINOMIE-REFTAX.MNEMONIQUE') as trans - on t.reference_taxon_fk = trans.object_id +*État:* Valide. -NB : -- mettre tt.name en paramètre car ça pourrait changer -- il faut partir du modèle mis à jour pour la V2 (les tables transcribing ont évolué) - -*État:* A valider (transformer les requêtes SQL). - - [REF-13] Liste des espèces vernaculaires ------------------------------------------- -:: +Utilisation de la méthode d'adagio-core *TaxonNameExtendDao.getAllTaxonNames* +avec transcribingTypeId = *TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE* - SELECT - t.id, - t.reference_taxon_fk, - t.complete_name, - trans.external_code as "nom vernaculaire", - t.is_referent - FROM - taxon_name t - LEFT JOIN (select object_id, external_code from transcribing_item ti, transcribing_item_type tt - where ti.transcribing_item_type_fk = tt.id - and tt.name = 'TAXINOMIE-COMMUN.NOM_VERNACULAIRE') as trans - on t.reference_taxon_fk = trans.object_id +*État:* Valide. - -NB : -- mettre tt.name en paramètre car ça pourrait changer -- il faut partir du modèle mis à jour pour la V2 (les tables transcribing ont évolué) - -*État:* A valider (transformer les requêtes SQL). - - [REF-14] Liste des ports ------------------------------------------------ @@ -305,7 +270,7 @@ - :statusValidCode = *StatusCode.ENABLE* - :statusTemporaryCode = *StatusCode.TEMPORARY* -*État:* À Valider et définir la variable LocationLevelId.PORT. +*État:* Valide. Les requètes techniques

1 0

r817 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/xmi tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: tchemit Date: 2013-04-17 19:04:44 +0200 (Wed, 17 Apr 2013) New Revision: 817 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/817 Log: add method in PersistenceService to have vernicular taxons Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-17 16:40:09 UTC (rev 816) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-04-17 17:04:44 UTC (rev 817) @@ -190,6 +190,20 @@ List<Species> getAllReferentSpecies(TuttiProtocol protocol); /** + * Obtain a species with external code as vernacular code given his referenceTaxonId. + * <p/> + * <strong>Note:</strong> {@link Species#getRefTaxCode()} will not be + * filled by with method. + * + * @param referenceTaxonId id of the reference taxon of the species to load + * @return the species or {@code null} if not found. + * @see Species#getReferenceTaxonId() + * @see Species#getVernacularCode() + * @since 1.5 + */ + Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId); + + /** * @return all caracteristics of the system. * @since 1.0 */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-04-17 16:40:09 UTC (rev 816) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-04-17 17:04:44 UTC (rev 817) @@ -252,6 +252,11 @@ return result; } + @Override + public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId) { + return referentialService.getSpeciesByReferenceTaxonIdWithVernacularCode(referenceTaxonId); + } + protected void setSpeciesSurveyCode(List<Species> speciesList, TuttiProtocol protocol) { if (protocol != null && !protocol.isSpeciesEmpty()) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-04-17 16:40:09 UTC (rev 816) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-04-17 17:04:44 UTC (rev 817) @@ -130,6 +130,11 @@ } @Override + public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId) { + throw new RuntimeException("method not implemented"); + } + + @Override public List<Caracteristic> getAllCaracteristic() { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-17 16:40:09 UTC (rev 816) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-17 17:04:44 UTC (rev 817) @@ -409,6 +409,7 @@ Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); for (TaxonRefVO source : sources) { Species target = loadSpecies(source); + target.setRefTaxCode(target.getExternalCode()); // Add to cache : referentSpeciesByIdCache.put(target.getReferenceTaxonId(), target); @@ -423,6 +424,9 @@ Species result = getSpeciesByReferenceTaxonId( speciesId, enumeration.TRANSCRIBING_TYPE_ID_REFTAX); + if (result != null) { + result.setRefTaxCode(result.getExternalCode()); + } return result; } @@ -431,8 +435,9 @@ Species result = getSpeciesByReferenceTaxonId( speciesId, enumeration.TRANSCRIBING_TYPE_ID_VERNACULAIRE); - result.setVernacularCode(result.getRefTaxCode()); - result.setRefTaxCode(null); + if (result != null) { + result.setVernacularCode(result.getExternalCode()); + } return result; } @@ -723,6 +728,7 @@ // update the source Species result = loadSpecies(taxonName); + result.setRefTaxCode(result.getExternalCode()); // Add to cache Cache cache = cacheService.getCache("referentSpeciesById"); @@ -824,7 +830,7 @@ Species target = TuttiBeanFactory.newSpecies(); target.setId(String.valueOf(source.getTaxonNameId())); target.setName(source.getName()); - target.setRefTaxCode(source.getExternalCode()); + target.setExternalCode(source.getExternalCode()); target.setReferenceTaxonId(source.getReferenceTaxonId()); target.setReferenceTaxon(source.getIsReference()); fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(source.getStatus().getValue()); Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-17 16:40:09 UTC (rev 816) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-04-17 17:04:44 UTC (rev 817) @@ -319,6 +319,11 @@ public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { return driver.getAllReferentSpecies(protocol); } + + @Override + public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId) { + return driver.getSpeciesByReferenceTaxonIdWithVernacularCode(referenceTaxonId); + } @Override public List<Caracteristic> getAllCaracteristic() {

1 0

Build failed in Jenkins: tutti #663
by admin+hudson＠codelutin.com April 17, 2013

April 17, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/663/changes> Changes: [Tony Chemit] refs #2281: [TECH] - Répercution des nouveautés du modèle adagio (utilisation des transcodage) ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/tutti/ws/> Updating http://svn.forge.codelutin.com/svn/tutti/trunk to revision '2013-04-17T18:46:24.145 +0200' U tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java U tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java U tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java U tutti-persistence/src/main/resources/applicationContext-service-tutti.xml U tutti-persistence/src/main/resources/tutti-db-enumerations.properties U tutti-persistence/src/main/xmi/tutti-persistence.zargo At revision 816 Parsing POMs [trunk2] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repo/apache-tomcat-7.0.34/webapps/jenkins/WEB-INF/lib/remoting-2.22.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 51281 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml> -U -e clean install [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Tutti [INFO] Tutti :: Persistence [INFO] Tutti :: Service [INFO] Tutti :: UI Projects to build: [MavenProject: fr.ifremer:tutti:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-service:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml]> projectStarted fr.ifremer:tutti:2.0-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target> mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/surefire-workdir> [INFO] Executed tasks mojoSucceeded org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ tutti --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT.pom [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/tutti-2.0-SNAPSHOT-…> to /var/local/maven/data/repository/fr/ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT-site_fr.xml mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded fr.ifremer:tutti:2.0-SNAPSHOT projectStarted fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Persistence 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/fr/ifremer/adagio/adagi… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (2 KB at 5.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/fr/ifremer/adagio/adagi… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (600 B at 16.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (18 KB at 434.6 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean)[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-persistence --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-persistence --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.eugene:eugene-maven-plugin:2.6.2(default) [INFO] [INFO] --- eugene-maven-plugin:2.6.2:generate (default) @ tutti-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…> to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Generate one file in 29.517ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Generate one file in 2.784s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (ObjectModelReader.java:297) loadModelTagValue - Invalid model tag value [model.tagvalue.simpleBeanExtractPojoInterface] : the tagvalue 'simpleBeanExtractPojoInterface' is unkown. INFO [pool-1-thread-1] (ObjectModelReader.java:273) loadModelProperties - 22 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Apply generator JavaInterfaceTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.TuttiEntity], already found in class-path. [INFO] Apply generator SimpleJavaBeanTransformer [INFO] Apply generator JavaEnumerationTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum], already found in class-path. [INFO] No file generated. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…,> PatternSet [includes: {}, excludes: {**/*.java}]}} mojoSucceeded org.nuiton.eugene:eugene-maven-plugin:2.6.2(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-persistence --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-persistence --- [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get)[INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/g…> forkedProjectSucceeded fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-persistence --- [WARNING] bundle fr_FR contains 3/35 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 35/35 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 0 resource mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-persistence --- [INFO] Compiling 126 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/c…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[35,51] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: package fr.ifremer.adagio.core.dao.referential.taxon <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[823,34] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[378,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[378,43] error: method getAllTaxonNames in interface TaxonNameExtendDao cannot be applied to given types; mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[ERROR] required: boolean found: boolean,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[384,13] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[406,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[406,43] error: method getAllTaxonNames in interface TaxonNameExtendDao cannot be applied to given types; [ERROR] required: boolean found: boolean,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[410,13] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[443,12] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[443,44] error: method getTaxonNameReferent in interface TaxonNameExtendDao cannot be applied to given types; [ERROR] required: Integer found: Integer,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[718,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/src/main…>:[718,35] error: cannot find symbol [INFO] 12 errors [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.581s] [INFO] Tutti :: Persistence .............................. FAILURE [12.406s] [INFO] Tutti :: Service .................................. SKIPPED [INFO] Tutti :: UI ....................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 20.592s [INFO] Finished at: Wed Apr 17 18:46:52 CEST 2013 [INFO] Final Memory: 30M/111M [INFO] ------------------------------------------------------------------------ Projects to build: [MavenProject: fr.ifremer:tutti:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-service:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml]> [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-04-17_18-46-26/archive/fr.ifremer.tutti/tutti-service/2.0-SNAPSHOT/tutti-service-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-04-17_18-46-26/archive/fr.ifremer.tutti/tutti-ui-swing/2.0-SNAPSHOT/tutti-ui-swing-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-04-17_18-46-26/archive/fr.ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/tutti-2.0-SNAPSHOT-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-04-17_18-46-26/archive/fr.ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-04-17_18-46-26/archive/fr.ifremer.tutti/tutti-persistence/2.0-SNAPSHOT/tutti-persistence-2.0-SNAPSHOT.pom Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-persistence: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-persistence: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) 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:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) 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:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: tutti » Tutti :: Persistence #663
by admin+hudson＠codelutin.com April 17, 2013

April 17, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/6…> Changes: [Tony Chemit] refs #2281: [TECH] - Répercution des nouveautés du modèle adagio (utilisation des transcodage) ------------------------------------------ projectStarted fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Persistence 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/fr/ifremer/adagio/adagi… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (2 KB at 5.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/fr/ifremer/adagio/adagi… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (600 B at 16.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio/… (18 KB at 434.6 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean)[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-persistence --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-persistence --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.eugene:eugene-maven-plugin:2.6.2(default) [INFO] [INFO] --- eugene-maven-plugin:2.6.2:generate (default) @ tutti-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Generate one file in 29.517ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Generate one file in 2.784s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (ObjectModelReader.java:297) loadModelTagValue - Invalid model tag value [model.tagvalue.simpleBeanExtractPojoInterface] : the tagvalue 'simpleBeanExtractPojoInterface' is unkown. INFO [pool-1-thread-1] (ObjectModelReader.java:273) loadModelProperties - 22 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Apply generator JavaInterfaceTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.TuttiEntity], already found in class-path. [INFO] Apply generator SimpleJavaBeanTransformer [INFO] Apply generator JavaEnumerationTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:911) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum], already found in class-path. [INFO] No file generated. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…,> PatternSet [includes: {}, excludes: {**/*.java}]}} mojoSucceeded org.nuiton.eugene:eugene-maven-plugin:2.6.2(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-persistence --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-persistence --- [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get)[INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> forkedProjectSucceeded fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-persistence --- [WARNING] bundle fr_FR contains 3/35 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 35/35 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 0 resource mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-persistence --- [INFO] Compiling 126 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[35,51] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: package fr.ifremer.adagio.core.dao.referential.taxon <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[823,34] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[378,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[378,43] error: method getAllTaxonNames in interface TaxonNameExtendDao cannot be applied to given types; mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[ERROR] required: boolean found: boolean,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[384,13] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[406,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[406,43] error: method getAllTaxonNames in interface TaxonNameExtendDao cannot be applied to given types; [ERROR] required: boolean found: boolean,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[410,13] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[443,12] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[443,44] error: method getTaxonNameReferent in interface TaxonNameExtendDao cannot be applied to given types; [ERROR] required: Integer found: Integer,Integer reason: actual and formal argument lists differ in length <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[718,8] error: cannot find symbol [ERROR] symbol: class TaxonRefVO location: class ReferentialPersistenceServiceImpl <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[718,35] error: cannot find symbol [INFO] 12 errors [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT

1 1

r816 - in trunk/tutti-persistence/src: main/java/fr/ifremer/tutti/persistence/service main/resources main/xmi test/java/fr/ifremer/tutti/persistence test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: tchemit Date: 2013-04-17 18:40:09 +0200 (Wed, 17 Apr 2013) New Revision: 816 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/816 Log: refs #2281: [TECH] - R?\195?\169percution des nouveaut?\195?\169s du mod?\195?\168le adagio (utilisation des transcodage) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-04-17 16:40:09 UTC (rev 816) @@ -167,12 +167,28 @@ * @param referenceTaxonId id of the reference taxon of the species to load * @return the species or {@code null} if not found. * @see Species#getReferenceTaxonId() + * @see Species#getRefTaxCode() * @since 0.3 */ @Cacheable(value = "referentSpeciesById", key = "#referenceTaxonId", condition = "#referenceTaxonId != null") Species getSpeciesByReferenceTaxonId(Integer referenceTaxonId); /** + * Obtain a species with external code as vernacular code given his referenceTaxonId. + * <p/> + * <strong>Note:</strong> {@link Species#getRefTaxCode()} will not be + * filled by with method. + * + * @param referenceTaxonId id of the reference taxon of the species to load + * @return the species or {@code null} if not found. + * @see Species#getReferenceTaxonId() + * @see Species#getVernacularCode() + * @since 1.5 + */ + @Cacheable(value = "referentSpeciesByIdVernacular", key = "#referenceTaxonId", condition = "#referenceTaxonId != null") + Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId); + + /** * @return all caracteristics of the system. * @since 1.0 */ @@ -239,7 +255,7 @@ * @since 1.0 */ @Transactional(readOnly = false) - @CacheEvict(value = {"species", "referentSpecies", "referentSpeciesById"}, allEntries = true) + @CacheEvict(value = {"species", "referentSpecies", "referentSpeciesById", "referentSpeciesByIdVernacular"}, allEntries = true) List<Species> importTemporarySpecies(List<Species> species); /** Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-17 16:40:09 UTC (rev 816) @@ -32,7 +32,7 @@ import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonNameExtendDao; -import fr.ifremer.adagio.core.dao.referential.taxon.TaxonRefTaxVO; +import fr.ifremer.adagio.core.dao.referential.taxon.TaxonRefVO; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -375,12 +375,13 @@ @Override public List<Species> getAllSpecies() { - TaxonRefTaxVO[] sources = taxonNameDao.getAllTaxonNames(true); + TaxonRefVO[] sources = taxonNameDao.getAllTaxonNames( + true, enumeration.TRANSCRIBING_TYPE_ID_REFTAX); List<Species> result = Lists.newArrayListWithCapacity(sources.length); List<Species> referenceTaxonsOnly = Lists.newArrayList(); Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); - for (TaxonRefTaxVO source : sources) { + for (TaxonRefVO source : sources) { Species target = loadSpecies(source); if (target.isReferenceTaxon()) { @@ -402,10 +403,11 @@ @Override public List<Species> getAllReferentSpecies() { - TaxonRefTaxVO[] sources = taxonNameDao.getAllTaxonNames(false); + TaxonRefVO[] sources = taxonNameDao.getAllTaxonNames( + false, enumeration.TRANSCRIBING_TYPE_ID_REFTAX); List<Species> result = Lists.newArrayListWithCapacity(sources.length); Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); - for (TaxonRefTaxVO source : sources) { + for (TaxonRefVO source : sources) { Species target = loadSpecies(source); // Add to cache : @@ -418,10 +420,28 @@ @Override public Species getSpeciesByReferenceTaxonId(Integer speciesId) { + Species result = getSpeciesByReferenceTaxonId( + speciesId, + enumeration.TRANSCRIBING_TYPE_ID_REFTAX); + return result; + } + + @Override + public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer speciesId) { + Species result = getSpeciesByReferenceTaxonId( + speciesId, + enumeration.TRANSCRIBING_TYPE_ID_VERNACULAIRE); + result.setVernacularCode(result.getRefTaxCode()); + result.setRefTaxCode(null); + return result; + } + + protected Species getSpeciesByReferenceTaxonId(Integer speciesId, + Integer transcribingTypeId) { Species target; try { - TaxonRefTaxVO source = taxonNameDao.getTaxonNameReferent( - speciesId); + TaxonRefVO source = taxonNameDao.getTaxonNameReferent( + speciesId, transcribingTypeId); target = loadSpecies(source); } catch (DataRetrievalFailureException drfe) { target = null; @@ -695,7 +715,7 @@ Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getName()); - TaxonRefTaxVO taxonName = new TaxonRefTaxVO(); + TaxonRefVO taxonName = new TaxonRefVO(); taxonName.setName(source.getName()); taxonName = taxonNameDao.createAsTemporary( taxonName, @@ -800,11 +820,11 @@ return result; } - protected Species loadSpecies(TaxonRefTaxVO source) { + protected Species loadSpecies(TaxonRefVO source) { Species target = TuttiBeanFactory.newSpecies(); target.setId(String.valueOf(source.getTaxonNameId())); target.setName(source.getName()); - target.setRefTaxCode(source.getRefTaxCode()); + target.setRefTaxCode(source.getExternalCode()); target.setReferenceTaxonId(source.getReferenceTaxonId()); target.setReferenceTaxon(source.getIsReference()); fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(source.getStatus().getValue()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-04-17 16:40:09 UTC (rev 816) @@ -272,6 +272,12 @@ @Value("${VesselPersonRoleId.RECORDER_PERSON}") public final Integer VESSEL_PERSON_ROLE_ID_RECORDER_PERSON = null; + @Value("${TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE}") + public final Integer TRANSCRIBING_TYPE_ID_REFTAX = null; + + @Value("${TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE}") + public final Integer TRANSCRIBING_TYPE_ID_VERNACULAIRE = null; + /** * Contract to place on enumeration that must be synched to field inside this class. * <p/> Modified: trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2013-04-17 16:40:09 UTC (rev 816) @@ -130,6 +130,11 @@ <property name="maxElementsInMemory" value="20000"/> <property name="maxElementsOnDisk" value="20000"/> </bean> + <bean id="tuttiReferentSpeciesByIdVenacularCache" parent="tuttiAbstractEternalCache"> + <property name="cacheName" value="referentSpeciesByIdVernacular" /> + <property name="maxElementsInMemory" value="20000"/> + <property name="maxElementsOnDisk" value="20000"/> + </bean> <bean id="tuttiGearsCache" parent="tuttiAbstractEternalCache"> <property name="cacheName" value="gears" /> Modified: trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2013-04-17 16:40:09 UTC (rev 816) @@ -400,4 +400,7 @@ VesselPersonRoleId.SCIENTIFIC_CRUISE_MANAGER=2 VesselPersonRoleId.SORT_ROOM_MANAGER=3 -VesselPersonRoleId.RECORDER_PERSON=4 \ No newline at end of file +VesselPersonRoleId.RECORDER_PERSON=4 + +TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE=101 +TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE=102 \ No newline at end of file Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-17 16:40:09 UTC (rev 816) @@ -143,13 +143,21 @@ } public String refSpeciesId() { - return "15461"; + return "15923"; } public Integer refSpeciesTaxonId() { - return 1; + return 467; } + public String refSpeciesRefTaxCode() { + return "SEPIOFF"; + } + + public String refSpeciesVernacularCode() { + return "Seiche"; + } + public Integer refBadSpeciesTaxonId() { return 7632; } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-17 16:40:09 UTC (rev 816) @@ -225,11 +225,25 @@ Integer taxonId = fixtures.refSpeciesTaxonId(); Species species = service.getSpeciesByReferenceTaxonId(taxonId); Assert.assertNotNull(species); + Assert.assertNull(species.getVernacularCode()); Assert.assertEquals(speciesId, species.getId()); - Assert.assertEquals(fixtures.refSpeciesTaxonId(), species.getReferenceTaxonId()); + Assert.assertEquals(taxonId, species.getReferenceTaxonId()); + Assert.assertEquals(fixtures.refSpeciesRefTaxCode(), species.getRefTaxCode()); } @Test + public void getSpeciesByReferenceTaxonIdWithVernacularCode(/*String speciesReferenceTaxonId*/) { + String speciesId = fixtures.refSpeciesId(); + Integer taxonId = fixtures.refSpeciesTaxonId(); + Species species = service.getSpeciesByReferenceTaxonIdWithVernacularCode(taxonId); + Assert.assertNotNull(species); + Assert.assertNull(species.getRefTaxCode()); + Assert.assertEquals(speciesId, species.getId()); + Assert.assertEquals(taxonId, species.getReferenceTaxonId()); + Assert.assertEquals(fixtures.refSpeciesVernacularCode(), species.getVernacularCode()); + } + + @Test public void getBadSpeciesByReferenceTaxonId(/*String speciesReferenceTaxonId*/) { Integer taxonId = fixtures.refBadSpeciesTaxonId(); service.getSpeciesByReferenceTaxonId(taxonId); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java 2013-04-17 10:20:07 UTC (rev 815) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java 2013-04-17 16:40:09 UTC (rev 816) @@ -90,8 +90,8 @@ Assert.assertEquals(sp1.getName(), createdSp1.getName()); // TODO TC :question pour TC pourquoi faire le test suivant NotNull, car tu n'a rien mis en entree de ce code ? // faut-il que le genere ? - //Assert.assertNotNull(createdSp1.getRefTaxCode()); - //Assert.assertNotSame(sp1.getRefTaxCode(), createdSp1.getRefTaxCode()); + //Assert.assertNotNull(createdSp1.getExternalCode()); + //Assert.assertNotSame(sp1.getExternalCode(), createdSp1.getExternalCode()); Assert.assertNull(createdSp1.getSurveyCode()); Assert.assertNotNull(createdSp1.getId()); Assert.assertNotSame(sp1.getId(), createdSp1.getId());

1 0

r815 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: accidental individualobservation
by kmorin＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: kmorin Date: 2013-04-17 12:20:07 +0200 (Wed, 17 Apr 2013) New Revision: 815 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/815 Log: layout Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-17 09:48:13 UTC (rev 814) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-17 10:20:07 UTC (rev 815) @@ -77,22 +77,16 @@ <JMenuItem id='removeAccidentalBatchMenu'/> </JPopupMenu> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel id='tableToolbar' + constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.WEST'> + <JButton id='createAccidentalBatchButton' + onActionPerformed='handler.createBatch()'/> + </JPanel> + </JPanel> -  - <row> - <cell columns="2"> - <JPanel id='tableToolbar' layout='{new BorderLayout()}'> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.WEST'> - <JButton id='createAccidentalBatchButton' - onActionPerformed='handler.createBatch()'/> - </JPanel> - </JPanel> - </cell> - </row> - </Table> - <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-17 09:48:13 UTC (rev 814) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-17 10:20:07 UTC (rev 815) @@ -76,22 +76,16 @@ <JMenuItem id='removeIndividualObservationBatchMenu'/> </JPopupMenu> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel id='tableToolbar' + constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.WEST'> + <JButton id='createIndividualObservationBatchButton' + onActionPerformed='handler.createBatch()' /> + </JPanel> + </JPanel> -  - <row> - <cell columns="2"> - <JPanel id='tableToolbar' layout='{new BorderLayout()}'> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.WEST'> - <JButton id='createIndividualObservationBatchButton' - onActionPerformed='handler.createBatch()'/> - </JPanel> - </JPanel> - </cell> - </row> - </Table> - <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'

1 0

r814 - trunk/src/site/rst
by tchemit＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: tchemit Date: 2013-04-17 11:48:13 +0200 (Wed, 17 Apr 2013) New Revision: 814 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/814 Log: refs #2281: [TECH] - R?\195?\169percution des nouveaut?\195?\169s du mod?\195?\168le adagio (mise a jour doc) Modified: trunk/src/site/rst/mapping.rst Modified: trunk/src/site/rst/mapping.rst =================================================================== --- trunk/src/site/rst/mapping.rst 2013-04-17 09:42:36 UTC (rev 813) +++ trunk/src/site/rst/mapping.rst 2013-04-17 09:48:13 UTC (rev 814) @@ -83,17 +83,11 @@ Chef(s) de mission La première personne de la liste est stockée sous ScientificCruise.manager (SCIENTIFIC_CRUISE.MANAGER_PERSON_FK) - En v1, les identifiant des personnes suivantes sont stockées dans ScientificCruise.fishingTrip.comments - derrière la balise : "#MANAGERS=<liste_des_IDs>" - En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> - **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées + Pour les autres personnes, ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> Responsable(s) de salle de tri - En v1, tous les identifiants des personnes sélectionnées sont stockées dans ScientificCruise.fishingTrip.comments - derrière la balise : "#SORT_MANAGERS=<liste_des_IDs>" - En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_salle_de_tri> - **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées - + ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_salle_de_tri> + Commentaire ScientificCruise.comments (SCIENTIFIC_CRUISE.COMMENTS) @@ -217,10 +211,7 @@ Operation.vesselUseFeatures.vesselUseMeasurement (VESSEL_USE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.HAUL_VALID>) Saisisseur(s) - En v1, les identifiant des personnes suivantes sont stockées dans ScientificCruise.fishingTrip.comments - derrière la balise : #MANAGERS=<liste_des_IDs> - En v2, ce stockage devra se faire dans ScientificCruise.fishingTrip.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> - **WARNING** : modèle UML + synchronisation Allegro à mettre à jour pour pouvoir importer/exporter VesselPersonFeatures et les tables liées + Operation.vesselPersonFeatures avec un VesselPersonRole.id=<responsable_de_campagne> Navire (depuis version 1.2) @@ -243,7 +234,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Trait > Mise en oeuvre de l'engin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

r813 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: . config
by tchemit＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: tchemit Date: 2013-04-17 11:42:36 +0200 (Wed, 17 Apr 2013) New Revision: 813 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/813 Log: fixes #2312: [CONFIGURATION] je pr?\195?\169cise que le navire avec config "caroussel" est le Gwen Drez, il y a alors un bouton "Lancer" si c'est pour relancer Tutti ?\195?\167a ne marche pas Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-04-17 09:17:29 UTC (rev 812) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-04-17 09:42:36 UTC (rev 813) @@ -44,11 +44,8 @@ @Override protected void doAction() throws Exception { - // Close the application - RunTutti.closeTutti(getHandler(), null); - - // Restart - RunTutti.startTutti(getContext(), true); + // Close the application, will exit and restart application + RunTutti.closeTutti(getHandler(), RunTutti.UPATE_EXIT_CODE); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-17 09:17:29 UTC (rev 812) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-17 09:42:36 UTC (rev 813) @@ -34,6 +34,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.editor.TuttiLocationTableCell; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; @@ -215,7 +216,9 @@ } protected void reloadApplication() { - TuttiActionHelper.runActionAndWait(this, ReloadTuttiAction.class); + ReloadTuttiAction action = TuttiActionHelper.createLogicAction(this, ReloadTuttiAction.class); + TuttiActionHelper.runAction(action); +// TuttiActionHelper.runActionAndWait(this, ReloadTuttiAction.class); } protected void reloadUI() {

1 0

r812 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com April 17, 2013

April 17, 2013

Author: kmorin Date: 2013-04-17 11:17:29 +0200 (Wed, 17 Apr 2013) New Revision: 812 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/812 Log: improve weight computing Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-17 09:16:32 UTC (rev 811) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-17 09:17:29 UTC (rev 812) @@ -58,7 +58,7 @@ tutti.service.operations.computeWeights.error.incoherentRowWeightCategory= tutti.service.operations.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis -tutti.service.operations.computeWeights.marineLitter.error.noWeight= +tutti.service.operations.computeWeights.marineLitter.error.noWeight=Un lot de macro-déchets n'a pas de poids tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight=Le poids total des mensurations d'un lot des espèces est supérieur au poids de la catégorie tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon

1 0