From e2c135bb90395c87c0f5745a85062bab0cf51f74 Mon Sep 17 00:00:00 2001 From: ebocher Date: Mon, 2 May 2022 16:48:47 +0200 Subject: [PATCH 1/2] Udapte GeoClimate - Use last H2GIS/H2 versions - Use last OrbisData - Remove log4j - Remove OSGI deps --- bdtopo_v2/pom.xml | 46 ++++---------- .../geoclimate/bdtopo_v2/BDTopo_V2.groovy | 2 +- .../bdtopo_v2/InputDataFormatting.groovy | 4 +- .../bdtopo_v2/InputDataLoading.groovy | 4 +- .../bdtopo_v2/WorkflowBDTopo_V2.groovy | 14 ++--- bdtopo_v2/src/main/resources/log4j2.xml | 13 ---- .../bdtopo_v2/InputDataFormattingTest.groovy | 2 +- .../bdtopo_v2/InputDataLoadingTest.groovy | 3 +- .../bdtopo_v2/WorkflowAbstractTest.groovy | 2 +- .../bdtopo_v2/WorkflowBDTopo_V2Test.groovy | 8 +-- geoclimate/pom.xml | 50 ++++------------ geoclimate/src/main/resources/log4j2.xml | 13 ---- geoindicators/pom.xml | 52 ++++------------ .../orbisgis/geoclimate/Geoindicators.groovy | 2 +- .../geoindicators/BlockIndicators.groovy | 4 +- .../geoindicators/BuildingIndicators.groovy | 4 +- .../geoclimate/geoindicators/DataUtils.groovy | 4 +- .../geoindicators/GenericIndicators.groovy | 6 +- .../geoindicators/RoadIndicators.groovy | 4 +- .../geoindicators/RsuIndicators.groovy | 5 +- .../geoindicators/SpatialUnits.groovy | 10 ++-- .../TypologyClassification.groovy | 6 +- .../WorkflowGeoIndicators.groovy | 4 +- geoindicators/src/main/resources/log4j2.xml | 13 ---- .../geoindicators/BlockIndicatorsTests.groovy | 2 +- .../BuildingIndicatorsTests.groovy | 4 +- .../geoindicators/DataUtilsTests.groovy | 2 +- .../GenericIndicatorsTests.groovy | 4 +- .../geoindicators/RsuIndicatorsTests.groovy | 2 +- .../geoindicators/SpatialUnitsTests.groovy | 4 +- .../geoindicators/TrafficFlowTests.groovy | 2 +- .../TypologyClassificationTests.groovy | 4 +- .../WorkflowGeoIndicatorsTest.groovy | 6 +- osm/pom.xml | 46 +++----------- .../geoclimate/osm/InputDataFormatting.groovy | 6 +- .../geoclimate/osm/InputDataLoading.groovy | 4 +- .../org/orbisgis/geoclimate/osm/OSM.groovy | 2 +- .../geoclimate/osm/WorkflowOSM.groovy | 10 ++-- osm/src/main/resources/log4j2.xml | 13 ---- .../osm/InputDataFormattingTest.groovy | 4 +- .../osm/InputDataLoadingTest.groovy | 4 +- .../geoclimate/osm/WorflowOSMTest.groovy | 6 +- .../osm/WorkflowAbstractTest.groovy | 2 +- osmtools/pom.xml | 56 ++++------------- .../geoclimate/osmtools/Loader.groovy | 2 +- .../geoclimate/osmtools/OSMTools.groovy | 2 +- .../geoclimate/osmtools/Transform.groovy | 2 +- .../osmtools/utils/TransformUtils.groovy | 2 +- .../osmtools/utils/Utilities.groovy | 2 +- osmtools/src/main/resources/log4j2.xml | 13 ---- .../osmtools/AbstractOSMTest.groovy | 4 +- .../geoclimate/osmtools/LoaderTest.groovy | 2 +- .../geoclimate/osmtools/TransformTest.groovy | 4 +- pom.xml | 60 +++++++------------ worldpoptools/pom.xml | 38 +++--------- .../worldpoptools/WorldPopExtract.groovy | 4 +- .../worldpoptools/WorldPopTools.groovy | 2 +- .../worldpoptools/WorldPopExtractTest.groovy | 6 +- 58 files changed, 174 insertions(+), 427 deletions(-) delete mode 100644 bdtopo_v2/src/main/resources/log4j2.xml delete mode 100644 geoclimate/src/main/resources/log4j2.xml delete mode 100644 geoindicators/src/main/resources/log4j2.xml delete mode 100644 osm/src/main/resources/log4j2.xml delete mode 100644 osmtools/src/main/resources/log4j2.xml diff --git a/bdtopo_v2/pom.xml b/bdtopo_v2/pom.xml index eea2a9ae81..d0fd021bb6 100644 --- a/bdtopo_v2/pom.xml +++ b/bdtopo_v2/pom.xml @@ -25,34 +25,20 @@ groovy-json - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.orbisgis.data + h2gis - org.orbisgis.orbisdata.processmanager + org.orbisgis.data + postgis + + + org.orbisgis process - - - org.slf4j - slf4j-simple - - - org.orbisgis.orbisdata.datamanager + org.orbisgis.data dataframe - - - org.slf4j - slf4j-simple - - org.orbisgis.geoclimate @@ -67,16 +53,8 @@ slf4j-api - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-simple @@ -115,10 +93,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy index 21f872b1c4..0350451418 100644 --- a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy +++ b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/BDTopo_V2.groovy @@ -1,6 +1,6 @@ package org.orbisgis.geoclimate.bdtopo_v2 -import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory +import org.orbisgis.process.GroovyProcessFactory import org.slf4j.LoggerFactory diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy index 1350947ccb..a9ce3a4edc 100644 --- a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy +++ b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormatting.groovy @@ -1,8 +1,8 @@ package org.orbisgis.geoclimate.bdtopo_v2 import groovy.transform.BaseScript -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.process.api.IProcess @BaseScript BDTopo_V2 BDTopo_V2 diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy index 66d2989311..f022fe32c9 100644 --- a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy +++ b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoading.groovy @@ -2,8 +2,8 @@ package org.orbisgis.geoclimate.bdtopo_v2 import groovy.transform.BaseScript -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.process.api.IProcess @BaseScript BDTopo_V2 BDTopo_V2 diff --git a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy index 17522cb73c..4226625fa5 100644 --- a/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy +++ b/bdtopo_v2/src/main/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2.groovy @@ -3,15 +3,15 @@ package org.orbisgis.geoclimate.bdtopo_v2 import groovy.json.JsonSlurper import groovy.transform.BaseScript import org.h2.tools.DeleteDbFiles -import org.h2gis.postgis_jts_osgi.DataSourceFactoryImpl +import org.h2gis.postgis_jts.PostGISDBFactory import org.h2gis.utilities.FileUtilities import org.h2gis.utilities.GeometryTableUtilities import org.h2gis.utilities.JDBCUtilities -import org.orbisgis.orbisdata.datamanager.api.dataset.ITable -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.api.dataset.ITable +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.data.H2GIS +import org.orbisgis.data.POSTGIS +import org.orbisgis.process.api.IProcess import org.orbisgis.geoclimate.Geoindicators import org.h2gis.functions.io.utility.IOMethods import org.osgi.service.jdbc.DataSourceFactory @@ -840,7 +840,7 @@ def loadDataFromDatasource(def input_database_properties, def code, def distance error "The commune table must be specified to run Geoclimate" return } - DataSourceFactory dataSourceFactory = new DataSourceFactoryImpl(); + PostGISDBFactory dataSourceFactory = new PostGISDBFactory(); Connection sourceConnection = null; try { Properties props = new Properties(); diff --git a/bdtopo_v2/src/main/resources/log4j2.xml b/bdtopo_v2/src/main/resources/log4j2.xml deleted file mode 100644 index 54acef2397..0000000000 --- a/bdtopo_v2/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy index cf1a9c9054..82c32a4cdb 100644 --- a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy +++ b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataFormattingTest.groovy @@ -2,7 +2,7 @@ package org.orbisgis.geoclimate.bdtopo_v2 import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS +import org.orbisgis.data.H2GIS import static org.junit.jupiter.api.Assertions.* diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy index 133c83151e..5907ddc1cb 100644 --- a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy +++ b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/InputDataLoadingTest.groovy @@ -1,8 +1,7 @@ package org.orbisgis.geoclimate.bdtopo_v2 import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInfo -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS +import org.orbisgis.data.H2GIS import static org.junit.jupiter.api.Assertions.* diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy index 941f67cb19..0ae781941f 100644 --- a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy +++ b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowAbstractTest.groovy @@ -1,7 +1,7 @@ package org.orbisgis.geoclimate.bdtopo_v2 -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.process.api.IProcess import org.orbisgis.geoclimate.Geoindicators import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy index 923bf5c735..fd0cadaff6 100644 --- a/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy +++ b/bdtopo_v2/src/test/groovy/org/orbisgis/geoclimate/bdtopo_v2/WorkflowBDTopo_V2Test.groovy @@ -10,10 +10,10 @@ import org.junit.jupiter.api.condition.EnabledIfSystemProperty import org.locationtech.jts.geom.Envelope import org.locationtech.jts.geom.Geometry import org.locationtech.jts.io.WKTReader -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.data.H2GIS +import org.orbisgis.data.POSTGIS +import org.orbisgis.process.api.IProcess import org.orbisgis.geoclimate.Geoindicators import static org.junit.jupiter.api.Assertions.* diff --git a/geoclimate/pom.xml b/geoclimate/pom.xml index 3a566b0287..9f300ca376 100644 --- a/geoclimate/pom.xml +++ b/geoclimate/pom.xml @@ -37,10 +37,6 @@ org.orbisgis postgis-jts - - org.orbisgis - postgis-jts-osgi - org.orbisgis cts @@ -74,46 +70,28 @@ picocli - org.apache.logging.log4j - log4j-slf4j-impl + org.orbisgis.data + h2gis - org.apache.logging.log4j - log4j-api + org.orbisgis + process - org.apache.logging.log4j - log4j-core + org.orbisgis.geoclimate + osmtools - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.slf4j + slf4j-api - org.orbisgis.orbisdata.processmanager - process - - - org.slf4j - slf4j-simple - - + org.slf4j + slf4j-api - org.orbisgis.geoclimate - osmtools - - - org.slf4j - slf4j-simple - - + org.slf4j + slf4j-simple @@ -152,10 +130,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/geoclimate/src/main/resources/log4j2.xml b/geoclimate/src/main/resources/log4j2.xml deleted file mode 100644 index 54acef2397..0000000000 --- a/geoclimate/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/geoindicators/pom.xml b/geoindicators/pom.xml index 20fecf4167..320c63e8cf 100644 --- a/geoindicators/pom.xml +++ b/geoindicators/pom.xml @@ -29,48 +29,24 @@ groovy - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.orbisgis.data + h2gis - org.orbisgis.orbisdata.datamanager - api + org.orbisgis.data + postgis - org.orbisgis.orbisdata.processmanager + org.orbisgis process - - - org.slf4j - slf4j-simple - - - org.orbisgis.orbisdata.datamanager + org.orbisgis.data dataframe - - - org.slf4j - slf4j-simple - - org.orbisgis h2gis-network - - - org.slf4j - slf4j-simple - - com.github.haifengl @@ -88,16 +64,12 @@ ${smile-version} - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api + org.slf4j + slf4j-api - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-simple org.codehaus.groovy @@ -141,10 +113,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy index 4f0eef2315..06ad785d1a 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/Geoindicators.groovy @@ -9,7 +9,7 @@ import org.orbisgis.geoclimate.geoindicators.RsuIndicators import org.orbisgis.geoclimate.geoindicators.SpatialUnits import org.orbisgis.geoclimate.geoindicators.TypologyClassification import org.orbisgis.geoclimate.geoindicators.WorkflowGeoIndicators -import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory +import org.orbisgis.process.GroovyProcessFactory import org.slf4j.LoggerFactory abstract class Geoindicators extends GroovyProcessFactory { diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy index 6276f71019..16cb3a7343 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicators.groovy @@ -2,8 +2,8 @@ package org.orbisgis.geoclimate.geoindicators import groovy.transform.BaseScript import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.* -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicators.groovy index 48207579a8..611dfadfdf 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicators.groovy @@ -2,8 +2,8 @@ package org.orbisgis.geoclimate.geoindicators import groovy.transform.BaseScript import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.* -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/DataUtils.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/DataUtils.groovy index 78168423ac..53397bfa6e 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/DataUtils.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/DataUtils.groovy @@ -2,8 +2,8 @@ package org.orbisgis.geoclimate.geoindicators import groovy.transform.BaseScript import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.* -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy index e3fb139d6d..fb7afbbeb5 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy @@ -2,9 +2,9 @@ package org.orbisgis.geoclimate.geoindicators import groovy.transform.BaseScript import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.api.dataset.ISpatialTable -import org.orbisgis.orbisdata.datamanager.jdbc.* -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.api.dataset.ISpatialTable +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RoadIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RoadIndicators.groovy index 79883f4f69..5ccdeea10a 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RoadIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RoadIndicators.groovy @@ -4,8 +4,8 @@ import groovy.json.JsonSlurper import groovy.transform.BaseScript import org.locationtech.jts.geom.Geometry import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy index 1f33699cf5..207fe7a083 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy @@ -2,9 +2,8 @@ package org.orbisgis.geoclimate.geoindicators import groovy.transform.BaseScript import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.* -import org.orbisgis.orbisdata.processmanager.api.IProcess - +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess import static java.lang.Math.* diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnits.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnits.groovy index e22fd47993..5e303d49c8 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnits.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnits.groovy @@ -5,11 +5,11 @@ import org.h2.value.ValueGeometry import org.h2gis.functions.spatial.create.ST_MakeGrid import org.locationtech.jts.geom.Geometry import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.api.dataset.ISpatialTable -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.api.dataset.ISpatialTable +import org.orbisgis.data.H2GIS +import org.orbisgis.data.POSTGIS +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess import java.sql.Connection import java.sql.PreparedStatement diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassification.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassification.groovy index f77190ce1d..9268ef4006 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassification.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassification.groovy @@ -6,9 +6,9 @@ import com.thoughtworks.xstream.io.xml.StaxDriver import groovy.transform.BaseScript import org.h2gis.utilities.TableLocation import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.dataframe.DataFrame -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.dataframe.DataFrame +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess import smile.base.cart.SplitRule import smile.classification.RandomForest as RandomForestClassification import smile.data.type.DataType diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy index e25969e891..e2ce879a72 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy +++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy @@ -4,8 +4,8 @@ import groovy.transform.BaseScript import org.apache.commons.io.FileUtils import org.apache.commons.io.FilenameUtils import org.locationtech.jts.geom.Envelope -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.* +import org.orbisgis.process.api.IProcess import org.orbisgis.geoclimate.Geoindicators @BaseScript Geoindicators geoindicators diff --git a/geoindicators/src/main/resources/log4j2.xml b/geoindicators/src/main/resources/log4j2.xml deleted file mode 100644 index 54acef2397..0000000000 --- a/geoindicators/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicatorsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicatorsTests.groovy index 425ddfa36f..540c7e28f9 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicatorsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BlockIndicatorsTests.groovy @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators import static org.junit.jupiter.api.Assertions.assertEquals -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class BlockIndicatorsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicatorsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicatorsTests.groovy index 636aa0c6cd..8f55d1e2ad 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicatorsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/BuildingIndicatorsTests.groovy @@ -4,11 +4,11 @@ import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.process.api.IProcess import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertTrue -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class BuildingIndicatorsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/DataUtilsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/DataUtilsTests.groovy index 5accfc2b12..78d9731475 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/DataUtilsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/DataUtilsTests.groovy @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class DataUtilsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicatorsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicatorsTests.groovy index cb2d5a7e20..cf49c356da 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicatorsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicatorsTests.groovy @@ -5,13 +5,13 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.api.dataset.ISpatialTable +import org.orbisgis.data.api.dataset.ISpatialTable import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertFalse import static org.junit.jupiter.api.Assertions.assertNotNull import static org.junit.jupiter.api.Assertions.assertTrue -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class GenericIndicatorsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicatorsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicatorsTests.groovy index 14335052f8..f8b6d22d85 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicatorsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicatorsTests.groovy @@ -8,7 +8,7 @@ import org.orbisgis.geoclimate.Geoindicators import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertNotNull import static org.junit.jupiter.api.Assertions.assertTrue -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class RsuIndicatorsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnitsTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnitsTests.groovy index ae7d8ebcab..c13d154833 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnitsTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/SpatialUnitsTests.groovy @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.EnabledIfSystemProperty import org.locationtech.jts.io.WKTReader import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS +import org.orbisgis.data.POSTGIS import static org.junit.jupiter.api.Assertions.assertEquals -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class SpatialUnitsTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TrafficFlowTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TrafficFlowTests.groovy index 73c38575e3..4b411a2eef 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TrafficFlowTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TrafficFlowTests.groovy @@ -6,7 +6,7 @@ import org.orbisgis.geoclimate.Geoindicators import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertTrue -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class TrafficFlowTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassificationTests.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassificationTests.groovy index 6168018469..4069039950 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassificationTests.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/TypologyClassificationTests.groovy @@ -6,7 +6,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.dataframe.DataFrame +import org.orbisgis.data.dataframe.DataFrame import smile.classification.DataFrameClassifier import smile.validation.Accuracy import smile.validation.Validation @@ -14,7 +14,7 @@ import java.util.zip.GZIPInputStream import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.fail -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class TypologyClassificationTests { diff --git a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy index 6a7eb7e6ef..d04fa8a6ce 100644 --- a/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy +++ b/geoindicators/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy @@ -3,9 +3,9 @@ package org.orbisgis.geoclimate.geoindicators import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.dataframe.DataFrame -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.dataframe.DataFrame +import org.orbisgis.data.H2GIS +import org.orbisgis.process.api.IProcess import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osm/pom.xml b/osm/pom.xml index 0765d125cd..cac05078c8 100644 --- a/osm/pom.xml +++ b/osm/pom.xml @@ -21,22 +21,10 @@ org.orbisgis.geoclimate worldpoptools - - - org.slf4j - slf4j-simple - - org.orbisgis.geoclimate osmtools - - - org.slf4j - slf4j-simple - - org.codehaus.groovy @@ -47,24 +35,16 @@ groovy-json - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.orbisgis.data + h2gis - org.orbisgis.orbisdata.processmanager + org.orbisgis.data + postgis + + + org.orbisgis process - - - org.slf4j - slf4j-simple - - org.orbisgis.geoclimate @@ -76,16 +56,8 @@ slf4j-api - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-simple diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy index 4f4bba9f58..1d3ed19dea 100644 --- a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy +++ b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy @@ -4,9 +4,9 @@ import groovy.json.JsonSlurper import groovy.transform.BaseScript import org.locationtech.jts.geom.Geometry import org.locationtech.jts.geom.Polygon -import org.orbisgis.orbisdata.datamanager.api.dataset.ISpatialTable -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.api.dataset.ISpatialTable +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.process.api.IProcess import java.util.regex.Pattern diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy index 3c890a673b..ac12726f13 100644 --- a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy +++ b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy @@ -7,8 +7,8 @@ import org.locationtech.jts.geom.MultiPolygon import org.locationtech.jts.geom.Polygon import org.orbisgis.geoclimate.osmtools.OSMTools import org.orbisgis.geoclimate.osmtools.utils.Utilities -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.process.api.IProcess import org.h2gis.utilities.GeographyUtilities import org.h2gis.functions.spatial.crs.ST_Transform import org.orbisgis.geoclimate.osmtools.utils.OSMElement diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy index 4c8251f1ba..1a310d566e 100644 --- a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy +++ b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy @@ -1,6 +1,6 @@ package org.orbisgis.geoclimate.osm -import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory +import org.orbisgis.process.GroovyProcessFactory import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy index 75544f60f1..fe2319f9d1 100644 --- a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy +++ b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy @@ -14,11 +14,11 @@ import org.locationtech.jts.geom.Polygon import org.orbisgis.geoclimate.osmtools.utils.Utilities import org.orbisgis.geoclimate.osmtools.utils.OSMElement import org.orbisgis.geoclimate.worldpoptools.WorldPopTools -import org.orbisgis.orbisdata.datamanager.api.dataset.ITable -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.api.dataset.ITable +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.data.H2GIS +import org.orbisgis.data.POSTGIS +import org.orbisgis.process.api.IProcess import org.orbisgis.geoclimate.osmtools.OSMTools import org.h2gis.functions.io.utility.PRJUtil; diff --git a/osm/src/main/resources/log4j2.xml b/osm/src/main/resources/log4j2.xml deleted file mode 100644 index 54acef2397..0000000000 --- a/osm/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy index 6318fcd501..75e4dd6aed 100644 --- a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy +++ b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInfo import org.orbisgis.geoclimate.Geoindicators import org.orbisgis.geoclimate.osmtools.utils.Utilities -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.H2GIS +import org.orbisgis.process.api.IProcess import java.util.regex.Pattern diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy index acb8bd719f..0adffbc942 100644 --- a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy +++ b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy @@ -3,8 +3,8 @@ package org.orbisgis.geoclimate.osm import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.H2GIS +import org.orbisgis.process.api.IProcess import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy index 4562487c4e..8c77cfa5d9 100644 --- a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy +++ b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.datamanager.jdbc.postgis.POSTGIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.H2GIS +import org.orbisgis.data.POSTGIS +import org.orbisgis.process.api.IProcess import static org.junit.jupiter.api.Assertions.* diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy index 80a588c29e..33108b2918 100644 --- a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy +++ b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy @@ -1,7 +1,7 @@ package org.orbisgis.geoclimate.osm import org.orbisgis.geoclimate.Geoindicators -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.process.api.IProcess import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osmtools/pom.xml b/osmtools/pom.xml index 5d11a91762..f9b99d39e4 100644 --- a/osmtools/pom.xml +++ b/osmtools/pom.xml @@ -23,64 +23,32 @@ groovy - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.orbisgis.data + h2gis - org.orbisgis.orbisdata.datamanager - api - - - org.orbisgis.orbisdata.processmanager + org.orbisgis process - - - org.slf4j - slf4j-simple - - - org.orbisgis.orbisdata.datamanager + org.orbisgis.data dataframe - - - org.slf4j - slf4j-simple - - org.orbisgis h2gis-network - - - org.slf4j - slf4j-simple - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-api + org.codehaus.groovy + groovy-json - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-api - org.codehaus.groovy - groovy-json + org.slf4j + slf4j-simple @@ -120,10 +88,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Loader.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Loader.groovy index 3809464a7d..86d529f694 100644 --- a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Loader.groovy +++ b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Loader.groovy @@ -43,7 +43,7 @@ import org.locationtech.jts.geom.Envelope import org.locationtech.jts.geom.GeometryFactory import org.locationtech.jts.geom.Polygon import org.orbisgis.geoclimate.osmtools.utils.Utilities -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource +import org.orbisgis.data.jdbc.JdbcDataSource import java.util.regex.Pattern diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy index bd0702d133..8e00c1e861 100644 --- a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy +++ b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy @@ -36,7 +36,7 @@ */ package org.orbisgis.geoclimate.osmtools -import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory +import org.orbisgis.process.GroovyProcessFactory import org.orbisgis.geoclimate.osmtools.Loader as LOADER import org.orbisgis.geoclimate.osmtools.Transform as TRANSFORM import org.orbisgis.geoclimate.osmtools.utils.Utilities as UTILITIES diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Transform.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Transform.groovy index b0af1ad66c..33465ed6a6 100644 --- a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Transform.groovy +++ b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/Transform.groovy @@ -37,7 +37,7 @@ package org.orbisgis.geoclimate.osmtools import groovy.transform.BaseScript -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource +import org.orbisgis.data.jdbc.JdbcDataSource import static org.orbisgis.geoclimate.osmtools.utils.TransformUtils.* import static org.orbisgis.geoclimate.osmtools.utils.TransformUtils.Types.* diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtils.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtils.groovy index 7394883503..c65d0b12a0 100644 --- a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtils.groovy +++ b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtils.groovy @@ -73,7 +73,7 @@ package org.orbisgis.geoclimate.osmtools.utils import org.orbisgis.geoclimate.osmtools.OSMTools -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource +import org.orbisgis.data.jdbc.JdbcDataSource import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy index 2acb8a912c..0c79743ec5 100644 --- a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy +++ b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy @@ -39,7 +39,7 @@ package org.orbisgis.geoclimate.osmtools.utils import groovy.json.JsonSlurper import org.cts.util.UTMUtils import org.locationtech.jts.geom.* -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource +import org.orbisgis.data.jdbc.JdbcDataSource import org.slf4j.LoggerFactory import static java.nio.charset.StandardCharsets.UTF_8 diff --git a/osmtools/src/main/resources/log4j2.xml b/osmtools/src/main/resources/log4j2.xml deleted file mode 100644 index d35dfb55d0..0000000000 --- a/osmtools/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/AbstractOSMTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/AbstractOSMTest.groovy index ae4990fd3e..bc3d7434d3 100644 --- a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/AbstractOSMTest.groovy +++ b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/AbstractOSMTest.groovy @@ -40,8 +40,8 @@ import org.locationtech.jts.geom.Coordinate import org.locationtech.jts.geom.GeometryFactory import org.locationtech.jts.io.WKTReader import org.orbisgis.geoclimate.osmtools.utils.Utilities -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.data.H2GIS import org.orbisgis.geoclimate.osmtools.OSMTools as Tools import static org.junit.jupiter.api.Assertions.assertEquals diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy index c4207de23c..0b96a6f116 100644 --- a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy +++ b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy @@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInfo import org.locationtech.jts.geom.Coordinate import org.locationtech.jts.geom.GeometryFactory -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS +import org.orbisgis.data.H2GIS import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy index f18f08e417..e260e60e21 100644 --- a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy +++ b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy @@ -38,8 +38,8 @@ package org.orbisgis.geoclimate.osmtools import org.junit.jupiter.api.* import org.locationtech.jts.geom.* -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.H2GIS +import org.orbisgis.process.api.IProcess import org.slf4j.Logger import org.slf4j.LoggerFactory import org.orbisgis.geoclimate.osmtools.utils.OSMElement diff --git a/pom.xml b/pom.xml index d319cfe983..2503b4e3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.orbisgis orbisparent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT org.orbisgis.geoclimate geoclimate-parent @@ -26,12 +26,12 @@ YYYY-MM-dd ${maven.build.timestamp} ${project.basedir} - 2.15.0 - 2.0.0-SNAPSHOT - 2.1.210 - 1.2.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.0.1-SNAPSHOT + 2.1.0-SNAPSHOT + 2.1.212 + 1.2.1-SNAPSHOT + 1.6.0 + 2.0.0-SNAPSHOT + 1.7.36 @@ -97,38 +97,33 @@ postgis-jts ${h2gis-version} - - org.orbisgis - postgis-jts-osgi - ${h2gis-version} - org.orbisgis cts ${cts-version} - org.orbisgis.orbisdata.datamanager - api + org.orbisgis.data + data-api ${orbisdata-version} - org.orbisgis.orbisdata.datamanager - jdbc + org.orbisgis.data + h2gis ${orbisdata-version} - org.orbisgis.orbisdata.processmanager - api + org.orbisgis.data + postgis ${orbisdata-version} - org.orbisgis.orbisdata.processmanager + org.orbisgis process ${orbisdata-version} - org.orbisgis.orbisdata.datamanager + org.orbisgis.data dataframe ${orbisdata-version} @@ -163,19 +158,14 @@ ${project.version} - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j-version} + org.slf4j + slf4j-api + ${slf4j-version} - org.apache.logging.log4j - log4j-api - ${log4j-version} - - - org.apache.logging.log4j - log4j-core - ${log4j-version} + org.slf4j + slf4j-simple + ${slf4j-version} @@ -207,10 +197,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin @@ -266,10 +252,6 @@ org.apache.maven.plugins maven-surefire-report-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/worldpoptools/pom.xml b/worldpoptools/pom.xml index ca9451ee50..8a21800ead 100644 --- a/worldpoptools/pom.xml +++ b/worldpoptools/pom.xml @@ -23,40 +23,24 @@ groovy - org.orbisgis.orbisdata.datamanager - jdbc - - - org.slf4j - slf4j-simple - - + org.orbisgis.data + h2gis - org.orbisgis.orbisdata.datamanager - api + org.orbisgis.data + data-api - org.orbisgis.orbisdata.processmanager + org.orbisgis process - - - org.slf4j - slf4j-simple - - - org.apache.logging.log4j - log4j-slf4j-impl + org.slf4j + slf4j-api - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core + org.slf4j + slf4j-simple @@ -96,10 +80,6 @@ org.apache.maven.plugins maven-resources-plugin - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtract.groovy b/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtract.groovy index 58a2ed9a84..e03d60ec68 100644 --- a/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtract.groovy +++ b/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtract.groovy @@ -41,8 +41,8 @@ import org.cts.util.UTMUtils import org.h2gis.api.EmptyProgressVisitor import org.h2gis.functions.io.asc.AscReaderDriver import org.h2gis.utilities.FileUtilities -import org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.jdbc.JdbcDataSource +import org.orbisgis.process.api.IProcess @BaseScript WorldPopTools pf diff --git a/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopTools.groovy b/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopTools.groovy index 98f96e77ee..c5364cc5cf 100644 --- a/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopTools.groovy +++ b/worldpoptools/src/main/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopTools.groovy @@ -37,7 +37,7 @@ package org.orbisgis.geoclimate.worldpoptools -import org.orbisgis.orbisdata.processmanager.process.GroovyProcessFactory +import org.orbisgis.process.GroovyProcessFactory import org.slf4j.LoggerFactory /** diff --git a/worldpoptools/src/test/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtractTest.groovy b/worldpoptools/src/test/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtractTest.groovy index c65ccb569d..a692c0e4f9 100644 --- a/worldpoptools/src/test/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtractTest.groovy +++ b/worldpoptools/src/test/groovy/org/orbisgis/geoclimate/worldpoptools/WorldPopExtractTest.groovy @@ -7,14 +7,14 @@ import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInfo -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS -import org.orbisgis.orbisdata.processmanager.api.IProcess +import org.orbisgis.data.H2GIS +import org.orbisgis.process.api.IProcess import org.slf4j.Logger import org.slf4j.LoggerFactory import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertTrue -import static org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS.open +import static org.orbisgis.data.H2GIS.open class WorldPopExtractTest { From f408dcdb466ad8f860eea9abd7b735fe06c91b5f Mon Sep 17 00:00:00 2001 From: ebocher Date: Mon, 2 May 2022 17:27:05 +0200 Subject: [PATCH 2/2] Fix package --- .../geoclimate/osmtools/utils/TransformUtilsTest.groovy | 2 +- .../orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy index 7663e40eca..e8d574c31b 100644 --- a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy +++ b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy @@ -45,7 +45,7 @@ import org.locationtech.jts.geom.LineString import org.locationtech.jts.geom.MultiLineString import org.locationtech.jts.geom.Polygon import org.orbisgis.geoclimate.osmtools.AbstractOSMTest -import org.orbisgis.orbisdata.datamanager.jdbc.h2gis.H2GIS +import org.orbisgis.data.H2GIS import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy index fde040de5b..c2a29a708a 100644 --- a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy +++ b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy @@ -498,7 +498,7 @@ class UtilitiesTest extends AbstractOSMTest { } /** - * Test the {@link org.orbisgis.geoclimate.osmtools.utils.Utilities#dropOSMTables(java.lang.String, org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource)} + * Test the {@link org.orbisgis.geoclimate.osmtools.utils.Utilities#dropOSMTables(java.lang.String, org.orbisgis.data.jdbc.JdbcDataSource)} * method. */ @Test @@ -531,7 +531,7 @@ class UtilitiesTest extends AbstractOSMTest { } /** - * Test the {@link org.orbisgis.geoclimate.osmtools.utils.Utilities#dropOSMTables(java.lang.String, org.orbisgis.orbisdata.datamanager.jdbc.JdbcDataSource)} + * Test the {@link org.orbisgis.geoclimate.osmtools.utils.Utilities#dropOSMTables(java.lang.String, org.orbisgis.data.jdbc.JdbcDataSource)} * method with bad data. */ @Test