From 57f7e7c77b826f8296e8c219ff43f07ebe8d73c5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 6 Feb 2019 09:18:06 +0000 Subject: [PATCH] Reorganized gCube Model packages git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/parthenos-entities@177008 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../reference/entity/facet/parthenos/PE29_Access_Point.java | 2 +- .../entity/facet/parthenos/PE_Contact_Reference_Facet.java | 4 ++-- .../reference/entity/facet/parthenos/PE_Info_Facet.java | 2 +- .../model/reference/entity/resource/cidoc/D14_Software.java | 2 +- .../model/reference/entity/resource/cidoc/E21_Person.java | 2 +- .../model/reference/entity/resource/cidoc/E39_Actor.java | 4 ++-- .../reference/entity/resource/cidoc/E40_Legal_Body.java | 2 +- .../reference/entity/resource/parthenos/PE18_Dataset.java | 2 +- .../reference/entity/resource/parthenos/PE1_Service.java | 6 +++--- .../entity/resource/parthenos/PE2_Hosting_Service.java | 2 +- .../reference/entity/resource/parthenos/PE8_EService.java | 2 +- .../consistsof/parthenos/PP42_has_declarative_time.java | 2 +- .../relation/isrelatedto/parthenos/PP8_hosts_dataset.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) 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 0becce6..48d93b8 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,7 +1,7 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.parthenosentities.model.reference.entity.facet.cidoc.E51_Contact_Point; -import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; /** * @author Luca Frosini (ISTI - CNR) 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 bcb1cdd..549b8e2 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,8 +1,8 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.types.annotations.ISProperty; -import org.gcube.resourcemanagement.model.reference.entity.facet.ContactFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.ContactReferenceFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.ContactReferenceFacet; /** * @author Luca Frosini (ISTI - CNR) 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 bf20e2c..6a5371c 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,7 +1,7 @@ package org.gcube.parthenosentities.model.reference.entity.facet.parthenos; import org.gcube.informationsystem.types.annotations.ISProperty; -import org.gcube.resourcemanagement.model.reference.entity.properties.ValueSchema; +import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; /** * @author Luca Frosini (ISTI - CNR) 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 a3bee1e..0b6c47b 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,6 +1,6 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; -import org.gcube.resourcemanagement.model.reference.entity.resource.Software; +import org.gcube.resourcemanagement.model.reference.entities.resources.Software; /** * @author Luca Frosini (ISTI - CNR) 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 425ed18..5a5c29d 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,6 +1,6 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; -import org.gcube.resourcemanagement.model.reference.entity.resource.Person; +import org.gcube.resourcemanagement.model.reference.entities.resources.Person; /** * @author Luca Frosini (ISTI - CNR) 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 4cab468..7ce3ee0 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,8 +1,8 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; import org.gcube.parthenosentities.model.reference.entity.facet.parthenos.PE_Contact_Reference_Facet; -import org.gcube.resourcemanagement.model.reference.entity.facet.IdentifierFacet; -import org.gcube.resourcemanagement.model.reference.entity.resource.Actor; +import org.gcube.resourcemanagement.model.reference.entities.facets.IdentifierFacet; +import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; /** * @author Luca Frosini (ISTI - CNR) 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 d5b2738..057ddce 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,6 +1,6 @@ package org.gcube.parthenosentities.model.reference.entity.resource.cidoc; -import org.gcube.resourcemanagement.model.reference.entity.resource.LegalBody; +import org.gcube.resourcemanagement.model.reference.entities.resources.LegalBody; /** * @author Luca Frosini (ISTI - CNR) 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 b33da92..b635852 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,7 +1,7 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; import org.gcube.parthenosentities.model.reference.entity.resource.cidoc.D1_Digital_Object; -import org.gcube.resourcemanagement.model.reference.entity.resource.Dataset; +import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; /** * @author Luca Frosini (ISTI - CNR) 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 c09a8cd..97d91e2 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 @@ -4,9 +4,9 @@ import org.gcube.informationsystem.types.annotations.Abstract; 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; -import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.IdentifierFacet; -import org.gcube.resourcemanagement.model.reference.entity.resource.Service; +import org.gcube.resourcemanagement.model.reference.entities.facets.EventFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.IdentifierFacet; +import org.gcube.resourcemanagement.model.reference.entities.resources.Service; /** * @author Luca Frosini (ISTI - CNR) 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 0433687..9f634d9 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,6 +1,6 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; -import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; /** * @author Luca Frosini (ISTI - CNR) 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 1ed274f..09354c1 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,6 +1,6 @@ package org.gcube.parthenosentities.model.reference.entity.resource.parthenos; -import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entities.resources.EService; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/relation/consistsof/parthenos/PP42_has_declarative_time.java b/src/main/java/org/gcube/parthenosentities/model/reference/relation/consistsof/parthenos/PP42_has_declarative_time.java index 63b295e..6c00dad 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/relation/consistsof/parthenos/PP42_has_declarative_time.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/relation/consistsof/parthenos/PP42_has_declarative_time.java @@ -2,7 +2,7 @@ package org.gcube.parthenosentities.model.reference.relation.consistsof.partheno import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.parthenosentities.model.reference.entity.resource.parthenos.PE1_Service; -import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.EventFacet; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/parthenosentities/model/reference/relation/isrelatedto/parthenos/PP8_hosts_dataset.java b/src/main/java/org/gcube/parthenosentities/model/reference/relation/isrelatedto/parthenos/PP8_hosts_dataset.java index b072a82..9b49be0 100644 --- a/src/main/java/org/gcube/parthenosentities/model/reference/relation/isrelatedto/parthenos/PP8_hosts_dataset.java +++ b/src/main/java/org/gcube/parthenosentities/model/reference/relation/isrelatedto/parthenos/PP8_hosts_dataset.java @@ -2,7 +2,7 @@ package org.gcube.parthenosentities.model.reference.relation.isrelatedto.parthen import org.gcube.parthenosentities.model.reference.entity.resource.parthenos.PE18_Dataset; import org.gcube.parthenosentities.model.reference.entity.resource.parthenos.PE7_Data_Hosting_Service; -import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Manages; +import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manages; /** * @author Luca Frosini (ISTI - CNR)