branch develop updated (b1253ac -> 36198f0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b1253ac Complete doc for GearCharacteristicValues new 36198f0 Fix unit tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 36198f0663bfa0d8bc98326dc1e08cab58f7001c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 18:07:17 2016 +0200 Fix unit tests Summary of changes: .../echobase/services/service/DecoratorService.java | 4 ++++ .../resources/echobase-importDb-referentiel.zip | Bin 50551 -> 51131 bytes 2 files changed, 4 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 36198f0663bfa0d8bc98326dc1e08cab58f7001c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 18:07:17 2016 +0200 Fix unit tests --- .../echobase/services/service/DecoratorService.java | 4 ++++ .../resources/echobase-importDb-referentiel.zip | Bin 50551 -> 51131 bytes 2 files changed, 4 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java index 9a9d573..428939a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java @@ -86,6 +86,7 @@ import fr.ifremer.echobase.entities.references.Strata; import fr.ifremer.echobase.entities.references.TSParameters; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.entities.references.VesselType; +import fr.ifremer.echobase.entities.references.VocabularyCIEM; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; @@ -395,6 +396,9 @@ public class DecoratorService extends EchoBaseServiceSupport { // AncillaryInstrumentation decorator registerJXPathDecorator(locale, AncillaryInstrumentation.class, "${name}$s"); + + // AncillaryInstrumentation decorator + registerJXPathDecorator(locale, VocabularyCIEM.class, "${label}$s"); } } diff --git a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip index d3adb1e..5139a33 100644 Binary files a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip and b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm