From 6d487ee13843247136bb0c22e03ae96a903de400 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 15 Mar 2017 14:54:39 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/parthenos-entities@144956 82a268e6-3cf1-43bd-a215-b396298e98cf --- ...ic_Info_Facet.java => PE_Basic_Info_Facet.java} | 2 +- ..._Facet.java => PE_Contact_Reference_Facet.java} | 2 +- .../{P_Info_Facet.java => PE_Info_Facet.java} | 2 +- .../model/entity/resource/cidoc/E39_Actor.java | 2 +- .../entity/resource/parthenos/PE1_Service.java | 4 ++-- .../parthenos/PP42_has_declarative_time.java | 14 ++++++++++++++ 6 files changed, 20 insertions(+), 6 deletions(-) rename src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/{P_Basic_Info_Facet.java => PE_Basic_Info_Facet.java} (92%) rename src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/{P_Contact_Reference_Facet.java => PE_Contact_Reference_Facet.java} (94%) rename src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/{P_Info_Facet.java => PE_Info_Facet.java} (92%) create mode 100644 src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Basic_Info_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java similarity index 92% rename from src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Basic_Info_Facet.java rename to src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java index 734be88..3402f2c 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Basic_Info_Facet.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java @@ -6,7 +6,7 @@ import org.gcube.informationsystem.model.entity.Facet; /** * @author Luca Frosini (ISTI - CNR) */ -public interface P_Basic_Info_Facet extends Facet { +public interface PE_Basic_Info_Facet extends Facet { public static final String NAME = "P_Basic_Info_Facet"; // P_Basic_Info_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture title and description metadata for Partenos Entities"; diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Contact_Reference_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java similarity index 94% rename from src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Contact_Reference_Facet.java rename to src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java index 8137938..5e1ae8e 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Contact_Reference_Facet.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java @@ -9,7 +9,7 @@ import org.gcube.informationsystem.model.entity.facet.ContactReferenceFacet; * @author Alessia Bardi (ISTI - CNR) * */ -public interface P_Contact_Reference_Facet extends ContactReferenceFacet { +public interface PE_Contact_Reference_Facet extends ContactReferenceFacet { public static final String NAME = "P_Contact_Reference_Facet"; // P_Contact_Reference_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture minimal metadata for E39_Actor"; diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Info_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java similarity index 92% rename from src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Info_Facet.java rename to src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java index 2959fa7..4a9475f 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/P_Info_Facet.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java @@ -7,7 +7,7 @@ import org.gcube.informationsystem.model.embedded.ValueSchema; * @author Luca Frosini (ISTI - CNR) * @author Alessia Bardi (ISTI - CNR) */ -public interface P_Info_Facet extends P_Basic_Info_Facet { +public interface PE_Info_Facet extends PE_Basic_Info_Facet { public static final String NAME = "P_Info_Facet"; // P_Info_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture minimal metadata for PE1_Service"; diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java index d06c085..50d1171 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java @@ -6,7 +6,7 @@ import org.gcube.informationsystem.model.entity.resource.Actor; * @author Luca Frosini (ISTI - CNR) * Attached facets are: * - {@link IdentifierFacet} to map ID - * - {@link P_Contact_Reference_Facet} + * - {@link PE_Contact_Reference_Facet} * */ public interface E39_Actor extends Actor { diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java index 697677e..9376e77 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java @@ -3,7 +3,7 @@ package org.gcube.informationsystem.model.entity.resource.parthenos; import org.gcube.informationsystem.model.annotations.Abstract; import org.gcube.informationsystem.model.entity.facet.EventFacet; import org.gcube.informationsystem.model.entity.facet.IdentifierFacet; -import org.gcube.informationsystem.model.entity.facet.parthenos.P_Info_Facet; +import org.gcube.informationsystem.model.entity.facet.parthenos.PE_Info_Facet; import org.gcube.informationsystem.model.entity.resource.Service; import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity; @@ -11,7 +11,7 @@ import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity; * @author Luca Frosini (ISTI - CNR) * Attached facets are: * - {@link IdentifierFacet} to map ID - * - {@link P_Info_Facet} to map {title, description, competence,availability} + * - {@link PE_Info_Facet} to map {title, description, competence,availability} * * - {@link EventFacet} to map startTime * - {@link EventFacet} to map endTime diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java new file mode 100644 index 0000000..948ceb4 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java @@ -0,0 +1,14 @@ +package org.gcube.informationsystem.model.relation.consistsof.parthenos; + +import org.gcube.informationsystem.model.entity.facet.EventFacet; +import org.gcube.informationsystem.model.entity.resource.parthenos.PE1_Service; +import org.gcube.informationsystem.model.relation.ConsistsOf; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PP42_has_declarative_time + + extends ConsistsOf { + +}