[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Remove very bad files...

16 Sep 2018


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


Commits:
cb74f6ad by Tony CHEMIT at 2018-09-16T14:32:14Z
Remove very bad files...

- - - - -
f46a0c7e by Tony CHEMIT at 2018-09-16T14:32:30Z
Improve log levels (to see migration progress)

- - - - -


6 changed files:

- client-configuration/src/main/resources/log4j2.xml
- client-configuration/src/main/resources/observe-log4j2.xml
- − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~
- − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~
- server-configuration/src/main/resources/log4j2.xml
- server-configuration/src/main/resources/observeweb-log4j2.xml


Changes:

=====================================
client-configuration/src/main/resources/log4j2.xml
=====================================
@@ -49,6 +49,10 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
     <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>


=====================================
client-configuration/src/main/resources/observe-log4j2.xml
=====================================
@@ -49,6 +49,10 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
     <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ deleted
=====================================
@@ -1,51 +0,0 @@
-package fr.ird.observe.dto.decoration.decorators;
-
-<<<<<<< HEAD
-=======
-/*-
- * #%L
- * ObServe :: Dto
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
->>>>>>> refs/heads/master-7.x
-import fr.ird.observe.dto.referential.GearCaracteristicDto;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Created by tchemit on 13/06/2018.
- *
- * @author Tony Chemit - dev@tchemit.fr
- */
-public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> {
-
-    public GearCaracteristicDtoDecorator(String libelle) {
-        super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " ");
-    }
-
-    @Override
-    protected Comparable<?> getDefaultNullValue(String token) {
-        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
-        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
-            return t("observe.common.no.unit");
-        }
-        return defaultNullValue;
-    }
-}


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ deleted
=====================================
@@ -1,51 +0,0 @@
-package fr.ird.observe.dto.decoration.decorators;
-
-<<<<<<< HEAD
-=======
-/*-
- * #%L
- * ObServe :: Dto
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
->>>>>>> refs/heads/master-7.x
-import fr.ird.observe.dto.referential.GearCaracteristicDto;
-import fr.ird.observe.dto.referential.GearCaracteristicReference;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Created by tchemit on 13/06/2018.
- *
- * @author Tony Chemit - dev@tchemit.fr
- */
-public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> {
-    public GeatCaracteristicReferenceDecorator( ) {
-        super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s");
-    }
-
-    @Override
-    protected Comparable<?> getDefaultNullValue(String token) {
-        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
-        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
-            return t("observe.common.no.unit");
-        }
-        return defaultNullValue;
-    }
-}


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


=====================================
server-configuration/src/main/resources/observeweb-log4j2.xml
=====================================
@@ -42,7 +42,11 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
-    <Logger name="org.nuiton" level="info" additivity="false">
+    <Logger name="org.nuiton" level="warn" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/80b457bdedef0d63d2646b8bd33...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/80b457bdedef0d63d2646b8bd33...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)