diff --git a/src/main/java/org/gcube/parthenosentities/model/PARTHENOSEntitiesRegistrationProvider.java b/src/main/java/org/gcube/parthenosentities/model/PARTHENOSEntitiesRegistrationProvider.java index 66fb87d..e8b7d2a 100644 --- a/src/main/java/org/gcube/parthenosentities/model/PARTHENOSEntitiesRegistrationProvider.java +++ b/src/main/java/org/gcube/parthenosentities/model/PARTHENOSEntitiesRegistrationProvider.java @@ -14,6 +14,9 @@ import org.gcube.parthenosentities.model.reference.relation.consistsof.parthenos import org.gcube.parthenosentities.model.reference.relation.isrelatedto.cidoc.P106_is_composed_of; import org.gcube.parthenosentities.model.reference.relation.isrelatedto.parthenos.PP1_currently_offers; +/** + * @author Luca Frosini (ISTI - CNR) + */ public class PARTHENOSEntitiesRegistrationProvider implements RegistrationProvider { public static final String PARTHENOS_ENTITIES_MODEL_NAME = "PARTHENOS Entities"; diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/cidoc/E51_Contact_Point.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/cidoc/E51_Contact_Point.java index 18cbd02..a7e00e7 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/cidoc/E51_Contact_Point.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/cidoc/E51_Contact_Point.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.facet.cidoc; import org.gcube.informationsystem.model.reference.entities.Facet; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E51_Contact_Point.NAME, description = E51_Contact_Point.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E51_Contact_Point extends Facet { + public static final String NAME = "E51_Contact_Point"; // E51_Contact_Point.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/E30_Right.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/E30_Right.java index 00c3d75..658fb34 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/E30_Right.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/E30_Right.java @@ -2,13 +2,20 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; /** * @author Luca Frosini (ISTI - CNR) * @author Alessia Bardi */ +@TypeMetadata(name = E30_Right.NAME, description = E30_Right.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E30_Right extends Facet { + public static final String NAME = "E30_Right"; // E30_Right.class.getSimpleName(); + @ISProperty public String getRights(); diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE29_Access_Point.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE29_Access_Point.java index 48d93b8..7381a83 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE29_Access_Point.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE29_Access_Point.java @@ -1,13 +1,21 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.facet.cidoc.E51_Contact_Point; import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; /** - * @author Luca Frosini (ISTI - CNR) + * @author Luca Frosini (ISTI - CNR) + * * This class comprises instances of web addresses and network addresses by * which e-services can be accessed. */ +@TypeMetadata(name = PE29_Access_Point.NAME, description = "This class comprises instances of web addresses and network addresses by which e-services can be accessed.", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE29_Access_Point extends E51_Contact_Point, AccessPointFacet { - + + public static final String NAME = "PE29_Access_Point"; // PE29_Access_Point.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Basic_Info_Facet.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Basic_Info_Facet.java index 4a4bb75..42a86e2 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Basic_Info_Facet.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Basic_Info_Facet.java @@ -2,14 +2,19 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE_Basic_Info_Facet.NAME, description = PE_Basic_Info_Facet.DESCRIPTION, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE_Basic_Info_Facet extends Facet { + public static final String NAME = "PE_Basic_Info_Facet"; // PE_Basic_Info_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture title and description metadata for Partenos Entities"; - public static final String VERSION = "1.0.0"; @ISProperty public String getTitle(); diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Contact_Reference_Facet.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Contact_Reference_Facet.java index 549b8e2..31632f4 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Contact_Reference_Facet.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Contact_Reference_Facet.java @@ -1,6 +1,9 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.types.annotations.ISProperty; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactReferenceFacet; @@ -9,10 +12,12 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.ContactRefer * @author Alessia Bardi (ISTI - CNR) * */ +@TypeMetadata(name = PE_Contact_Reference_Facet.NAME, description = PE_Contact_Reference_Facet.DESCRIPTION, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE_Contact_Reference_Facet extends ContactReferenceFacet { + public static final String NAME = "PE_Contact_Reference_Facet"; // PE_Contact_Reference_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture minimal metadata for E39_Actor"; - public static final String VERSION = "1.0.0"; @ISProperty public String getAppellation(); diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Info_Facet.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Info_Facet.java index 6a5371c..d49af36 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Info_Facet.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/facet/parthenos/PE_Info_Facet.java @@ -1,16 +1,21 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.types.annotations.ISProperty; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; /** * @author Luca Frosini (ISTI - CNR) * @author Alessia Bardi (ISTI - CNR) */ +@TypeMetadata(name = PE_Info_Facet.NAME, description = PE_Info_Facet.DESCRIPTION, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE_Info_Facet extends PE_Basic_Info_Facet { - + + public static final String NAME = "PE_Info_Facet"; // PE_Info_Facet.class.getSimpleName(); public static final String DESCRIPTION = "This facet is expected to capture minimal metadata for PE1_Service"; - public static final String VERSION = "1.0.0"; @ISProperty public ValueSchema getCompetence(); diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D14_Software.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D14_Software.java index 0b6c47b..6531d69 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D14_Software.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D14_Software.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = D14_Software.NAME, description = D14_Software.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface D14_Software extends D1_Digital_Object, Software { + public static final String NAME = "D14_Software"; // D14_Software.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D1_Digital_Object.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D1_Digital_Object.java index 01d0e94..4903459 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D1_Digital_Object.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D1_Digital_Object.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = D1_Digital_Object.NAME, description = D1_Digital_Object.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface D1_Digital_Object extends E70_Thing { + public static final String NAME = "D1_Digital_Object"; // D1_Digital_Object.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E19_Physical_Object.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E19_Physical_Object.java index f9be4b1..efd293b 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E19_Physical_Object.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E19_Physical_Object.java @@ -1,5 +1,9 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) * @@ -32,6 +36,10 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; * P57 has number of parts: E60 Number * */ +@TypeMetadata(name = E19_Physical_Object.NAME, description = "This class comprises items of a material nature that are units for documentation and have physical boundaries that separate them completely in an objective way from other objects.", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E19_Physical_Object extends E70_Thing { + public static final String NAME = "E19_Physical_Object"; // E19_Physical_Object.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E1_CRM_Entity.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E1_CRM_Entity.java index 9b0599d..cc5c077 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E1_CRM_Entity.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E1_CRM_Entity.java @@ -1,9 +1,13 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; import org.gcube.informationsystem.model.reference.entities.Resource; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; /** * @author Luca Frosini (ISTI - CNR) + * * Scope note: This class comprises all things in the universe of discourse of the CIDOC Conceptual Reference Model. * * It is an abstract concept providing for three general properties: @@ -29,6 +33,10 @@ import org.gcube.informationsystem.model.reference.entities.Resource; * P137 exemplifies (is exemplified by): E55 Type * (P137.1 in the taxonomic role: E55 Type) */ +@TypeMetadata(name = E1_CRM_Entity.NAME, description = "This class comprises all things in the universe of discourse of the CIDOC Conceptual Reference Model.", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E1_CRM_Entity extends Resource { + public static final String NAME = "E1_CRM_Entity"; // E1_CRM_Entity.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E21_Person.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E21_Person.java index 5a5c29d..b4cb6ab 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E21_Person.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E21_Person.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.resources.Person; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E21_Person.NAME, description = E21_Person.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E21_Person extends E39_Actor, Person { + public static final String NAME = "E21_Person"; // E21_Person.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E29_Design_or_Procedure.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E29_Design_or_Procedure.java index c2ad26f..7dda7dd 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E29_Design_or_Procedure.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E29_Design_or_Procedure.java @@ -1,9 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) - * TODO check if can be removed */ +@TypeMetadata(name = E29_Design_or_Procedure.NAME, description = E29_Design_or_Procedure.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E29_Design_or_Procedure extends E70_Thing { + public static final String NAME = "E29_Design_or_Procedure"; // E29_Design_or_Procedure.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E39_Actor.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E39_Actor.java index 7ce3ee0..0395126 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E39_Actor.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E39_Actor.java @@ -1,17 +1,24 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.facet.parthenos.PE_Contact_Reference_Facet; import org.gcube.resourcemanagement.model.reference.entities.facets.IdentifierFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; /** * @author Luca Frosini (ISTI - CNR) + * * Attached facets are: * - {@link IdentifierFacet} to map ID * - {@link PE_Contact_Reference_Facet} * */ +@TypeMetadata(name = E39_Actor.NAME, description = E39_Actor.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E39_Actor extends Actor, E77_Persistent_Item { + public static final String NAME = "E39_Actor"; // E39_Actor.class.getSimpleName(); } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E40_Legal_Body.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E40_Legal_Body.java index 057ddce..3b7157d 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E40_Legal_Body.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E40_Legal_Body.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.resources.LegalBody; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E40_Legal_Body.NAME, description = E40_Legal_Body.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E40_Legal_Body extends E74_Group, LegalBody { + public static final String NAME = "E40_Legal_Body"; // E40_Legal_Body.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E53_Place.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E53_Place.java index 0ae3750..b9c6495 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E53_Place.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E53_Place.java @@ -1,5 +1,9 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) * @@ -32,6 +36,10 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; * In First Order Logic: * E53(x) ⊃ E1(x) */ +@TypeMetadata(name = E53_Place.NAME, description = "This class comprises extents in space, in particular on the surface of the earth, in the pure sense of physics: independent from temporal phenomena and matter.", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E53_Place extends E1_CRM_Entity { + public static final String NAME = "E53_Place"; // E53_Place.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E54_Dimension.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E54_Dimension.java index f20026c..02025d1 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E54_Dimension.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E54_Dimension.java @@ -1,5 +1,9 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) * @@ -36,6 +40,10 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; * P90 has value: E60 Number * P91 has unit (is unit of): E58 Measurement Unit */ +@TypeMetadata(name = E54_Dimension.NAME, description = "This class comprises quantifiable properties that can be measured by some calibrated means and can be approximated by values, i.e. points or regions in a mathematical or conceptual space, such as natural or real numbers, RGB values etc.", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E54_Dimension extends E1_CRM_Entity { + public static final String NAME = "E54_Dimension"; // E54_Dimension.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E55_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E55_Type.java index 926b9de..ae00ceb 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E55_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E55_Type.java @@ -1,5 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +@TypeMetadata(name = E55_Type.NAME, description = E55_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E55_Type extends E70_Thing { + public static final String NAME = "E55_Type"; // E55_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E65_Creation.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E65_Creation.java index 0c9f752..cbf2326 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E65_Creation.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E65_Creation.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E65_Creation.NAME, description = E65_Creation.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E65_Creation extends E7_Activity { + public static final String NAME = "E65_Creation"; // E65_Creation.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E70_Thing.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E70_Thing.java index 06e49f4..e57f6f1 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E70_Thing.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E70_Thing.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E70_Thing.NAME, description = E70_Thing.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E70_Thing extends E77_Persistent_Item { + public static final String NAME = "E70_Thing"; // E70_Thing.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E74_Group.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E74_Group.java index 0459885..06d2dec 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E74_Group.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E74_Group.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = E74_Group.NAME, description = E74_Group.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E74_Group extends E39_Actor { + public static final String NAME = "E74_Group"; // E74_Group.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E77_Persistent_Item.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E77_Persistent_Item.java index 5f3b915..e35f166 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E77_Persistent_Item.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E77_Persistent_Item.java @@ -1,7 +1,12 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) + * * Scope note: This class comprises items that have a persistent identity, sometimes known as “endurants” in * philosophy. * @@ -31,6 +36,10 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; * In First Order Logic: * E77(x) ⊃ E1(x) */ +@TypeMetadata(name = E77_Persistent_Item.NAME, description = "This class comprises items that have a persistent identity, sometimes known as “endurants” in philosophy", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E77_Persistent_Item extends E1_CRM_Entity { + public static final String NAME = "E77_Persistent_Item"; // E77_Persistent_Item.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E78_Curated_Holding.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E78_Curated_Holding.java index 26f0492..a5716e8 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E78_Curated_Holding.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E78_Curated_Holding.java @@ -1,9 +1,13 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.parthenos.PE32_Curated_Thing; /** * @author Luca Frosini (ISTI - CNR) + * * Scope note: This class comprises aggregations of instances of E18 Physical Thing that are * assembled and maintained (“curated” and “preserved,” in museological terminology) by one or more * instances of E39 Actor over time for a specific purpose and audience, and according to a particular @@ -33,6 +37,10 @@ import org.gcube.parthenosentities.model.reference.entity.resource.parthenos.PE3 * Properties: * P109 has current or former curator (is current or former curator of): E39 Actor */ +@TypeMetadata(name = E78_Curated_Holding.NAME, description = "This class comprises aggregations of instances of E18 Physical Thing ...", version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E78_Curated_Holding extends PE32_Curated_Thing { + public static final String NAME = "E78_Curated_Holding"; // E78_Curated_Holding.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E7_Activity.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E7_Activity.java index f0f3900..4b22a91 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E7_Activity.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E7_Activity.java @@ -1,9 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) - * TODO check if can be removed */ +@TypeMetadata(name = E7_Activity.NAME, description = E7_Activity.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E7_Activity extends E1_CRM_Entity { + public static final String NAME = "E7_Activity"; // E7_Activity.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E97_Monetary_Amount.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E97_Monetary_Amount.java index 728c283..a35217c 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E97_Monetary_Amount.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E97_Monetary_Amount.java @@ -1,9 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) - * */ +@TypeMetadata(name = E97_Monetary_Amount.NAME, description = E97_Monetary_Amount.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface E97_Monetary_Amount extends E54_Dimension { + public static final String NAME = "E97_Monetary_Amount"; // E97_Monetary_Amount.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE10_Digital_Curating_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE10_Digital_Curating_Service.java index e4bedfa..47c4f0c 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE10_Digital_Curating_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE10_Digital_Curating_Service.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE10_Digital_Curating_Service.NAME, description = PE10_Digital_Curating_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE10_Digital_Curating_Service extends PE3_Curating_Service { + public static final String NAME = "PE10_Digital_Curating_Service"; // PE10_Digital_Curating_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE11_Software_Curating_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE11_Software_Curating_Service.java index 2bd1726..a0b7d84 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE11_Software_Curating_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE11_Software_Curating_Service.java @@ -1,9 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE11_Software_Curating_Service.NAME, description = PE11_Software_Curating_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE11_Software_Curating_Service extends PE10_Digital_Curating_Service { + public static final String NAME = "PE11_Software_Curating_Service"; // PE11_Software_Curating_Service.class.getSimpleName(); + + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE12_Data_Curating_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE12_Data_Curating_Service.java index f586dad..f616ef7 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE12_Data_Curating_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE12_Data_Curating_Service.java @@ -1,9 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE12_Data_Curating_Service.NAME, description = PE12_Data_Curating_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE12_Data_Curating_Service extends PE10_Digital_Curating_Service { + public static final String NAME = "PE12_Data_Curating_Service"; // PE12_Data_Curating_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE13_Software_Computing_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE13_Software_Computing_EService.java index 5e9a0fc..1b93593 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE13_Software_Computing_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE13_Software_Computing_EService.java @@ -1,11 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE13_Software_Computing_EService.NAME, description = PE13_Software_Computing_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE13_Software_Computing_EService extends PE8_EService, PE6_Software_Hosting_Service { - //public static final String NAME = "PE13_Software_Computing_E-Service"; + public static final String NAME = "PE13_Software_Computing_E-Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE14_Software_Delivery_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE14_Software_Delivery_EService.java index a96e611..478040b 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE14_Software_Delivery_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE14_Software_Delivery_EService.java @@ -1,11 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE14_Software_Delivery_EService.NAME, description = PE14_Software_Delivery_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE14_Software_Delivery_EService extends PE8_EService, PE6_Software_Hosting_Service { - //public static final String NAME = "PE14_Software_Delivery_E-Service"; + public static final String NAME = "PE14_Software_Delivery_E-Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE15_Data_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE15_Data_EService.java index c41101a..89c8f47 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE15_Data_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE15_Data_EService.java @@ -1,11 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE15_Data_EService.NAME, description = PE15_Data_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE15_Data_EService extends PE8_EService, PE7_Data_Hosting_Service { - //public static final String NAME = "PE15_Data_E-Service"; + public static final String NAME = "PE15_Data_E-Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE16_Curated_Software_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE16_Curated_Software_EService.java index 85bd2f9..cd56ddd 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE16_Curated_Software_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE16_Curated_Software_EService.java @@ -1,12 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE16_Curated_Software_EService.NAME, description = PE16_Curated_Software_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE16_Curated_Software_EService extends PE11_Software_Curating_Service, PE14_Software_Delivery_EService, PE13_Software_Computing_EService { - //public static final String NAME = "PE16_Curated_Software_E-Service"; + public static final String NAME = "PE16_Curated_Software_E-Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE17_Curated_Data_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE17_Curated_Data_EService.java index 99acdf5..3eebd66 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE17_Curated_Data_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE17_Curated_Data_EService.java @@ -1,11 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE17_Curated_Data_EService.NAME, description = PE17_Curated_Data_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE17_Curated_Data_EService extends PE12_Data_Curating_Service, PE15_Data_EService { - //public static final String NAME = "PE17_Curated_Data_E-Service"; + public static final String NAME = "PE17_Curated_Data_E-Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE18_Dataset.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE18_Dataset.java index b635852..66a1574 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE18_Dataset.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE18_Dataset.java @@ -1,11 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D1_Digital_Object; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE18_Dataset.NAME, description = PE18_Dataset.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE18_Dataset extends Dataset, D1_Digital_Object { + public static final String NAME = "PE18_Dataset"; // PE18_Dataset.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE19_Persistent_Digital_Object.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE19_Persistent_Digital_Object.java index cf2cb7d..1925e13 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE19_Persistent_Digital_Object.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE19_Persistent_Digital_Object.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D1_Digital_Object; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE19_Persistent_Digital_Object.NAME, description = PE19_Persistent_Digital_Object.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE19_Persistent_Digital_Object extends D1_Digital_Object { + public static final String NAME = "PE19_Persistent_Digital_Object"; // PE19_Persistent_Digital_Object.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE1_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE1_Service.java index 97d91e2..5f7ce2e 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE1_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE1_Service.java @@ -1,6 +1,9 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; import org.gcube.informationsystem.types.annotations.Abstract; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.facet.parthenos.E30_Right; import org.gcube.parthenosentities.model.reference.entity.facet.parthenos.PE_Info_Facet; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E7_Activity; @@ -10,6 +13,7 @@ import org.gcube.resourcemanagement.model.reference.entities.resources.Service; /** * @author Luca Frosini (ISTI - CNR) + * * Attached facets are: * - {@link IdentifierFacet} to map ID * - {@link PE_Info_Facet} to map {title, description, competence,availability} @@ -26,6 +30,10 @@ import org.gcube.resourcemanagement.model.reference.entities.resources.Service; * */ @Abstract +@TypeMetadata(name = PE1_Service.NAME, description = PE1_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE1_Service extends Service, E7_Activity { + public static final String NAME = "PE1_Service"; // PE1_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE20_Volatile_Digital_Object.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE20_Volatile_Digital_Object.java index 2d7db60..6bcb4e5 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE20_Volatile_Digital_Object.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE20_Volatile_Digital_Object.java @@ -1,11 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D1_Digital_Object; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE20_Volatile_Digital_Object.NAME, description = PE20_Volatile_Digital_Object.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE20_Volatile_Digital_Object extends PE32_Curated_Thing, D1_Digital_Object { + public static final String NAME = "PE20_Volatile_Digital_Object"; // PE20_Volatile_Digital_Object.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE21_Persistent_Software.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE21_Persistent_Software.java index 029f2ed..8c986f0 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE21_Persistent_Software.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE21_Persistent_Software.java @@ -1,11 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D14_Software; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE21_Persistent_Software.NAME, description = PE21_Persistent_Software.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE21_Persistent_Software extends D14_Software, PE19_Persistent_Digital_Object { + public static final String NAME = "PE21_Persistent_Software"; // PE21_Persistent_Software.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE22_Persistent_Dataset.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE22_Persistent_Dataset.java index 26401b0..a22ee7a 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE22_Persistent_Dataset.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE22_Persistent_Dataset.java @@ -1,9 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE22_Persistent_Dataset.NAME, description = PE22_Persistent_Dataset.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE22_Persistent_Dataset extends PE18_Dataset, PE19_Persistent_Digital_Object { + public static final String NAME = "PE22_Persistent_Dataset"; // PE22_Persistent_Dataset.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE23_Volatile_Software.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE23_Volatile_Software.java index 0c1c0c4..dfe32a0 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE23_Volatile_Software.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE23_Volatile_Software.java @@ -1,11 +1,18 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D14_Software; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE23_Volatile_Software.NAME, description = PE23_Volatile_Software.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE23_Volatile_Software extends D14_Software, PE20_Volatile_Digital_Object { + public static final String NAME = "PE23_Volatile_Software"; // PE23_Volatile_Software.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE24_Volatile_Dataset.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE24_Volatile_Dataset.java index 4d71d1d..3c1b7a7 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE24_Volatile_Dataset.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE24_Volatile_Dataset.java @@ -1,9 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE24_Volatile_Dataset.NAME, description = PE24_Volatile_Dataset.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE24_Volatile_Dataset extends PE18_Dataset, PE20_Volatile_Digital_Object { + public static final String NAME = "PE24_Volatile_Dataset"; // PE24_Volatile_Dataset.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE25_RI_Consortium.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE25_RI_Consortium.java index 9ae3266..d3ab583 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE25_RI_Consortium.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE25_RI_Consortium.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E40_Legal_Body; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE25_RI_Consortium.NAME, description = PE25_RI_Consortium.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE25_RI_Consortium extends E40_Legal_Body { + public static final String NAME = "PE25_RI_Consortium"; // PE25_RI_Consortium.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE26_RI_Project.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE26_RI_Project.java index 91b122d..057974a 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE26_RI_Project.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE26_RI_Project.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E7_Activity; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE26_RI_Project.NAME, description = PE26_RI_Project.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE26_RI_Project extends E7_Activity { + public static final String NAME = "PE26_RI_Project"; // PE26_RI_Project.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE28_Curation_Plan.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE28_Curation_Plan.java index aaa86d6..a94aeb5 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE28_Curation_Plan.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE28_Curation_Plan.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E29_Design_or_Procedure; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE28_Curation_Plan.NAME, description = PE28_Curation_Plan.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE28_Curation_Plan extends E29_Design_or_Procedure { + public static final String NAME = "PE28_Curation_Plan"; // PE28_Curation_Plan.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE2_Hosting_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE2_Hosting_Service.java index be0148a..119259f 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE2_Hosting_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE2_Hosting_Service.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE2_Hosting_Service.NAME, description = PE2_Hosting_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE2_Hosting_Service extends PE1_Service { + public static final String NAME = "PE2_Hosting_Service"; // PE2_Hosting_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE32_Curated_Thing.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE32_Curated_Thing.java index 0db52ca..eb3401a 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE32_Curated_Thing.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE32_Curated_Thing.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E70_Thing; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE32_Curated_Thing.NAME, description = PE32_Curated_Thing.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE32_Curated_Thing extends E70_Thing { + public static final String NAME = "PE32_Curated_Thing"; // PE32_Curated_Thing.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java index 58023f2..db4e3ab 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java @@ -1,10 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE33_EAccess_Brokering_Service.NAME, description = PE33_EAccess_Brokering_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE33_EAccess_Brokering_Service extends PE8_EService { - //public static final String NAME = "PE33_E-Access_Brokering_Service"; + public static final String NAME = "PE33_E-Access_Brokering_Service"; } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE34_Team.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE34_Team.java index 86734a8..75b70ac 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE34_Team.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE34_Team.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E74_Group; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE34_Team.NAME, description = PE34_Team.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE34_Team extends E74_Group { + public static final String NAME = "PE34_Team"; // PE34_Team.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE35_Project.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE35_Project.java index e1c5644..f8259a4 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE35_Project.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE35_Project.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E7_Activity; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE35_Project.NAME, description = PE35_Project.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE35_Project extends E7_Activity { + public static final String NAME = "PE35_Project"; // PE35_Project.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE36_Competency_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE36_Competency_Type.java index 17e5eed..453af93 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE36_Competency_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE36_Competency_Type.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE36_Competency_Type.NAME, description = PE36_Competency_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE36_Competency_Type extends E55_Type { + public static final String NAME = "PE36_Competency_Type"; // PE36_Competency_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE37_Protocol_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE37_Protocol_Type.java index 6b1512d..394c1c8 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE37_Protocol_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE37_Protocol_Type.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE37_Protocol_Type.NAME, description = PE37_Protocol_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE37_Protocol_Type extends E55_Type { + public static final String NAME = "PE37_Protocol_Type"; // PE37_Protocol_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE38_Schema.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE38_Schema.java index b89989a..4b88b96 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE38_Schema.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE38_Schema.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D14_Software; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE38_Schema.NAME, description = PE38_Schema.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE38_Schema extends D14_Software { - + + public static final String NAME = "PE38_Schema"; // PE38_Schema.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE39_Availability_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE39_Availability_Type.java index bc6c2c3..80695b4 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE39_Availability_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE39_Availability_Type.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE39_Availability_Type.NAME, description = PE39_Availability_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE39_Availability_Type extends E55_Type { + public static final String NAME = "PE39_Availability_Type"; // PE39_Availability_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE3_Curating_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE3_Curating_Service.java index abcfb7d..149d79e 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE3_Curating_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE3_Curating_Service.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE3_Curating_Service.NAME, description = PE3_Curating_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE3_Curating_Service extends PE1_Service { + public static final String NAME = "PE3_Curating_Service"; // PE3_Curating_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE40_Programing_Language.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE40_Programing_Language.java index d558e1b..b443838 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE40_Programing_Language.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE40_Programing_Language.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE40_Programing_Language.NAME, description = PE40_Programing_Language.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE40_Programing_Language extends E55_Type { - + + public static final String NAME = "PE40_Programing_Language"; // PE40_Programing_Language.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE41_Award_Activity.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE41_Award_Activity.java index 653951e..8f80cf3 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE41_Award_Activity.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE41_Award_Activity.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E7_Activity; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE41_Award_Activity.NAME, description = PE41_Award_Activity.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE41_Award_Activity extends E7_Activity { - + + public static final String NAME = "PE41_Award_Activity"; // PE41_Award_Activity.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE42_Funding_Activity.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE42_Funding_Activity.java index eb1ddf6..160f0e7 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE42_Funding_Activity.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE42_Funding_Activity.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE42_Funding_Activity.NAME, description = PE42_Funding_Activity.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE42_Funding_Activity extends PE41_Award_Activity { + public static final String NAME = "PE42_Funding_Activity"; // PE42_Funding_Activity.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE43_Encoding_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE43_Encoding_Type.java index 62b6fb3..b2b0ee8 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE43_Encoding_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE43_Encoding_Type.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE43_Encoding_Type.NAME, description = PE43_Encoding_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE43_Encoding_Type extends E55_Type { - + + public static final String NAME = "PE43_Encoding_Type"; // PE43_Encoding_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE44_Audience_Type.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE44_Audience_Type.java index 81d9217..b4e6b7a 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE44_Audience_Type.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE44_Audience_Type.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E55_Type; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE44_Audience_Type.NAME, description = PE44_Audience_Type.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE44_Audience_Type extends E55_Type { + public static final String NAME = "PE44_Audience_Type"; // PE44_Audience_Type.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE5_Digital_Hosting_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE5_Digital_Hosting_Service.java index 979386c..a6ccaaf 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE5_Digital_Hosting_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE5_Digital_Hosting_Service.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE5_Digital_Hosting_Service.NAME, description = PE5_Digital_Hosting_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE5_Digital_Hosting_Service extends PE2_Hosting_Service { - + + public static final String NAME = "PE5_Digital_Hosting_Service"; // PE5_Digital_Hosting_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE6_Software_Hosting_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE6_Software_Hosting_Service.java index 4721d4d..2333190 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE6_Software_Hosting_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE6_Software_Hosting_Service.java @@ -1,10 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE6_Software_Hosting_Service.NAME, description = PE6_Software_Hosting_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE6_Software_Hosting_Service extends PE5_Digital_Hosting_Service, HostingNode { + + public static final String NAME = "PE6_Software_Hosting_Service"; // PE6_Software_Hosting_Service.class.getSimpleName(); } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE7_Data_Hosting_Service.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE7_Data_Hosting_Service.java index 341d14a..a6a91d6 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE7_Data_Hosting_Service.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE7_Data_Hosting_Service.java @@ -1,8 +1,16 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; + /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE7_Data_Hosting_Service.NAME, description = PE7_Data_Hosting_Service.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE7_Data_Hosting_Service extends PE5_Digital_Hosting_Service { + public static final String NAME = "PE7_Data_Hosting_Service"; // PE7_Data_Hosting_Service.class.getSimpleName(); + } diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE8_EService.java b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE8_EService.java index 09354c1..e95d3d5 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE8_EService.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE8_EService.java @@ -1,12 +1,17 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; +import org.gcube.informationsystem.types.reference.Change; +import org.gcube.informationsystem.types.reference.TypeMetadata; +import org.gcube.informationsystem.utils.Version; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; /** * @author Luca Frosini (ISTI - CNR) */ +@TypeMetadata(name = PE8_EService.NAME, description = PE8_EService.NAME, version = Version.MINIMAL_VERSION_STRING) +@Change(version = Version.MINIMAL_VERSION_STRING, description = Version.MINIMAL_VERSION_DESCRIPTION) public interface PE8_EService extends PE1_Service, EService { - //public static final String NAME = "PE8_E-Service"; + public static final String NAME = "PE8_E-Service"; } diff --git a/src/test/java/org/gcube/parthenosentities/model/discovery/DiscoveryTest.java b/src/test/java/org/gcube/parthenosentities/model/discovery/DiscoveryTest.java new file mode 100644 index 0000000..f84cda7 --- /dev/null +++ b/src/test/java/org/gcube/parthenosentities/model/discovery/DiscoveryTest.java @@ -0,0 +1,25 @@ +package org.gcube.parthenosentities.model.discovery; + +import org.gcube.informationsystem.base.reference.AccessType; +import org.gcube.informationsystem.base.reference.Element; +import org.gcube.informationsystem.discovery.knowledge.ModelKnowledge; +import org.gcube.informationsystem.serialization.ElementMapper; +import org.gcube.informationsystem.tree.Tree; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DiscoveryTest { + + private static Logger logger = LoggerFactory.getLogger(DiscoveryTest.class); + + @Test + public void test() throws Exception { + ModelKnowledge modelKnowledge = ElementMapper.getGlobalModelKnowledgeInstance(); + modelKnowledge.createKnowledge(); + for(AccessType at : AccessType.getModelTypes()) { + Tree> tree = modelKnowledge.getClassesTree(at); + logger.info("\n{}", tree.toString()); + } + } +}