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

Commits:

16 changed files:

Changes:

  • application-web/pom.xml
    ... ... @@ -103,6 +103,11 @@
    103 103 
           <artifactId>nuiton-converter</artifactId>
    104 104 
         </dependency>
    105 105
    106 
    +    <dependency>
    107 
    +      <groupId>io.ultreia.java4all.http</groupId>
    108 
    +      <artifactId>http-api</artifactId>
    109 
    +    </dependency>
    110 
    +
    106 111 
         <!-- WebMotion -->
    107 112 
         <dependency>
    108 113 
           <groupId>org.debux.webmotion</groupId>

  • application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java
    ... ... @@ -43,7 +43,7 @@ import org.debux.webmotion.server.call.ServerContext;
    43 43 
     import org.debux.webmotion.server.mapping.Mapping;
    44 44
    45 45 
     /**
    46 
    - * @author Tony Chemit - tchemit@codelutin.com
    46 
    + * @author Tony Chemit - dev@tchemit.fr
    47 47 
      */
    48 48 
     public class ObserveWebApplicationListener implements WebMotionServerListener {
    49 49

  • application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java
    ... ... @@ -29,7 +29,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont
    29 29 
     import org.debux.webmotion.server.WebMotionController;
    30 30
    31 31 
     /**
    32 
    - * @author Tony Chemit - tchemit@codelutin.com
    32 
    + * @author Tony Chemit - dev@tchemit.fr
    33 33 
      */
    34 34 
     public abstract class ObserveWebMotionController extends WebMotionController {
    35 35

  • application-web/src/test/resources/log4j.properties
    1 1 
     ###
    2 2 
     # #%L
    3 
    -# ObServe :: Services REST Implementation
    3 
    +# ObServe :: Application Web
    4 4 
     # %%
    5 5 
     # Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    6 6 
     # %%

  • services-rest/pom.xml
    ... ... @@ -62,10 +62,6 @@
    62 62 
           <artifactId>commons-logging</artifactId>
    63 63 
         </dependency>
    64 64 
         <dependency>
    65 
    -      <groupId>org.apache.commons</groupId>
    66 
    -      <artifactId>commons-lang3</artifactId>
    67 
    -    </dependency>
    68 
    -    <dependency>
    69 65 
           <groupId>com.google.guava</groupId>
    70 66 
           <artifactId>guava</artifactId>
    71 67 
         </dependency>
    ... ... @@ -74,6 +70,11 @@
    74 70 
           <artifactId>gson</artifactId>
    75 71 
         </dependency>
    76 72
    73 
    +    <dependency>
    74 
    +      <groupId>org.apache.httpcomponents</groupId>
    75 
    +      <artifactId>httpcore</artifactId>
    76 
    +    </dependency>
    77 
    +
    77 78 
         <!-- Nuiton -->
    78 79 
         <dependency>
    79 80 
           <groupId>org.nuiton</groupId>

  • services-runner/pom.xml
    ... ... @@ -81,6 +81,10 @@
    81 81 
           <groupId>commons-logging</groupId>
    82 82 
           <artifactId>commons-logging</artifactId>
    83 83 
         </dependency>
    84 
    +    <dependency>
    85 
    +      <groupId>commons-io</groupId>
    86 
    +      <artifactId>commons-io</artifactId>
    87 
    +    </dependency>
    84 88
    85 89 
         <dependency>
    86 90 
           <groupId>org.reflections</groupId>

  • services-runner/src/main/resources/validators.xml
    1 1 
     <?xml version="1.0" encoding="UTF-8"?>
    2 2 
     <!--
    3 3 
       #%L
    4 
    -  ObServe :: Application Web Configuration
    4 
    +  ObServe :: Services Runner
    5 5 
       %%
    6 6 
       Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 7 
       %%

  • services-topia/pom.xml
    ... ... @@ -117,10 +117,10 @@
    117 117 
           <groupId>org.nuiton.topia</groupId>
    118 118 
           <artifactId>topia-persistence</artifactId>
    119 119 
         </dependency>
    120 
    -    <!--dependency>
    120 
    +    <dependency>
    121 121 
           <groupId>org.nuiton.topia</groupId>
    122 122 
           <artifactId>topia-service-migration</artifactId>
    123 
    -    </dependency-->
    123 
    +    </dependency>
    124 124 
         <dependency>
    125 125 
           <groupId>${project.groupId}</groupId>
    126 126 
           <artifactId>topia-extension</artifactId>

  • services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import com.google.common.collect.ImmutableMap;
    4 26 
     import fr.ird.observe.services.dto.IdDto;
    5 27 
     import fr.ird.observe.services.dto.form.FormRequestDefinition;

  • services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import com.google.common.collect.ImmutableMap;
    4 26 
     import com.google.common.collect.ImmutableSet;
    5 27 
     import fr.ird.observe.common.constants.GearType;

  • services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import com.google.common.collect.ImmutableMap;
    4 26 
     import fr.ird.observe.services.dto.DataDto;
    5 27 
     import fr.ird.observe.services.dto.reference.ReferenceSetDefinition;

  • services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java
    ... ... @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson;
    2 2
    3 3 
     /*
    4 4 
      * #%L
    5 
    - * ObServe :: Services REST Implementation
    5 
    + * ObServe :: Services
    6 6 
      * %%
    7 7 
      * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 8 
      * %%

  • services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java
    ... ... @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson;
    2 2
    3 3 
     /*
    4 4 
      * #%L
    5 
    - * ObServe :: Services REST Implementation
    5 
    + * ObServe :: Services
    6 6 
      * %%
    7 7 
      * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 8 
      * %%

  • services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import fr.ird.observe.services.dto.IdDto;
    4 26 
     import fr.ird.observe.services.dto.referential.ReferentialDto;
    5 27 
     import org.junit.Assert;
    ... ... @@ -31,4 +53,4 @@ public class FormRequestDefinitionProviderTest {
    31 53
    32 54 
         }
    33 55
    34 
    -}
    \ No newline at end of file
    56 
    +}

  • services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import fr.ird.observe.services.dto.referential.ReferentialHelper;
    4 26 
     import org.junit.Assert;
    5 27 
     import org.junit.Test;
    ... ... @@ -20,4 +42,4 @@ public class ObserveDtoInitializerTest {
    20 42 
         public void testReferentialTypes() {
    21 43 
             Assert.assertEquals(ReferentialHelper.REFERENCE_DTOS.size(), ObserveDtoInitializer.INSTANCE.getReferentialTypes().size());
    22 44 
         }
    23 
    -}
    \ No newline at end of file
    45 
    +}

  • services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java
    1 1 
     package fr.ird.observe.services;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import fr.ird.observe.services.dto.DataDto;
    4 26 
     import fr.ird.observe.services.dto.referential.ReferentialDto;
    5 27 
     import org.junit.Assert;
    ... ... @@ -40,4 +62,4 @@ public class ReferenceSetDefinitionProviderTest {
    40 62
    41 63 
         }
    42 64
    43 
    -}
    \ No newline at end of file
    65 
    +}

    • —
    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.