From 5e686b75e0d65217df825a3fd04006b4bc2bae0f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 31 Jan 2017 10:24:15 +0000 Subject: [PATCH] Creating Parthenos Entities Mapping to gCube Resources git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/parthenos-entities@141938 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../model/entity/resource/PE3_Curating_Service.java | 1 + .../model/relation/P106_is_composed_of.java | 9 --------- .../PP16_has_persistent_digital_object_part.java | 10 ---------- .../model/relation/PP18_has_digital_object_part.java | 2 ++ .../relation/PP18i_is_digital_object_part_of.java | 2 ++ .../relation/PP19_has_persistent_software_part.java | 2 ++ .../PP19i_is_persistent_software_part_of.java | 2 ++ .../relation/PP20_has_persistent_dataset_part.java | 2 ++ .../PP20i_is_persistent_dataset_part_of.java | 2 ++ .../relation/isrelatedto/P106_is_composed_of.java | 12 ++++++++++++ .../PP16_has_persistent_digital_object_part.java | 12 ++++++++++++ .../inverse}/P106i_forms_part_of.java | 2 +- .../PP16i_is_persistent_digital_object_part_of.java | 3 ++- 13 files changed, 40 insertions(+), 21 deletions(-) delete mode 100644 src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106_is_composed_of.java delete mode 100644 src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16_has_persistent_digital_object_part.java create mode 100644 src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P106_is_composed_of.java create mode 100644 src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP16_has_persistent_digital_object_part.java rename src/main/java/org/gcube/informationsystem/parthenos/model/relation/{ => isrelatedto/inverse}/P106i_forms_part_of.java (51%) rename src/main/java/org/gcube/informationsystem/parthenos/model/relation/{ => isrelatedto/inverse}/PP16i_is_persistent_digital_object_part_of.java (63%) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java index cbed4b1..b11c595 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java @@ -1,6 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; + /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106_is_composed_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106_is_composed_of.java deleted file mode 100644 index ff1c57e..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106_is_composed_of.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.relation; - - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface P106_is_composed_of { - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16_has_persistent_digital_object_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16_has_persistent_digital_object_part.java deleted file mode 100644 index 8080206..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16_has_persistent_digital_object_part.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.relation; - - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface PP16_has_persistent_digital_object_part extends - P106_is_composed_of { - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java index 5c02d81..e7dc167 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.P106_is_composed_of; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java index 5bbf78d..432248e 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.P106i_forms_part_of; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java index 3b4b89f..fd0ab20 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.PP16_has_persistent_digital_object_part; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java index fc2f953..5f4d2ac 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.PP16i_is_persistent_digital_object_part_of; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java index 0e37a8c..060e88e 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.PP16_has_persistent_digital_object_part; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java index 0290350..ecd8530 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.PP16i_is_persistent_digital_object_part_of; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P106_is_composed_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P106_is_composed_of.java new file mode 100644 index 0000000..0698cbf --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P106_is_composed_of.java @@ -0,0 +1,12 @@ +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; + +import org.gcube.informationsystem.model.entity.Resource; +import org.gcube.informationsystem.model.relation.IsRelatedTo; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface P106_is_composed_of + extends IsRelatedTo { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP16_has_persistent_digital_object_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP16_has_persistent_digital_object_part.java new file mode 100644 index 0000000..55bac76 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP16_has_persistent_digital_object_part.java @@ -0,0 +1,12 @@ +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; + +import org.gcube.informationsystem.parthenos.model.entity.resource.PE19_Persistent_Digital_Object; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PP16_has_persistent_digital_object_part + + extends P106_is_composed_of { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106i_forms_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P106i_forms_part_of.java similarity index 51% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106i_forms_part_of.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P106i_forms_part_of.java index 02b8d67..00121fe 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P106i_forms_part_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P106i_forms_part_of.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16i_is_persistent_digital_object_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP16i_is_persistent_digital_object_part_of.java similarity index 63% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16i_is_persistent_digital_object_part_of.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP16i_is_persistent_digital_object_part_of.java index 808a4db..9a13d0e 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP16i_is_persistent_digital_object_part_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP16i_is_persistent_digital_object_part_of.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; + /**