From 99bdfd728e5838a21effff7c1d303b412bd2de4a Mon Sep 17 00:00:00 2001 From: "fabio.sinibaldi" Date: Thu, 7 Mar 2019 17:01:44 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-publishing/gCat-Feeder-Suite@178510 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../{crawlers => collectors}/dm/CKANRetriever.java | 2 +- .../{crawlers => collectors}/dm/CKANTransformer.java | 6 +++--- .../dm/DMAlgorithmsInfoCollector.java | 4 ++-- .../{crawlers => collectors}/dm/DataMinerCrawler.java | 6 +++--- .../{crawlers => collectors}/dm/model/CkanModel.java | 2 +- .../dm/model/InternalAlgorithmDescriptor.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/CKANRetriever.java (92%) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/CKANTransformer.java (74%) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/DMAlgorithmsInfoCollector.java (93%) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/DataMinerCrawler.java (86%) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/model/CkanModel.java (94%) rename DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/{crawlers => collectors}/dm/model/InternalAlgorithmDescriptor.java (84%) diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANRetriever.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANRetriever.java similarity index 92% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANRetriever.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANRetriever.java index 2c97198..95cd364 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANRetriever.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANRetriever.java @@ -1,4 +1,4 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm; +package org.gcube.data.publishing.gCatFeeder.collectors.dm; import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.data.publishing.gCatFeeder.model.CatalogueInstanceDescriptor; diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANTransformer.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANTransformer.java similarity index 74% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANTransformer.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANTransformer.java index 209cb53..5d8e902 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/CKANTransformer.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/CKANTransformer.java @@ -1,11 +1,11 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm; +package org.gcube.data.publishing.gCatFeeder.collectors.dm; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.gcube.data.publishing.gCatFeeder.crawlers.dm.model.CkanModel; -import org.gcube.data.publishing.gCatFeeder.crawlers.dm.model.InternalAlgorithmDescriptor; +import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.CkanModel; +import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.InternalAlgorithmDescriptor; import org.gcube.data.publishing.gCatFeeder.model.FormatData; import org.gcube.data.publishing.gCatfeeder.collectors.DataTransformer; diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DMAlgorithmsInfoCollector.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java similarity index 93% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DMAlgorithmsInfoCollector.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java index 67a360d..09153cc 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DMAlgorithmsInfoCollector.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java @@ -1,4 +1,4 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm; +package org.gcube.data.publishing.gCatFeeder.collectors.dm; import java.util.HashSet; import java.util.Set; @@ -9,7 +9,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorCategory; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; -import org.gcube.data.publishing.gCatFeeder.crawlers.dm.model.InternalAlgorithmDescriptor; +import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.InternalAlgorithmDescriptor; import org.gcube.data.publishing.gCatfeeder.collectors.DataCollector; import org.gcube.data.publishing.gCatfeeder.collectors.model.faults.CollectorFault; diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DataMinerCrawler.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DataMinerCrawler.java similarity index 86% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DataMinerCrawler.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DataMinerCrawler.java index 95c1e0b..3227837 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/DataMinerCrawler.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DataMinerCrawler.java @@ -1,10 +1,10 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm; +package org.gcube.data.publishing.gCatFeeder.collectors.dm; import java.util.Collections; import java.util.Set; -import org.gcube.data.publishing.gCatFeeder.crawlers.dm.model.CkanModel; -import org.gcube.data.publishing.gCatFeeder.crawlers.dm.model.InternalAlgorithmDescriptor; +import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.CkanModel; +import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.InternalAlgorithmDescriptor; import org.gcube.data.publishing.gCatFeeder.model.FormatData; import org.gcube.data.publishing.gCatfeeder.collectors.CatalogueRetriever; import org.gcube.data.publishing.gCatfeeder.collectors.CrawlerPlugin; diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/CkanModel.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/CkanModel.java similarity index 94% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/CkanModel.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/CkanModel.java index cbe4a4e..91323a5 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/CkanModel.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/CkanModel.java @@ -1,4 +1,4 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm.model; +package org.gcube.data.publishing.gCatFeeder.collectors.dm.model; import org.gcube.data.publishing.gCatFeeder.model.FormatData; import org.gcube.data.publishing.gCatfeeder.collectors.model.PublisherFormatData; diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/InternalAlgorithmDescriptor.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java similarity index 84% rename from DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/InternalAlgorithmDescriptor.java rename to DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java index 73404b7..d0b6d47 100644 --- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/crawlers/dm/model/InternalAlgorithmDescriptor.java +++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java @@ -1,4 +1,4 @@ -package org.gcube.data.publishing.gCatFeeder.crawlers.dm.model; +package org.gcube.data.publishing.gCatFeeder.collectors.dm.model; import java.util.List;