From ec0b82631337afd72ae47735c9148bb3f6244562 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 6 Dec 2022 15:15:02 +0100 Subject: [PATCH 1/6] Fixes #24235 --- CHANGELOG.md | 3 ++ ckan-plugin/CHANGELOG.md | 3 ++ ckan-plugin/pom.xml | 4 +- cms-plugin-framework/CHANGELOG.md | 3 ++ cms-plugin-framework/pom.xml | 4 +- .../SimpleLifeCycleManager.java | 1 + cms-test-commons/CHANGELOG.md | 3 ++ cms-test-commons/pom.xml | 4 +- concessioni-lifecycle/CHANGELOG.md | 3 ++ concessioni-lifecycle/pom.xml | 4 +- concessioni-model/CHANGELOG.md | 3 ++ concessioni-model/pom.xml | 4 +- dataminer-plugins/CHANGELOG.md | 3 ++ dataminer-plugins/pom.xml | 4 +- geoportal-client/CHANGELOG.md | 3 ++ geoportal-client/pom.xml | 4 +- geoportal-common/CHANGELOG.md | 3 ++ geoportal-common/pom.xml | 4 +- .../common/utils/tests/GCubeTest.java | 4 +- geoportal-service/CHANGELOG.md | 3 ++ geoportal-service/pom.xml | 4 +- images-plugin/CHANGELOG.md | 3 ++ images-plugin/pom.xml | 4 +- notifications-plugins/CHANGELOG.md | 3 ++ notifications-plugins/pom.xml | 4 +- pom.xml | 24 ++++----- sdi-plugins/CHANGELOG.md | 3 ++ sdi-plugins/pom.xml | 4 +- use-cases/CHANGELOG.md | 3 ++ use-cases/pom.xml | 4 +- .../usecases/ExportConcessioniAsProjects.java | 4 +- .../cms/usecases/PublishSubmitted.java | 49 +++++++++++++++++++ 32 files changed, 135 insertions(+), 41 deletions(-) create mode 100644 use-cases/src/test/java/org/gcube/application/cms/usecases/PublishSubmitted.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cfa5f7..9d13e27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.spatial.data.gcube-sdi-suite +## [v1.0.3-SNAPSHOT] - 2022-12-07 +- Updated plugin framework + ## [v1.0.2] - 2021-02-24 -Introduced module sdi-plugins -Introduced module notifications-plugins diff --git a/ckan-plugin/CHANGELOG.md b/ckan-plugin/CHANGELOG.md index a15bf25..68803b9 100644 --- a/ckan-plugin/CHANGELOG.md +++ b/ckan-plugin/CHANGELOG.md @@ -4,5 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for ckan materializations +## [v1.0.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.0] - 2022-02-24 - First release diff --git a/ckan-plugin/pom.xml b/ckan-plugin/pom.xml index dce9b2a..63ee359 100644 --- a/ckan-plugin/pom.xml +++ b/ckan-plugin/pom.xml @@ -5,14 +5,14 @@ 4.0.0 ckan-plugins - 1.0.0 + 1.0.1-SNAPSHOT gCube CMS - CKAN Plugins org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/cms-plugin-framework/CHANGELOG.md b/cms-plugin-framework/CHANGELOG.md index 09183da..e22e0fc 100644 --- a/cms-plugin-framework/CHANGELOG.md +++ b/cms-plugin-framework/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.cms-plugin-framework +## [v1.0.2-SNAPSHOT] 2022-01-17 +- Fixes #2435 + ## [v1.0.1] 2022-01-17 - Serialization Features diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml index 03e6f12..4382e13 100644 --- a/cms-plugin-framework/pom.xml +++ b/cms-plugin-framework/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 cms-plugin-framework - 1.0.1 + 1.0.2-SNAPSHOT org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index 2409646..0b3d816 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -228,6 +228,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements new MaterializationRequest(request.getUseCaseDescriptor(),request.getCaller(), request.getContext(), request.getDocument()); Document params = new Document(); + params.putAll(parameters); String workspace = request.getUseCaseDescriptor().getId() + request.getContext().getId(); params.put("workspace", Files.fixFilename(workspace)); diff --git a/cms-test-commons/CHANGELOG.md b/cms-test-commons/CHANGELOG.md index 037b2c9..785e863 100644 --- a/cms-test-commons/CHANGELOG.md +++ b/cms-test-commons/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.cms.cms-test-commons +## [v1.0.3-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.2] - 2022-01-17 - Profiles diff --git a/cms-test-commons/pom.xml b/cms-test-commons/pom.xml index a02c5e6..9611845 100644 --- a/cms-test-commons/pom.xml +++ b/cms-test-commons/pom.xml @@ -5,14 +5,14 @@ 4.0.0 cms-test-commons - 1.0.2 + 1.0.3-SNAPSHOT CMS Test Commons org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index dc8a4a6..e0df8df 100644 --- a/concessioni-lifecycle/CHANGELOG.md +++ b/concessioni-lifecycle/CHANGELOG.md @@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains custom extensions for the support of GNA "concessioni" use case +## [v1.0.2-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.1] - 2022-01-17 - Serialization adaptation diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index 9efedb7..72c842c 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 concessioni-lifecycle - 1.0.1 + 1.0.2-SNAPSHOT GNA Concessioni Lifecycle org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/concessioni-model/CHANGELOG.md b/concessioni-model/CHANGELOG.md index 3e4560b..f98c052 100644 --- a/concessioni-model/CHANGELOG.md +++ b/concessioni-model/CHANGELOG.md @@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains custom BEANS for the support of GNA "concessioni" use case +## [v1.0.2-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.1] - 2022-01-17 - Defaults Evaluation diff --git a/concessioni-model/pom.xml b/concessioni-model/pom.xml index f93c7e4..b3b375e 100644 --- a/concessioni-model/pom.xml +++ b/concessioni-model/pom.xml @@ -6,14 +6,14 @@ org.gcube.application.cms concessioni-model - 1.0.1 + 1.0.2-SNAPSHOT GNA Concessioni Model org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/dataminer-plugins/CHANGELOG.md b/dataminer-plugins/CHANGELOG.md index e3f2d83..bb5b37e 100644 --- a/dataminer-plugins/CHANGELOG.md +++ b/dataminer-plugins/CHANGELOG.md @@ -4,5 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for processing via gCube Dataminer +## [v1.0.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.0] - 2022-02-24 - First release diff --git a/dataminer-plugins/pom.xml b/dataminer-plugins/pom.xml index aa7c047..1b075f4 100644 --- a/dataminer-plugins/pom.xml +++ b/dataminer-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 dataminer-plugins - 1.0.0 + 1.0.1-SNAPSHOT gCube CMS - Dataminer Plugins org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index c24c1c7..4f6c857 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-client +## [v1.1.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.1.0] - 2022-02-01 diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index 46a932d..4fcefeb 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,14 +4,14 @@ 4.0.0 org.gcube.application geoportal-client - 1.1.0 + 1.1.1-SNAPSHOT Geoportal Client org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/geoportal-common/CHANGELOG.md b/geoportal-common/CHANGELOG.md index a1c9125..cc0c5e9 100644 --- a/geoportal-common/CHANGELOG.md +++ b/geoportal-common/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-common +## [v1.0.10-SNAPSHOT] - 2022-12-07 +- Pom updates + # [v1.0.9] - 2022-01-17 - Minor fixes in model - Schema and jsonPath support diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml index f80f92f..fe35ffa 100644 --- a/geoportal-common/pom.xml +++ b/geoportal-common/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 geoportal-common - 1.0.9 + 1.0.10-SNAPSHOT Geoportal Common org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index 87ed751..e8ce6e7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -14,8 +14,10 @@ public class GCubeTest { // InterfaceConstants.SERVICE_CLASS="Application"; // InterfaceConstants.SERVICE_NAME="GeoPortal"; + testContext = "/pred4s/preprod/preVRE"; - // testContext= "/gcube/devsec/devVRE"; + // testContext = "/d4science.research-infrastructures.eu/D4OS/GNA"; + testContext= "/gcube/devsec/devVRE"; System.out.println("TEST CONTEXT = "+testContext); return testContext; diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index ae1221b..4fa1191 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-service +## [v1.0.11-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.10] 2022-01-17 - Plugin Management - Profiled Document : FileSet Registration diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 0df9cb7..833aed0 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -4,14 +4,14 @@ 4.0.0 org.gcube.application geoportal-service - 1.0.10 + 1.0.11-SNAPSHOT Geoportal Service war org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/images-plugin/CHANGELOG.md b/images-plugin/CHANGELOG.md index f445ba5..2f59270 100644 --- a/images-plugin/CHANGELOG.md +++ b/images-plugin/CHANGELOG.md @@ -4,5 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for images materializations +## [v1.0.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.0] - 2022-02-24 - First release diff --git a/images-plugin/pom.xml b/images-plugin/pom.xml index fafe03f..39993ff 100644 --- a/images-plugin/pom.xml +++ b/images-plugin/pom.xml @@ -5,14 +5,14 @@ 4.0.0 images-plugins - 1.0.0 + 1.0.1-SNAPSHOT gCube CMS - Images Plugins org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/notifications-plugins/CHANGELOG.md b/notifications-plugins/CHANGELOG.md index a5b05c2..8fb52e6 100644 --- a/notifications-plugins/CHANGELOG.md +++ b/notifications-plugins/CHANGELOG.md @@ -4,5 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for notitfications events +## [v1.0.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.0] - 2022-02-24 - First release diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index 13a13d3..7ed980f 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 notifications-plugins - 1.0.0 + 1.0.1-SNAPSHOT gCube CMS - Notifications Plugins org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 03fbadd..8e19063 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.application.cms gcube-cms-suite pom - 1.0.2 + 1.0.3-SNAPSHOT Gcube CMS Suite gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles. @@ -22,19 +22,19 @@ https://code-repo.d4science.org/gCubeSystem - 2.0.2 - 2.1.1 - 3.6.3 - [1.0.0,2.0.0-SNAPSHOT) - 1.0.1 + + + + + - - - - - - + 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + 3.7.0-SNAPSHOT + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + 1.0.2-SNAPSHOT diff --git a/sdi-plugins/CHANGELOG.md b/sdi-plugins/CHANGELOG.md index c7a9acb..f225aa7 100644 --- a/sdi-plugins/CHANGELOG.md +++ b/sdi-plugins/CHANGELOG.md @@ -4,5 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for indexing and materializations in gCube SDI +## [v1.0.1-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.0] - 2022-02-24 - First release diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index 29ca70b..b9bbaac 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 sdi-plugins - 1.0.0 + 1.0.1-SNAPSHOT gCube CMS - SDI Plugins org.gcube.application.cms gcube-cms-suite - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/use-cases/CHANGELOG.md b/use-cases/CHANGELOG.md index 8f03a2b..8863cf5 100644 --- a/use-cases/CHANGELOG.md +++ b/use-cases/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-client +## [v1.0.3-SNAPSHOT] - 2022-12-07 +- Pom updates + ## [v1.0.2] - 2022-02-24 - Updated parent diff --git a/use-cases/pom.xml b/use-cases/pom.xml index 33e7b66..ce49b82 100644 --- a/use-cases/pom.xml +++ b/use-cases/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 use-cases - 1.0.2 + 1.0.3-SNAPSHOT CMS Use cases gcube-cms-suite org.gcube.application.cms - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java index 5f90cfb..a313b5f 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java @@ -50,7 +50,7 @@ public class ExportConcessioniAsProjects { public static void main(String[] args) throws InterruptedException, IOException { // read from imported folder - File dir= new File("/Users/fabioisti/git/gcube-cms-suite/import1668778302348"); + File dir= new File("/Users/fabioisti/git/gcube-cms-suite/import1669889538860"); // select only cluster // dir = new File(dir,"cluster_1"); @@ -110,7 +110,7 @@ public class ExportConcessioniAsProjects { AtomicLong warnCount = new AtomicLong(0); AtomicLong errCount = new AtomicLong(0); - ExecutorService service = Executors.newFixedThreadPool(1); + ExecutorService service = Executors.newFixedThreadPool(3); long startProcess = System.currentTimeMillis(); diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/PublishSubmitted.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/PublishSubmitted.java new file mode 100644 index 0000000..345ff40 --- /dev/null +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/PublishSubmitted.java @@ -0,0 +1,49 @@ +package org.gcube.application.cms.usecases; + +import lombok.extern.slf4j.Slf4j; +import org.bson.Document; +import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.geoportal.common.model.document.Project; +import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.common.model.rest.StepExecutionRequest; +import org.gcube.application.geoportal.common.rest.Projects; +import org.gcube.application.geoportal.common.utils.tests.GCubeTest; + +import java.rmi.RemoteException; +import java.util.HashMap; +import java.util.concurrent.atomic.AtomicLong; + +import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.projects; + +@Slf4j +public class PublishSubmitted { + + public static void main(String[] args) throws RemoteException { + TokenSetter.set(GCubeTest.getContext()); + Projects client=projects("profiledConcessioni").build(); + + QueryRequest query = new QueryRequest(); + query.setFilter(Document.parse("{\"_lifecycleInformation._lastOperationStatus\":{\"$eq\":\"OK\"},\"_lifecycleInformation._phase\":{\"$eq\":\"Pending Approval\"}}")); + + AtomicLong count=new AtomicLong(); + final StepExecutionRequest step = new StepExecutionRequest(); + step.setStepID("APPROVE-SUBMITTED"); + + HashMap errors = new HashMap<>(); + + client.query(query).forEachRemaining(project -> { + try{ + log.info("Publishing N {}, ID {} ",count.incrementAndGet(),project.getId()); + client.performStep(project.getId(), step); + }catch(Throwable t){ + t.printStackTrace(System.err); + errors.put(project.getId(),t.getMessage()); + } + }); + + System.out.println("Performed OP on "+count.get()+" projects."); + System.out.println("Errors count : "+errors.size()); + errors.forEach((k,v) -> System.err.println(k+"\t"+v)); + } + +} -- 2.17.1 From de8ed2a811938e58b689efc283f7c736cea89603 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 6 Dec 2022 16:46:12 +0100 Subject: [PATCH 2/6] Fixes #24235 --- .../cms/sdi/plugins/SDIMaterializerPlugin.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java index bb9351b..af801c7 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java @@ -181,13 +181,14 @@ public class SDIMaterializerPlugin extends AbstractPlugin implements Materializa log.debug("Found matching {} ",s); RegisteredFileSet registeredFileSet=Serialization.convert(wrapper.getByPath(s).get(0),RegisteredFileSet.class); List toKeep = new ArrayList<>(); - for(Object matObj : registeredFileSet.getMaterializations()){ - Materialization mat = Serialization.convert(matObj,Materialization.class); - if(mat.getType().equals(GCubeSDILayer.GCUBE_SDY_LAYER_TYPE)) { - log.debug("Deleting Layer {} ",mat); - sdi.deleteLayer(Serialization.convert(matObj, GCubeSDILayer.class)); - }else toKeep.add(matObj); - } + if(registeredFileSet.getMaterializations()!=null) + for(Object matObj : registeredFileSet.getMaterializations()){ + Materialization mat = Serialization.convert(matObj,Materialization.class); + if(mat.getType().equals(GCubeSDILayer.GCUBE_SDY_LAYER_TYPE)) { + log.debug("Deleting Layer {} ",mat); + sdi.deleteLayer(Serialization.convert(matObj, GCubeSDILayer.class)); + }else toKeep.add(matObj); + } // Resetting remaining materializations registeredFileSet.put(RegisteredFileSet.MATERIALIZATIONS,toKeep); // Update FS in doc -- 2.17.1 From e3960d3d7e348924e22728bb4e1d63fc86bc330d Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 6 Dec 2022 17:55:49 +0100 Subject: [PATCH 3/6] Fixes #24235 --- .../cms/sdi/engine/SDIManagerWrapper.java | 16 ++++++++++++---- .../cms/sdi/plugins/SDIMaterializerPlugin.java | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java index 6a483d3..6d1f69f 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java @@ -21,7 +21,9 @@ import org.gcube.application.geoportal.common.model.document.filesets.sdi.GeoSer import org.gcube.application.geoportal.common.model.document.filesets.sdi.PlatformInfo; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.application.geoportal.common.utils.Files; +import org.gcube.data.transfer.library.DataTransferClient; import org.gcube.data.transfer.library.TransferResult; +import org.gcube.data.transfer.library.client.Client; import org.gcube.data.transfer.library.faults.*; import org.gcube.data.transfer.model.Destination; import org.gcube.data.transfer.model.DestinationClashPolicy; @@ -259,9 +261,15 @@ public class SDIManagerWrapper extends SDIManager{ // remove actual files data // TODO REMOVE HARDCODED PATCH - String path=gsInfo.getPersistencePath().replace("/srv/geoserver_data","geoserver"); - log.info("Deleting files at {} [{}]",path,gsInfo.getPersistencePath()); - getDtGeoServer().getWebClient().delete(path); + String path="geoserver/"+gsInfo.getPersistencePath(); + log.info("Deleting files at {}@{}",path,getGeoserverHostName()); + try{ + Client dtClient = new Client("https://"+getGeoserverHostName()); + dtClient.delete(path); +// getDtGeoServer().getWebClient().delete("geoserver/"+path); + }catch(Exception e){ + throw new Exception("Data Transfer ERROR. Unable to delete files at "+getGeoserverHostName()+" PATH "+path,e); + } break; } @@ -273,7 +281,7 @@ public class SDIManagerWrapper extends SDIManager{ }catch(SDIInteractionException e){ throw e; }catch (Throwable t){ - throw new SDIInteractionException("Unexpected exception while trying to materialize File Set "+t.getMessage(),t); + throw new SDIInteractionException("Unexpected exception while trying to delete Layer : "+t.getMessage(),t); } } diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java index af801c7..fede17c 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java @@ -196,7 +196,7 @@ public class SDIMaterializerPlugin extends AbstractPlugin implements Materializa } // Resetting Document - report.setResultingDocument(Serialization.asDocument(wrapper.getValueCTX().jsonString())); + report.setResultingDocument(Document.parse(wrapper.getValueCTX().jsonString())); }catch (SDIInteractionException e){ log.error("Unable to materialize "+request,e); report.setStatus(Report.Status.ERROR); -- 2.17.1 From 912925202db5f9ebc3bf04c4e9b3aa4770c38c78 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 13 Dec 2022 16:52:25 +0100 Subject: [PATCH 4/6] Testing --- .../application/cms/tests/TestDocuments.java | 6 +- .../common/utils/tests/GCubeTest.java | 2 +- .../service/BasicServiceTestUnit.java | 3 + .../ProfiledConcessioniTests.java | 16 + test-data/profiledDocuments/sdiIndexed.json | 637 ++++++++++++++++-- .../cms/usecases/ClearProjects.java | 2 +- .../cms/usecases/ws/DescribeWSFolder.java | 36 +- 7 files changed, 635 insertions(+), 67 deletions(-) diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java index 20aa8a9..009cb68 100644 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java +++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java @@ -10,12 +10,12 @@ import java.nio.charset.Charset; import java.util.HashMap; public class TestDocuments { - public static File BASE_FOLDER =new File("../test-data/profiledDocuments"); + public static File BASE_FOLDER =new File("test-data/profiledDocuments"); public static final HashMap documentMap =new HashMap<>(); static{ - - for(File f:BASE_FOLDER.listFiles()){ + if(!BASE_FOLDER.exists()) System.err.println("Cannot load documents : folder not found, path "+BASE_FOLDER.getAbsolutePath()); + for(File f:BASE_FOLDER.listFiles(pathname -> {return pathname.getName().endsWith(".json");})){ try { if(!f.isDirectory()) { Project p = Serialization.read( diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index e8ce6e7..fbf703d 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -15,7 +15,7 @@ public class GCubeTest { // InterfaceConstants.SERVICE_NAME="GeoPortal"; - testContext = "/pred4s/preprod/preVRE"; +// testContext = "/pred4s/preprod/preVRE"; // testContext = "/d4science.research-infrastructures.eu/D4OS/GNA"; testContext= "/gcube/devsec/devVRE"; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java index e6d5217..89ea456 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java @@ -72,4 +72,7 @@ public class BasicServiceTestUnit extends JerseyTest { return Serialization.read(resString, clazz); else return null; } + + + } diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java index 96fcd5d..c42b12c 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java @@ -2,8 +2,11 @@ package org.gcube.application.geoportal.service.profiledDocuments; import lombok.extern.slf4j.Slf4j; import org.bson.Document; +import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.cms.tests.model.BasicTests; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; @@ -14,6 +17,7 @@ import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.utils.UserUtils; +import org.gcube.common.storagehub.model.exceptions.StorageHubException; import org.junit.Test; import javax.management.relation.Relation; @@ -89,9 +93,21 @@ public class ProfiledConcessioniTests extends AbstractProfiledDocumentsTests{ assertTrue(doc.getLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)); assertTrue(doc.getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE).size()==1); System.out.println("Project "+doc.getId()+" published with spatial reference "+doc.getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE).get(0)); + + + // check deletion + delete(doc.getId(),true); + System.out.println("Deleted."); + + + + + } + + @Test public void testRelations() throws Exception { assumeTrue(GCubeTest.isTestInfrastructureEnabled()); diff --git a/test-data/profiledDocuments/sdiIndexed.json b/test-data/profiledDocuments/sdiIndexed.json index d329ec7..472fb39 100644 --- a/test-data/profiledDocuments/sdiIndexed.json +++ b/test-data/profiledDocuments/sdiIndexed.json @@ -1,142 +1,661 @@ { - "_id": "622625b4af5159176f7c550c", - "_version": "1.0.1", + "_id": "6385d4d5308f5c28c5ee0b03", + "_version": "1.0.12", "_info": { "_creationInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:06.959" + "_instant": "2022-11-29T10:45:57.124" }, "_lastEditInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:13.858" + "_instant": "2022-11-29T10:46:14.955" }, "_access": { "_policy": "OPEN", - "_license": "" + "_license": "CC0-1.0" } }, "_profileID": "profiledConcessioni", "_profileVersion": "1.0.0", "_lifecycleInformation": { - "_phase": "PUBLISHED", - "_lastInvokedStep": "APPROVE DRAFT", + "_phase": "Published", + "_lastInvokedStep": "APPROVE-SUBMITTED", "_lastOperationStatus": "OK", "_errorMessages": [], "_warningMessages": [], "_triggeredEvents": - [] + [], + "_notes": null }, "_relationships": null, - "_spatialReference": - { - "type": "Point", - "bbox": - [ - 8.621178639172953, - 40.62975046683799, - 40.630257904721645, - 8.62091913167495 - ], - "coordinates": - [ - -32.00907926554869, - -32.00883133516304 - ] - }, - "_temporalReference": null, + "_identificationReferences": + [ + { + "geoJSON": + { + "type": "Point", + "crs": + { + "type": "name", + "properties": + {} + }, + "bbox": + [ + 12.50360458353915, + 41.867669715453225, + 0.0, + 12.502705577032433, + 41.86836980685436, + 0.0 + ], + "coordinates": + [ + 12.503155080285792, + 41.86801976115379, + 0.0 + ] + }, + "_type": "SPATIAL REFERENCE" + } + ], "_theDocument": { - "posizionamentoScavo": + "nome": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39)", + "introduzione": "L'esecuzione del progetto di indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39 Roma) avvenuta dietro istanza di concessione inviata dal Dipartimento di Studi Umanistici dell'Università degli Studi di Ferrara al Parco Archeologico dell'Appia Antica il giorno 05/10/2021 si inserisce in un più ampio progetto di ricerca volto a definire il paesaggio antico della valle dell'Almone. ", + "descrizioneContenuto": "Relazione di fine scavo e relativo abstract; selezione di immagini rappresentative; posizionamento topografico dell'area indagata, pianta di fine scavo.", + "authors": + [ + "TOMOGEA srl C.da Fontanelle, 85052 - Marsico Nuovo (PZ)", + "Dott.ssa Rachele Dubbini (Università degli Studi di Ferrara), rachele.dubbini@unife.it", + "Dott.ssa Francesca Romana Fiano", + "Dott. Matteo Lombardi" + ], + "contributore": "Prof.ssa Rachele Dubbini", + "titolari": + [ + "Università degli Studi di Ferrara" + ], + "responsabile": "Dott.ssa Rachele Dubbini", + "editore": "Università degli Studi di Ferrara", + "fontiFinanziamento": + [ + "Associazione L'Italia Fenice" + ], + "soggetto": + [ + "Research Excavation" + ], + "risorseCorrelate": + [ + "" + ], + "dataInizioProgetto": "2021-12-13T00:00:00", + "dataFineProgetto": "2022-02-11T00:00:00", + "titolareLicenza": + [ + "Università degli Studi di Ferrara" + ], + "titolareCopyright": + [ + "Università degli Studi di Ferrara" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "relazioneScavo": { - "titolo": "mio titolo", + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) relazione di scavo", + "responsabili": + [ + "Dott.ssa Rachele Dubbini", + "Dott.ssa Francesca Romana Fiano" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, "fileset": { - "_uuid": "95421181-001c-4e97-bc39-b2e04a30c7b7", + "_uuid": "29090ddf-59a3-4510-9efe-e021adca6f79", "_creationInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:11.167" + "_instant": "2022-11-29T10:45:59.074" + }, + "_access": + { + "_policy": "RESTRICTED", + "_license": "CC-BY-NC-SA-4.0" + }, + "_folderID": "6b72c73b-cb2c-4542-a941-8fadf4c60feb", + "_payloads": + [ + { + "_mimetype": "application/pdf", + "_storageID": "de34d980-22c6-4d97-a3b4-b861c83593fb", + "_link": "https://data-pre.d4science.org/shub/E_ZkxtL09xV2Z5WmYvVlFWVnBOZTBWOVUxY3QxVm9sRVBlMjZXdlMvQU5YVFVrbkIvQUxzSDAydnRkTytTakl6bw==", + "_name": "gna_relazione_appia_antica_sepolcro_geta_2021.pdf" + } + ] + } + }, + "abstractRelazione": + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) abstract relazione di scavo", + "abstractEng": "The non-invasive investigations carried out in the area had a double objective: a) the geophysical investigations were aimed at verifying the archaeological potential and revealing any anomalies in relation to buried structures; b) the drone flight was carried out to document the state of the area and provide for the investigations a georeferenced base through the elaboration of a photogrammetric plan to which to link the data resulting from the geophysical survey. Both these objectives are functional to the preliminary study that the University of Ferrara is carrying out in the proximity of the cd. Sepolcro di Geta for formulating an excavation project aimed at investigating the topography in which the monument was inserted. Moreover, the investigation provided reliable specification in order to plan the excavation activities in the area. Approaching the context at different scales, further themes to be addressed in the investigation are: a) the relationship of the monument and its funerary area within the Via Appia Antica; b) the evolution of the funerary landscape over time along the first mile of the ancient route. More specifically, we intend to investigate the relationship between the funerary landscape and the sacral one related to the sanctuary, in all probability to be attributed to the cult of Mars Gradivo, identified in the southern side of the area on the basis of the renewed interpretative proposals that followed the identification of a Templar structure (at the church of the Domine Quo Vadis?). ", + "abstractIta": "Le indagini non invasive nell’area sono state svolte con un duplice obiettivo: a) le indagini geofisiche erano tese a verificare il potenziale archeologico dei suoli e rivelare eventuali anomalie in relazione a strutture sepolte; b) il volo da drone è stato svolto per documentare lo stato di fatto dell’area e provvedere alle indagini una base georeferita tramite l’elaborazione di una planimetria fotogrammetrica a cui agganciare i dati risultati dall’indagine geofisica. Entrambi questi obiettivi sono funzionali allo studio preliminare che l’università degli Studi di Ferrara sta svolgendo in prossimità del cd. Sepolcro di Geta nella possibilità di formulare una progettualità di scavo volto a indagare il contesto topografico in cui il monumento era inserito. Approcciando al contesto di studio a diverse scale ulteriori aspetti che verranno affrontati nell’indagine sono: a) il rapporto del monumento e la sua area funeraria con la Via Appia Antica; b) l’evoluzione del paesaggio funerario nel tempo lungo il primo miglio del tracciato antico. Più nello specifico si intende indagare la relazione tra il paesaggio funerario e quello sacrale relativo ad un santuario, da attribuire al culto di Marte Gradivo, individuato in questo stesso luogo sulla base delle rinnovate proposte interpretative che hanno seguito all’individuazione di una struttura templare a pochi metri dall’area in concessione (presso la chiesa del Domine Quo Vadis?).", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + } + }, + "immaginiRappresentative": + [ + { + "titolo": null, + "didascalia": "Vista generale dell'area indagata. ", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" }, "_access": { "_policy": "OPEN", - "_license": "" + "_license": "CC0-1.0" }, - "_folderID": "2520ccdd-e0aa-4406-ba62-d900078372ce", + "fileset": + { + "_uuid": "cbdc2a85-f8c1-4882-93df-c677b70cceb7", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:01.961" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "bd48ca0b-ac72-4b32-b62d-b3e48743a528", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "a0cb8fb4-eeab-44d2-9a59-ec7e9f267c18", + "_link": "https://data-pre.d4science.org/shub/E_MUVGbUNlZU1ycFQrOUtiRXRiNGxrSE54RmZxOUU2L2JyWmw0bTJLVFV6UHkyeVJBM3A2VW91NUs1SUhoanlmMg==", + "_name": "foto_1_vista_generale_dell'area_indagata.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio vista da Ovest verso Est. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "8a236628-0d85-4ee6-b841-c1a3223c3361", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:04.35" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "c3252cce-09aa-48ad-a06f-089fe86e6512", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "b8d9f5f9-ed22-4fb9-bf1f-ecb2bec59779", + "_link": "https://data-pre.d4science.org/shub/E_U2toa3JkVFFmM01KSG5rV1RhRnNaSHJGZHV6WUhBdURqQWFjUndyU0VFTnQ2NUg5ZnZmWTdOZUFTUUVQTVQxNA==", + "_name": "foto_2_dettaglio_vista_ovest_est.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio vista da Ovest verso Est. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "7a88dc81-8250-4384-93ec-f6508425f876", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:06.86" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "a7f6a97a-1fb2-43a6-b3eb-6177733f8666", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "fbd417c3-43be-4176-9383-d225e3ced845", + "_link": "https://data-pre.d4science.org/shub/E_YTVmckFJSDZDTDErTFZqVXNKZ3NubWJHODlLWWRXbnhCdWdBK3hWdW9RWTFEeGxRNkhld3A3WmhLTXp4L1hkYg==", + "_name": "foto_3_dettaglio_vista_ovest_est_2.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio uliveto e piante fronte via Appia da Est verso Ovest. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "88a0393a-5c26-4c70-86d5-57dad1e0daaf", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:09.233" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "fbb5379e-2892-4bf8-b187-0f50dfd7e1a9", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "e8b553ba-162a-4e3e-9b7d-119acefb1f27", + "_link": "https://data-pre.d4science.org/shub/E_MnA0SUFFYVZNajZ6OXlmcWpJMno2Ti8wNGs1aXgxTytMRi9NK0NBSGhMVFJ0QURwN3JaS1FmVTVMNUpIR0doWQ==", + "_name": "foto_4_dettaglio_uliveto_vista_est_ovest.JPG" + } + ] + } + } + ], + "posizionamentoScavo": + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) posizionamento scavo", + "responsabile": "Dott.ssa Rachele Dubbini", + "authors": + [ + "Dott. Matteo Lombardi" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "topicCategory": "Society", + "subTopic": "Archeology", + "metodoRaccoltaDati": "Restituzione da elaborazione fotogrammetrica di immagini scattate da drone. La vettorializzazione è avvenuta sulla base dell'ortofoto contestualmente prodotta.", + "scalaAcquisizione": "1:1", + "valutazioneQualita": "Qualità del dato elevata, in quanto proveniente da ortofoto ottenuta tramite elaborazione fotogrammetrica di immagini da drone. L’area in esame è stata rilevata mediante l’utilizzo di un drone, DJI Mini 2, al fine di creare, tramite l’applicazione di tecniche aerofotogrammetriche, un’immagine metrica e georeferita del sito oggetto di indagine.", + "abstractSection": "Posizionamento topografico georeferenziato dell’area interessata dalle indagini", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "7a84518f-79d9-4642-aa10-926e8f301d7f", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:12.187" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "841eb15d-74fa-46e1-a4e0-d0c202f92123", "_payloads": [ + { + "_mimetype": "text/plain", + "_storageID": "e3ead0d9-e034-4abb-8fce-321fb89249f9", + "_link": "https://data-pre.d4science.org/shub/E_QjI5OTA0SG1KYzBZNTlPVDNVY1NPamJabWpjZnBkMGNyLzNHeGJWVjd0U281RFA4eXZFZGEweU9HQ0RwWHZCMw==", + "_name": "area_indagine.cpg" + }, + { + "_mimetype": "application/x-dbf", + "_storageID": "ab00c236-416d-4ad0-a861-6e92d7b2a3c7", + "_link": "https://data-pre.d4science.org/shub/E_M0QvSkl0dVFjc2xGMGM3YnVhcmpWY3dENUU0Z1B2R090UU4wcktPdG4vVzk5MkJqSy85dUhVVEdLdXUzRFdJLw==", + "_name": "area_indagine.dbf" + }, + { + "_mimetype": "text/plain", + "_storageID": "1bb3d118-eece-4faa-845c-c23389450455", + "_link": "https://data-pre.d4science.org/shub/E_b0I1Nk9HOTB2dEI5UHoxRFRKQ09aWUhpOVlKeWNKYytqTERTL1hHSUlDcm9GRXBadVJIb2tSaVJxNytDbzRVVg==", + "_name": "area_indagine.prj" + }, { "_mimetype": "application/x-shapefile", - "_storageID": "785efad8-3dfc-4de6-bc51-635139722fe7", - "_link": "https://data-pre.d4science.org/shub/E_c3hDNG51b09lcHA3aDU1cVN5RWxzRy9OK2hXblJQTkxKMUxSdnQ4MGRNcnRFTDNQNGQyOG5BUjZjcHREL2k3ag==", - "_name": "pos.shp" + "_storageID": "68b915f0-1f89-4f59-99ac-3c68413946c3", + "_link": "https://data-pre.d4science.org/shub/E_VTk5M3dtMExMMisrTlZUTW9DSHJYODhrVEZxcm9IelBaYkVLR1h2bzREUWVwTGlrT29XWTJrUW14cUlxUS9BSA==", + "_name": "area_indagine.shp" + }, + { + "_mimetype": "application/x-shapefile", + "_storageID": "ea02b126-d726-4c83-82c0-6feabbfa60ad", + "_link": "https://data-pre.d4science.org/shub/E_dUdGd2RhckVvbDhRcnN6ZERYUHIzZEpKdWFHdmpGQjlQVkFqc3ZwS1M4SU5XZzFFQkFJVEdTcytUN3djMklxdA==", + "_name": "area_indagine.shx" } ], "_materializations": [ { "_type": "gcube-sdi-layer", - "_ogcLinks": - [ - { - "wms": "https://geoserver1-t.pre.d4science.org/geoserver/profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c/wms?service=WMS&version=1.1.0&request=GetMap&layers=profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c:pos&styles=&bbox=8.620919,40.629750,8.621179,40.630258&srs=EPSG:4326&format=application/openlayers&width=400&height=400" - } - ], - "_bbox": - { - "_maxX": 8.621178639172953, - "_minX": 40.630257904721645, - "_maxY": 8.62091913167495, - "_minY": 40.62975046683799 - }, "_platformInfo": [ { "_type": "Geoserver", - "workspace": "profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c", - "layerName": "pos", - "persistencePath": "profiledConcessioni/622625b4af5159176f7c550c/95421181-001c-4e97-bc39-b2e04a30c7b7/pos", + "workspace": "profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03", + "_host": "geoserver1-t.pre.d4science.org", + "layerName": "area_indagine", + "storeName": "area_indagine_store", + "persistencePath": "profiledConcessioni/6385d4d5308f5c28c5ee0b03/7a84518f-79d9-4642-aa10-926e8f301d7f/area_indagine", "files": [ - "pos.shp" - ], - "storeName": "pos_store" + "area_indagine.cpg", + "area_indagine.dbf", + "area_indagine.prj", + "area_indagine.shp", + "area_indagine.shx" + ] } - ] + ], + "_bbox": + { + "_maxX": 12.50360458353915, + "_minX": 12.502705577032433, + "_maxY": 41.86836980685436, + "_minY": 41.867669715453225, + "_maxZ": 0.0, + "_minZ": 0.0 + }, + "_ogcLinks": + { + "wms": "https://geoserver1-t.pre.d4science.org/geoserver/profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03/wms?service=WMS&version=1.1.0&request=GetMap&layers=profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03:area_indagine&styles=&bbox=12.502706,41.867670,12.503605,41.868370&srs=EPSG:4326&format=application/openlayers&width=400&height=400" + } } ] } - } - } + }, + "pianteFineScavo": + [ + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) pianta fine scavo", + "responsabile": "Dott.ssa Rachele Dubbini", + "authors": + [ + "" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "topicCategory": "Society", + "subTopic": "Archeology", + "metodoRaccoltaDati": "", + "scalaAcquisizione": "", + "valutazioneQualita": "", + "abstractSection": "Planimetria georeferenziata dell'area indagata al termine delle attività", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + } + } + ] + }, + "_lock": null } \ No newline at end of file diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java index 86d23b3..b010430 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java @@ -29,7 +29,7 @@ public class ClearProjects { TokenSetter.set(GCubeTest.getContext()); - Projects client=projects("profiledConcessioni").build();; + Projects client=projects("basic").build();; ArrayList toSkipIds=new ArrayList<>(); diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java index 3247a3d..90909e8 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java @@ -1,6 +1,8 @@ package org.gcube.application.cms.usecases.ws; +import org.gcube.application.cms.tests.TestDocuments; import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; @@ -18,16 +20,41 @@ public class DescribeWSFolder { static StorageHubClient shc =null; public static void main(String[] args) throws StorageHubException { - // String context="/gcube/devsec/devVRE"; - String context="/pred4s/preprod/preVRE"; -// String folderID="0518e4ad-0ef9-4cba-8d4f-8e315146acdd"; + String context="/gcube/devsec/devVRE"; +// context="/pred4s/preprod/preVRE"; + String folderID="ded73475-f9b1-46c8-94f8-5b35c60667ce"; +// folderID = "dd8c8609-0dfe-4dc8-a2b4-15c629e01413"; + + Boolean recursive = true; TokenSetter.set(context); shc= new StorageHubClient(); shc.openVREFolder().get().getDescription(); + + // NB LOADING FROM DOC + + JSONPathWrapper wrapper = new JSONPathWrapper(TestDocuments.documentMap.get("sdiIndexed.json").getTheDocument().toJson()); + + // Deleted folders for + for(Object s : wrapper.getByPath("$.._folderID")){ + try{ + folderID = s.toString(); + System.out.print("Checking "+folderID+"\t"); + System.out.println("FOUND "+shc.open(folderID).asFolder().get().getName()); + }catch (StorageHubException e){ + System.out.println("Message from SG HUB : "+e.getMessage()); + } + } + System.exit(1); + + + + + + FolderContainer folder=shc.open(folderID).asFolder(); // FolderContainer folder = WorkspaceManager.getApplicationBaseFolder(shc); @@ -70,4 +97,7 @@ public class DescribeWSFolder { value *= Long.signum(bytes); return String.format("%.1f %ciB", value / 1024.0, ci.current()); } + + + } -- 2.17.1 From 96a13efe72275ab58b5d110cb73559553df7c15c Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 14 Dec 2022 15:08:14 +0100 Subject: [PATCH 5/6] Module default-lc-managers --- concessioni-lifecycle/pom.xml | 8 +- .../plugins/ConcessioniLifeCycleManager.java | 9 - default-lc-managers/CHANGELOG.md | 8 + default-lc-managers/FUNDING.md | 26 ++ default-lc-managers/LICENSE.md | 312 ++++++++++++++++++ default-lc-managers/README.md | 54 +++ default-lc-managers/pom.xml | 78 +++++ .../AbstractLifeCycleManager.java | 0 .../implementations/AbstractPlugin.java | 0 .../implementations/Default3PhaseManager.java | 2 - .../plugins/implementations/RoleManager.java | 0 .../SimpleLifeCycleManager.java | 4 - .../executions/GuardedEventManager.java | 0 .../executions/GuardedExecution.java | 0 .../executions/GuardedStepExecution.java | 2 +- .../cms/plugins/SimpleLifecycleTests.java | 0 .../common/utils/tests/GCubeTest.java | 4 +- geoportal-service/docs/architecture.rst | 2 +- geoportal-service/pom.xml | 4 + .../lifecycleManagers/RoleManagerTests.java | 2 - notifications-plugins/pom.xml | 5 +- pom.xml | 8 +- sdi-plugins/pom.xml | 6 + .../usecases/ExportConcessioniAsProjects.java | 4 +- 24 files changed, 506 insertions(+), 32 deletions(-) create mode 100644 default-lc-managers/CHANGELOG.md create mode 100644 default-lc-managers/FUNDING.md create mode 100644 default-lc-managers/LICENSE.md create mode 100644 default-lc-managers/README.md create mode 100644 default-lc-managers/pom.xml rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java (98%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java (97%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java (100%) rename {cms-plugin-framework => default-lc-managers}/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java (100%) diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index 72c842c..f500a1c 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -43,7 +43,7 @@ org.gcube.application.cms - cms-plugin-framework + default-lc-managers @@ -52,12 +52,6 @@ concessioni-model - - - - - - diff --git a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java index e1844ed..349e612 100644 --- a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java +++ b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java @@ -6,18 +6,11 @@ import org.bson.Document; import org.gcube.application.cms.custom.gna.concessioni.model.ProfiledConcessione; import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.cms.implementations.ProjectAccess; -import org.gcube.application.cms.implementations.faults.InvalidUserRoleException; -import org.gcube.application.cms.implementations.faults.ProjectNotFoundException; -import org.gcube.application.cms.implementations.faults.RegistrationException; -import org.gcube.application.cms.implementations.faults.UnauthorizedAccess; -import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.faults.IndexingException; import org.gcube.application.cms.plugins.implementations.Default3PhaseManager; import org.gcube.application.cms.plugins.reports.EventExecutionReport; import org.gcube.application.cms.plugins.reports.Report; -import org.gcube.application.cms.plugins.reports.StepExecutionReport; -import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.JSONPathWrapper; @@ -25,10 +18,8 @@ import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.access.Access; import org.gcube.application.geoportal.common.model.document.access.AccessPolicy; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; -import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject; import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import java.io.IOException; import java.util.ArrayList; diff --git a/default-lc-managers/CHANGELOG.md b/default-lc-managers/CHANGELOG.md new file mode 100644 index 0000000..6d57d82 --- /dev/null +++ b/default-lc-managers/CHANGELOG.md @@ -0,0 +1,8 @@ +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +# Changelog for org.gcube.application.cms.ckan-plugin + +This library contains default Lifecycle Managers handlers + +## [v1.0.0-SNAPSHOT] - 2022-02-24 +- First release diff --git a/default-lc-managers/FUNDING.md b/default-lc-managers/FUNDING.md new file mode 100644 index 0000000..9e48b94 --- /dev/null +++ b/default-lc-managers/FUNDING.md @@ -0,0 +1,26 @@ +# Acknowledgments + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488); + - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019); + - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465); + - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644); + - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754). +- the H2020 research and innovation programme + - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024); + - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119); + - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142); + - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182); + - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680); + - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610); + - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001); + - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194); + - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914); + - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091); + - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650); + - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409); + - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042); diff --git a/default-lc-managers/LICENSE.md b/default-lc-managers/LICENSE.md new file mode 100644 index 0000000..3af0507 --- /dev/null +++ b/default-lc-managers/LICENSE.md @@ -0,0 +1,312 @@ +# European Union Public Licence V. 1.1 + + +EUPL © the European Community 2007 + + +This European Union Public Licence (the “EUPL”) applies to the Work or Software +(as defined below) which is provided under the terms of this Licence. Any use of +the Work, other than as authorised under this Licence is prohibited (to the +extent such use is covered by a right of the copyright holder of the Work). + +The Original Work is provided under the terms of this Licence when the Licensor +(as defined below) has placed the following notice immediately following the +copyright notice for the Original Work: + +Licensed under the EUPL V.1.1 + +or has expressed by any other mean his willingness to license under the EUPL. + + + +## 1. Definitions + +In this Licence, the following terms have the following meaning: + +- The Licence: this Licence. + +- The Original Work or the Software: the software distributed and/or + communicated by the Licensor under this Licence, available as Source Code and + also as Executable Code as the case may be. + +- Derivative Works: the works or software that could be created by the Licensee, + based upon the Original Work or modifications thereof. This Licence does not + define the extent of modification or dependence on the Original Work required + in order to classify a work as a Derivative Work; this extent is determined by + copyright law applicable in the country mentioned in Article 15. + +- The Work: the Original Work and/or its Derivative Works. + +- The Source Code: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- The Executable Code: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- The Licensor: the natural or legal person that distributes and/or communicates + the Work under the Licence. + +- Contributor(s): any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- The Licensee or “You”: any natural or legal person who makes any usage of the + Software under the terms of the Licence. + +- Distribution and/or Communication: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, on-line or off-line, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + + + +## 2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, +sub-licensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, reproduce the Work, modify +- the Original Work, and make Derivative Works based upon the Work, communicate +- to the public, including the right to make available or display the Work or +- copies thereof to the public and perform publicly, as the case may be, the +- Work, distribute the Work or copies thereof, lend and rent the Work or copies +- thereof, sub-license rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + + + +## 3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute and/or communicate the Work. + + + +## 4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Original Work or Software, of the exhaustion of those rights or of other +applicable limitations thereto. + + + +## 5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: the Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes and/or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes and/or communicates copies of the +Original Works or Derivative Works based upon the Original Work, this +Distribution and/or Communication will be done under the terms of this Licence +or of a later version of this Licence unless the Original Work is expressly +distributed only under this version of the Licence. The Licensee (becoming +Licensor) cannot offer or impose any additional terms or conditions on the Work +or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes and/or Communicates Derivative +Works or copies thereof based upon both the Original Work and another work +licensed under a Compatible Licence, this Distribution and/or Communication can +be done under the terms of this Compatible Licence. For the sake of this clause, +“Compatible Licence” refers to the licences listed in the appendix attached to +this Licence. Should the Licensee’s obligations under the Compatible Licence +conflict with his/her obligations under this Licence, the obligations of the +Compatible Licence shall prevail. + +Provision of Source Code: When distributing and/or communicating copies of the +Work, the Licensee will provide a machine-readable copy of the Source Code or +indicate a repository where this Source will be easily and freely available for +as long as the Licensee continues to distribute and/or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + + + +## 6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + + + +## 7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +contributors. It is not a finished work and may therefore contain defects or +“bugs” inherent to this type of software development. + +For the above reason, the Work is provided under the Licence on an “as is” basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + + + +## 8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such +damage. However, the Licensor will be liable under statutory product liability +laws as far such laws apply to the Work. + + + +## 9. Additional agreements + +While distributing the Original Work or Derivative Works, You may choose to +conclude an additional agreement to offer, and charge a fee for, acceptance of +support, warranty, indemnity, or other liability obligations and/or services +consistent with this Licence. However, in accepting such obligations, You may +act only on your own behalf and on your sole responsibility, not on behalf of +the original Licensor or any other Contributor, and only if You agree to +indemnify, defend, and hold each Contributor harmless for any liability incurred +by, or claims asserted against such Contributor by the fact You have accepted +any such warranty or additional liability. + + + +## 10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon “I agree” +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution and/or Communication by You of the Work or copies thereof. + + + +## 11. Information to the public + +In case of any Distribution and/or Communication of the Work by means of +electronic communication by You (for example, by offering to download the Work +from a remote location) the distribution channel or media (for example, a +website) must at least provide to the public the information requested by the +applicable law regarding the Licensor, the Licence and the way it may be +accessible, concluded, stored and reproduced by the Licensee. + + + +## 12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + + + +## 13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work licensed hereunder. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed and/or reformed so as necessary to make +it valid and enforceable. + +The European Commission may publish other linguistic versions and/or new +versions of this Licence, so far this is required and reasonable, without +reducing the scope of the rights granted by the Licence. New versions of the +Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + + + +## 14. Jurisdiction + +Any litigation resulting from the interpretation of this License, arising +between the European Commission, as a Licensor, and any Licensee, will be +subject to the jurisdiction of the Court of Justice of the European Communities, +as laid down in article 238 of the Treaty establishing the European Community. + +Any litigation arising between Parties, other than the European Commission, and +resulting from the interpretation of this License, will be subject to the +exclusive jurisdiction of the competent court where the Licensor resides or +conducts its primary business. + + + +## 15. Applicable Law + +This Licence shall be governed by the law of the European Union country where +the Licensor resides or has his registered office. + +This licence shall be governed by the Belgian law if: + +- a litigation arises between the European Commission, as a Licensor, and any +- Licensee; the Licensor, other than the European Commission, has no residence +- or registered office inside a European Union country. + + + +## Appendix + + + +“Compatible Licences” according to article 5 EUPL are: + + +- GNU General Public License (GNU GPL) v. 2 + +- Open Software License (OSL) v. 2.1, v. 3.0 + +- Common Public License v. 1.0 + +- Eclipse Public License v. 1.0 + +- Cecill v. 2.0 + diff --git a/default-lc-managers/README.md b/default-lc-managers/README.md new file mode 100644 index 0000000..7180741 --- /dev/null +++ b/default-lc-managers/README.md @@ -0,0 +1,54 @@ +gCube CMS Suite : default-lc-managers +-------------------------------------------------- + +gCube CMS Suite is a set of components designed to manage complex space-temporal Documents called Projects defined in Use Case Descriptors. + +This library contains the default Lifecycle Manager handler plugins. + +## Built with +* [gCube SmartGears] (https://gcube.wiki.gcube-system.org/gcube/SmartGears) - The gCube SmartGears framework +* [OpenJDK](https://openjdk.java.net/) - The JDK used +* [JAX-RS](https://github.com/eclipse-ee4j/jaxrs-api) - Java™ API for RESTful Web Services +* [Jersey](https://jersey.github.io/) - JAX-RS runtime +* [Maven](https://maven.apache.org/) - Dependency Management + +## Documentation + +Documentation can be found [here](https://gcube.wiki.gcube-system.org/gcube/GeoPortal_Service). + +## Change log + +See [CHANGELOG.md](CHANGELOG.md). + +## License + +This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details. + +## About the gCube Framework +This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an +open-source software toolkit used for building and operating Hybrid Data +Infrastructures enabling the dynamic deployment of Virtual Research Environments +by favouring the realisation of reuse oriented policies. + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - DILIGENT (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - D4Science (grant no. 212488); + - D4Science-II (grant no.239019); + - ENVRI (grant no. 283465); + - iMarine(grant no. 283644); + - EUBrazilOpenBio (grant no. 288754). +- the H2020 research and innovation programme + - SoBigData (grant no. 654024); + - PARTHENOS (grant no. 654119); + - EGIEngage (grant no. 654142); + - ENVRIplus (grant no. 654182); + - BlueBRIDGE (grant no. 675680); + - PerformFish (grant no. 727610); + - AGINFRAplus (grant no. 731001); + - DESIRA (grant no. 818194); + - ARIADNEplus (grant no. 823914); + - RISIS2 (grant no. 824091); + diff --git a/default-lc-managers/pom.xml b/default-lc-managers/pom.xml new file mode 100644 index 0000000..ff99db1 --- /dev/null +++ b/default-lc-managers/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + + default-lc-managers + 1.0.0-SNAPSHOT + gCube CMS - Default LC Managers + + + + org.gcube.application.cms + gcube-cms-suite + 1.0.3-SNAPSHOT + + + + https://code-repo.d4science.org/gCubeSystem + + + + + + scm:git:${gitBaseUrl}/gcube-cms-suite + scm:git:${gitBaseUrl}/gcube-cms-suite + ${gitBaseUrl}/gcube-cms-suite + + + + + + org.gcube.application.cms + cms-plugin-framework + ${plugin-framework-version} + pom + import + + + + + + + + org.gcube.application.cms + cms-plugin-framework + + + + org.gcube.application.cms + cms-test-commons + test + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + make-uberjar + package + + + make-servicearchive + package + + + + + + + diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractPlugin.java diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java similarity index 98% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java index b1a81eb..f27c8ad 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java @@ -10,11 +10,9 @@ import org.gcube.application.cms.plugins.faults.EventException; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.implementations.executions.GuardedStepExecution; -import org.gcube.application.cms.plugins.reports.DocumentHandlingReport; import org.gcube.application.cms.plugins.reports.EventExecutionReport; import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.BaseRequest; -import org.gcube.application.cms.plugins.requests.StepExecutionRequest; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/RoleManager.java diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java similarity index 97% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index 0b3d816..e9e36f5 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -2,10 +2,6 @@ package org.gcube.application.cms.plugins.implementations; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.gcube.application.cms.implementations.faults.InvalidUserRoleException; -import org.gcube.application.cms.implementations.faults.ProjectNotFoundException; -import org.gcube.application.cms.implementations.faults.RegistrationException; -import org.gcube.application.cms.implementations.faults.UnauthorizedAccess; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.MaterializationPlugin; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedEventManager.java diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java similarity index 100% rename from cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java rename to default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java index 208c9e0..ab58540 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java @@ -1,8 +1,8 @@ package org.gcube.application.cms.plugins.implementations.executions; +import org.gcube.application.cms.plugins.implementations.RoleManager; import lombok.NonNull; import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; -import org.gcube.application.cms.plugins.implementations.RoleManager; import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.StepExecutionRequest; import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; diff --git a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java b/default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java similarity index 100% rename from cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java rename to default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index fbf703d..9f0d2d3 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -15,9 +15,9 @@ public class GCubeTest { // InterfaceConstants.SERVICE_NAME="GeoPortal"; -// testContext = "/pred4s/preprod/preVRE"; + testContext = "/pred4s/preprod/preVRE"; // testContext = "/d4science.research-infrastructures.eu/D4OS/GNA"; - testContext= "/gcube/devsec/devVRE"; +// testContext= "/gcube/devsec/devVRE"; System.out.println("TEST CONTEXT = "+testContext); return testContext; diff --git a/geoportal-service/docs/architecture.rst b/geoportal-service/docs/architecture.rst index 928b9d4..8d34c71 100644 --- a/geoportal-service/docs/architecture.rst +++ b/geoportal-service/docs/architecture.rst @@ -299,7 +299,7 @@ In order to facilitate the development of plugins, the following solutions may b * extension of an already provided LifecycleManager in order to override default behaviour (e.g. as per *Concessioni* UCD, see suite module concessioni-lifecycle) -* extension of *org.gcube.application.cms.plugins.implementations.AbstractPlugin* class in order to leverage on common behaiovur (e.g. configuration management, error handling) +* extension of *org.gcube.application.cms.plugins.AbstractPlugin* class in order to leverage on common behaiovur (e.g. configuration management, error handling) * extension of *org.gcube.application.cms.caches.AbstractScopedMap* or *org.gcube.application.cms.caches.TimedMap* for easy implementation of caches (respectively by context and global) diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 833aed0..91c7c5b 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -63,6 +63,10 @@ compile + + org.gcube.application.cms + default-lc-managers + org.gcube.common diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java index d3566f2..e8b5d93 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/framework/lifecycleManagers/RoleManagerTests.java @@ -3,13 +3,11 @@ package org.gcube.application.geoportal.service.framework.lifecycleManagers; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.plugins.implementations.RoleManager; import org.gcube.application.cms.tests.TestProfiles; -import org.gcube.application.geoportal.common.model.document.accounting.User; import org.gcube.application.geoportal.common.model.plugins.LifecycleManagerDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; import org.junit.Test; -import java.util.Collection; import java.util.List; @Slf4j diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index 7ed980f..be78658 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -51,7 +51,10 @@ org.gcube.application.cms cms-plugin-framework - + + org.gcube.application.cms + default-lc-managers + org.gcube.application.cms cms-test-commons diff --git a/pom.xml b/pom.xml index 8e19063..140d77b 100644 --- a/pom.xml +++ b/pom.xml @@ -56,12 +56,12 @@ geoportal-common cms-plugin-framework - geoportal-client + default-lc-managers sdi-plugins notifications-plugins dataminer-plugins @@ -118,7 +118,13 @@ + + + org.gcube.application.cms + default-lc-managers + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + org.gcube.application.cms sdi-plugins diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index b9bbaac..a95657e 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -48,6 +48,12 @@ cms-plugin-framework + + org.gcube.application.cms + default-lc-managers + + + org.gcube.spatial.data diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java index a313b5f..507e2ad 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java @@ -67,7 +67,7 @@ public class ExportConcessioniAsProjects { //String targetContext="/gcube/devsec/devVRE"; // String targetContext="/pred4s/preprod/preVRE"; - Projects client=projects("profiledConcessioni").build();; + Projects client=projects("concessioni-estere").build();; @@ -110,7 +110,7 @@ public class ExportConcessioniAsProjects { AtomicLong warnCount = new AtomicLong(0); AtomicLong errCount = new AtomicLong(0); - ExecutorService service = Executors.newFixedThreadPool(3); + ExecutorService service = Executors.newFixedThreadPool(1); long startProcess = System.currentTimeMillis(); -- 2.17.1 From e1defba9108358315aeaf15d76bf2c1aba2ffbd7 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 14 Dec 2022 16:18:15 +0100 Subject: [PATCH 6/6] Release suite 1.0.3 --- CHANGELOG.md | 3 ++- ckan-plugin/CHANGELOG.md | 2 +- ckan-plugin/pom.xml | 4 +-- cms-plugin-framework/CHANGELOG.md | 5 ++-- cms-plugin-framework/pom.xml | 4 +-- cms-test-commons/CHANGELOG.md | 2 +- cms-test-commons/pom.xml | 4 +-- concessioni-lifecycle/CHANGELOG.md | 5 ++-- concessioni-lifecycle/pom.xml | 4 +-- concessioni-model/CHANGELOG.md | 2 +- concessioni-model/pom.xml | 4 +-- dataminer-plugins/CHANGELOG.md | 2 +- dataminer-plugins/pom.xml | 4 +-- default-lc-managers/CHANGELOG.md | 2 +- default-lc-managers/pom.xml | 4 +-- geoportal-client/CHANGELOG.md | 2 +- geoportal-client/pom.xml | 4 +-- geoportal-common/CHANGELOG.md | 2 +- geoportal-common/pom.xml | 4 +-- .../common/utils/tests/GCubeTest.java | 2 +- geoportal-service/CHANGELOG.md | 3 ++- geoportal-service/pom.xml | 4 +-- images-plugin/CHANGELOG.md | 2 +- images-plugin/pom.xml | 4 +-- notifications-plugins/CHANGELOG.md | 2 +- notifications-plugins/pom.xml | 4 +-- pom.xml | 26 +++++++++---------- sdi-plugins/CHANGELOG.md | 3 ++- sdi-plugins/pom.xml | 4 +-- use-cases/CHANGELOG.md | 2 +- use-cases/pom.xml | 4 +-- .../usecases/ExportConcessioniAsProjects.java | 2 +- 32 files changed, 65 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d13e27..a1929c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.spatial.data.gcube-sdi-suite -## [v1.0.3-SNAPSHOT] - 2022-12-07 +## [v1.0.3] - 2022-12-07 - Updated plugin framework +- Introduced module default-lc-managers ## [v1.0.2] - 2021-02-24 -Introduced module sdi-plugins diff --git a/ckan-plugin/CHANGELOG.md b/ckan-plugin/CHANGELOG.md index 68803b9..dc13fd4 100644 --- a/ckan-plugin/CHANGELOG.md +++ b/ckan-plugin/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for ckan materializations -## [v1.0.1-SNAPSHOT] - 2022-12-07 +## [v1.0.1] - 2022-12-07 - Pom updates ## [v1.0.0] - 2022-02-24 diff --git a/ckan-plugin/pom.xml b/ckan-plugin/pom.xml index 63ee359..ce4336a 100644 --- a/ckan-plugin/pom.xml +++ b/ckan-plugin/pom.xml @@ -5,14 +5,14 @@ 4.0.0 ckan-plugins - 1.0.1-SNAPSHOT + 1.0.1 gCube CMS - CKAN Plugins org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/cms-plugin-framework/CHANGELOG.md b/cms-plugin-framework/CHANGELOG.md index e22e0fc..d9194ca 100644 --- a/cms-plugin-framework/CHANGELOG.md +++ b/cms-plugin-framework/CHANGELOG.md @@ -2,8 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.cms-plugin-framework -## [v1.0.2-SNAPSHOT] 2022-01-17 -- Fixes #2435 +## [v1.0.2] 2022-01-17 +- Fixes #2435 +- Introduced module default-lc-managers ## [v1.0.1] 2022-01-17 - Serialization Features diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml index 4382e13..d78566d 100644 --- a/cms-plugin-framework/pom.xml +++ b/cms-plugin-framework/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 cms-plugin-framework - 1.0.2-SNAPSHOT + 1.0.2 org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/cms-test-commons/CHANGELOG.md b/cms-test-commons/CHANGELOG.md index 785e863..3bb048b 100644 --- a/cms-test-commons/CHANGELOG.md +++ b/cms-test-commons/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.cms.cms-test-commons -## [v1.0.3-SNAPSHOT] - 2022-12-07 +## [v1.0.3] - 2022-12-07 - Pom updates ## [v1.0.2] - 2022-01-17 diff --git a/cms-test-commons/pom.xml b/cms-test-commons/pom.xml index 9611845..c66b0d0 100644 --- a/cms-test-commons/pom.xml +++ b/cms-test-commons/pom.xml @@ -5,14 +5,14 @@ 4.0.0 cms-test-commons - 1.0.3-SNAPSHOT + 1.0.3 CMS Test Commons org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/concessioni-lifecycle/CHANGELOG.md b/concessioni-lifecycle/CHANGELOG.md index e0df8df..8e4aad8 100644 --- a/concessioni-lifecycle/CHANGELOG.md +++ b/concessioni-lifecycle/CHANGELOG.md @@ -4,9 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains custom extensions for the support of GNA "concessioni" use case -## [v1.0.2-SNAPSHOT] - 2022-12-07 +## [v1.0.2] - 2022-12-07 - Pom updates - +- Introduced module default-lc-managers +- ## [v1.0.1] - 2022-01-17 - Serialization adaptation diff --git a/concessioni-lifecycle/pom.xml b/concessioni-lifecycle/pom.xml index f500a1c..6a7dcb8 100644 --- a/concessioni-lifecycle/pom.xml +++ b/concessioni-lifecycle/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 concessioni-lifecycle - 1.0.2-SNAPSHOT + 1.0.2 GNA Concessioni Lifecycle org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/concessioni-model/CHANGELOG.md b/concessioni-model/CHANGELOG.md index f98c052..7b873d0 100644 --- a/concessioni-model/CHANGELOG.md +++ b/concessioni-model/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains custom BEANS for the support of GNA "concessioni" use case -## [v1.0.2-SNAPSHOT] - 2022-12-07 +## [v1.0.2] - 2022-12-07 - Pom updates ## [v1.0.1] - 2022-01-17 diff --git a/concessioni-model/pom.xml b/concessioni-model/pom.xml index b3b375e..8916c04 100644 --- a/concessioni-model/pom.xml +++ b/concessioni-model/pom.xml @@ -6,14 +6,14 @@ org.gcube.application.cms concessioni-model - 1.0.2-SNAPSHOT + 1.0.2 GNA Concessioni Model org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/dataminer-plugins/CHANGELOG.md b/dataminer-plugins/CHANGELOG.md index bb5b37e..6d1e27e 100644 --- a/dataminer-plugins/CHANGELOG.md +++ b/dataminer-plugins/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for processing via gCube Dataminer -## [v1.0.1-SNAPSHOT] - 2022-12-07 +## [v1.0.1] - 2022-12-07 - Pom updates ## [v1.0.0] - 2022-02-24 diff --git a/dataminer-plugins/pom.xml b/dataminer-plugins/pom.xml index 1b075f4..4c8b9e0 100644 --- a/dataminer-plugins/pom.xml +++ b/dataminer-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 dataminer-plugins - 1.0.1-SNAPSHOT + 1.0.1 gCube CMS - Dataminer Plugins org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/default-lc-managers/CHANGELOG.md b/default-lc-managers/CHANGELOG.md index 6d57d82..6c80f00 100644 --- a/default-lc-managers/CHANGELOG.md +++ b/default-lc-managers/CHANGELOG.md @@ -4,5 +4,5 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains default Lifecycle Managers handlers -## [v1.0.0-SNAPSHOT] - 2022-02-24 +## [v1.0.0] - 2022-02-24 - First release diff --git a/default-lc-managers/pom.xml b/default-lc-managers/pom.xml index ff99db1..7351a94 100644 --- a/default-lc-managers/pom.xml +++ b/default-lc-managers/pom.xml @@ -5,14 +5,14 @@ 4.0.0 default-lc-managers - 1.0.0-SNAPSHOT + 1.0.0 gCube CMS - Default LC Managers org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index 4f6c857..e27a637 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-client -## [v1.1.1-SNAPSHOT] - 2022-12-07 +## [v1.1.1] - 2022-12-07 - Pom updates ## [v1.1.0] - 2022-02-01 diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index 4fcefeb..c515295 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,14 +4,14 @@ 4.0.0 org.gcube.application geoportal-client - 1.1.1-SNAPSHOT + 1.1.1 Geoportal Client org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/geoportal-common/CHANGELOG.md b/geoportal-common/CHANGELOG.md index cc0c5e9..b216451 100644 --- a/geoportal-common/CHANGELOG.md +++ b/geoportal-common/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-common -## [v1.0.10-SNAPSHOT] - 2022-12-07 +## [v1.0.10] - 2022-12-07 - Pom updates # [v1.0.9] - 2022-01-17 diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml index fe35ffa..5e0831c 100644 --- a/geoportal-common/pom.xml +++ b/geoportal-common/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 geoportal-common - 1.0.10-SNAPSHOT + 1.0.10 Geoportal Common org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index 9f0d2d3..e8ce6e7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -17,7 +17,7 @@ public class GCubeTest { testContext = "/pred4s/preprod/preVRE"; // testContext = "/d4science.research-infrastructures.eu/D4OS/GNA"; -// testContext= "/gcube/devsec/devVRE"; + testContext= "/gcube/devsec/devVRE"; System.out.println("TEST CONTEXT = "+testContext); return testContext; diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index 4fa1191..c5e8286 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -2,8 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-service -## [v1.0.11-SNAPSHOT] - 2022-12-07 +## [v1.0.11] - 2022-12-07 - Pom updates +- Introduced module default-lc-managers ## [v1.0.10] 2022-01-17 - Plugin Management diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 91c7c5b..6b03a01 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -4,14 +4,14 @@ 4.0.0 org.gcube.application geoportal-service - 1.0.11-SNAPSHOT + 1.0.11 Geoportal Service war org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/images-plugin/CHANGELOG.md b/images-plugin/CHANGELOG.md index 2f59270..865c90c 100644 --- a/images-plugin/CHANGELOG.md +++ b/images-plugin/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for images materializations -## [v1.0.1-SNAPSHOT] - 2022-12-07 +## [v1.0.1] - 2022-12-07 - Pom updates ## [v1.0.0] - 2022-02-24 diff --git a/images-plugin/pom.xml b/images-plugin/pom.xml index 39993ff..af0ba97 100644 --- a/images-plugin/pom.xml +++ b/images-plugin/pom.xml @@ -5,14 +5,14 @@ 4.0.0 images-plugins - 1.0.1-SNAPSHOT + 1.0.1 gCube CMS - Images Plugins org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/notifications-plugins/CHANGELOG.md b/notifications-plugins/CHANGELOG.md index 8fb52e6..086b04f 100644 --- a/notifications-plugins/CHANGELOG.md +++ b/notifications-plugins/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for notitfications events -## [v1.0.1-SNAPSHOT] - 2022-12-07 +## [v1.0.1] - 2022-12-07 - Pom updates ## [v1.0.0] - 2022-02-24 diff --git a/notifications-plugins/pom.xml b/notifications-plugins/pom.xml index be78658..8a54506 100644 --- a/notifications-plugins/pom.xml +++ b/notifications-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 notifications-plugins - 1.0.1-SNAPSHOT + 1.0.1 gCube CMS - Notifications Plugins org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/pom.xml b/pom.xml index 140d77b..69f7642 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.application.cms gcube-cms-suite pom - 1.0.3-SNAPSHOT + 1.0.3 Gcube CMS Suite gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles. @@ -22,19 +22,19 @@ https://code-repo.d4science.org/gCubeSystem - - - - - + 2.0.2 + 2.1.1 + 3.6.3 + [1.0.0,2.0.0-SNAPSHOT) + 1.0.1 - 2.1.0-SNAPSHOT - 2.2.0-SNAPSHOT - 3.7.0-SNAPSHOT - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - - 1.0.2-SNAPSHOT + + + + + + @@ -123,7 +123,7 @@ org.gcube.application.cms default-lc-managers - [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + [1.0.0,2.0.0-SNAPSHOT) org.gcube.application.cms diff --git a/sdi-plugins/CHANGELOG.md b/sdi-plugins/CHANGELOG.md index f225aa7..5ee7859 100644 --- a/sdi-plugins/CHANGELOG.md +++ b/sdi-plugins/CHANGELOG.md @@ -4,8 +4,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This library contains gcube-cms plugins for indexing and materializations in gCube SDI -## [v1.0.1-SNAPSHOT] - 2022-12-07 +## [v1.0.1] - 2022-12-07 - Pom updates +- Introduced module default-lc-managers ## [v1.0.0] - 2022-02-24 - First release diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index a95657e..d0f6fe8 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -5,14 +5,14 @@ 4.0.0 sdi-plugins - 1.0.1-SNAPSHOT + 1.0.1 gCube CMS - SDI Plugins org.gcube.application.cms gcube-cms-suite - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/use-cases/CHANGELOG.md b/use-cases/CHANGELOG.md index 8863cf5..b8294bf 100644 --- a/use-cases/CHANGELOG.md +++ b/use-cases/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-client -## [v1.0.3-SNAPSHOT] - 2022-12-07 +## [v1.0.3] - 2022-12-07 - Pom updates ## [v1.0.2] - 2022-02-24 diff --git a/use-cases/pom.xml b/use-cases/pom.xml index ce49b82..263ac22 100644 --- a/use-cases/pom.xml +++ b/use-cases/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 use-cases - 1.0.3-SNAPSHOT + 1.0.3 CMS Use cases gcube-cms-suite org.gcube.application.cms - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java index 507e2ad..c265399 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java @@ -110,7 +110,7 @@ public class ExportConcessioniAsProjects { AtomicLong warnCount = new AtomicLong(0); AtomicLong errCount = new AtomicLong(0); - ExecutorService service = Executors.newFixedThreadPool(1); + ExecutorService service = Executors.newFixedThreadPool(3); long startProcess = System.currentTimeMillis(); -- 2.17.1