Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

6 changed files:

Changes:

  • client-configuration/src/main/resources/log4j2.xml
    ... ... @@ -49,6 +49,10 @@
    49 49 
           <AppenderRef ref="console"/>
    50 50 
           <AppenderRef ref="File"/>
    51 51 
         </Logger>
    52 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    53 
    +      <AppenderRef ref="console"/>
    54 
    +      <AppenderRef ref="File"/>
    55 
    +    </Logger>
    52 56 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    53 57 
           <AppenderRef ref="console"/>
    54 58 
           <AppenderRef ref="File"/>

  • client-configuration/src/main/resources/observe-log4j2.xml
    ... ... @@ -49,6 +49,10 @@
    49 49 
           <AppenderRef ref="console"/>
    50 50 
           <AppenderRef ref="File"/>
    51 51 
         </Logger>
    52 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    53 
    +      <AppenderRef ref="console"/>
    54 
    +      <AppenderRef ref="File"/>
    55 
    +    </Logger>
    52 56 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    53 57 
           <AppenderRef ref="console"/>
    54 58 
           <AppenderRef ref="File"/>

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ deleted
    1 
    -package fr.ird.observe.dto.decoration.decorators;
    2 
    -
    3 
    -<<<<<<< HEAD
    4 
    -=======
    5 
    -/*-
    6 
    - * #%L
    7 
    - * ObServe :: Dto
    8 
    - * %%
    9 
    - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    10 
    - * %%
    11 
    - * This program is free software: you can redistribute it and/or modify
    12 
    - * it under the terms of the GNU General Public License as
    13 
    - * published by the Free Software Foundation, either version 3 of the
    14 
    - * License, or (at your option) any later version.
    15 
    - *
    16 
    - * This program is distributed in the hope that it will be useful,
    17 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    18 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19 
    - * GNU General Public License for more details.
    20 
    - *
    21 
    - * You should have received a copy of the GNU General Public
    22 
    - * License along with this program.  If not, see
    23 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    24 
    - * #L%
    25 
    - */
    26 
    -
    27 
    ->>>>>>> refs/heads/master-7.x
    28 
    -import fr.ird.observe.dto.referential.GearCaracteristicDto;
    29 
    -
    30 
    -import static org.nuiton.i18n.I18n.t;
    31 
    -
    32 
    -/**
    33 
    - * Created by tchemit on 13/06/2018.
    34 
    - *
    35 
    - * @author Tony Chemit - dev@tchemit.fr
    36 
    - */
    37 
    -public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> {
    38 
    -
    39 
    -    public GearCaracteristicDtoDecorator(String libelle) {
    40 
    -        super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " ");
    41 
    -    }
    42 
    -
    43 
    -    @Override
    44 
    -    protected Comparable<?> getDefaultNullValue(String token) {
    45 
    -        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
    46 
    -        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
    47 
    -            return t("observe.common.no.unit");
    48 
    -        }
    49 
    -        return defaultNullValue;
    50 
    -    }
    51 
    -}

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ deleted
    1 
    -package fr.ird.observe.dto.decoration.decorators;
    2 
    -
    3 
    -<<<<<<< HEAD
    4 
    -=======
    5 
    -/*-
    6 
    - * #%L
    7 
    - * ObServe :: Dto
    8 
    - * %%
    9 
    - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    10 
    - * %%
    11 
    - * This program is free software: you can redistribute it and/or modify
    12 
    - * it under the terms of the GNU General Public License as
    13 
    - * published by the Free Software Foundation, either version 3 of the
    14 
    - * License, or (at your option) any later version.
    15 
    - *
    16 
    - * This program is distributed in the hope that it will be useful,
    17 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    18 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19 
    - * GNU General Public License for more details.
    20 
    - *
    21 
    - * You should have received a copy of the GNU General Public
    22 
    - * License along with this program.  If not, see
    23 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    24 
    - * #L%
    25 
    - */
    26 
    -
    27 
    ->>>>>>> refs/heads/master-7.x
    28 
    -import fr.ird.observe.dto.referential.GearCaracteristicDto;
    29 
    -import fr.ird.observe.dto.referential.GearCaracteristicReference;
    30 
    -
    31 
    -import static org.nuiton.i18n.I18n.t;
    32 
    -
    33 
    -/**
    34 
    - * Created by tchemit on 13/06/2018.
    35 
    - *
    36 
    - * @author Tony Chemit - dev@tchemit.fr
    37 
    - */
    38 
    -public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> {
    39 
    -    public GeatCaracteristicReferenceDecorator( ) {
    40 
    -        super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s");
    41 
    -    }
    42 
    -
    43 
    -    @Override
    44 
    -    protected Comparable<?> getDefaultNullValue(String token) {
    45 
    -        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
    46 
    -        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
    47 
    -            return t("observe.common.no.unit");
    48 
    -        }
    49 
    -        return defaultNullValue;
    50 
    -    }
    51 
    -}

  • server-configuration/src/main/resources/log4j2.xml
    ... ... @@ -34,6 +34,9 @@
    34 34 
         <Logger name="org.nuiton" level="warn" additivity="false">
    35 35 
           <AppenderRef ref="console"/>
    36 36 
         </Logger>
    37 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    38 
    +      <AppenderRef ref="console"/>
    39 
    +    </Logger>
    37 40 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    38 41 
           <AppenderRef ref="console"/>
    39 42 
         </Logger>

  • server-configuration/src/main/resources/observeweb-log4j2.xml
    ... ... @@ -42,7 +42,11 @@
    42 42 
           <AppenderRef ref="console"/>
    43 43 
           <AppenderRef ref="File"/>
    44 44 
         </Logger>
    45 
    -    <Logger name="org.nuiton" level="info" additivity="false">
    45 
    +    <Logger name="org.nuiton" level="warn" additivity="false">
    46 
    +      <AppenderRef ref="console"/>
    47 
    +      <AppenderRef ref="File"/>
    48 
    +    </Logger>
    49 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    46 50 
           <AppenderRef ref="console"/>
    47 51 
           <AppenderRef ref="File"/>
    48 52 
         </Logger>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.