diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java index 42bbb03..985bdad 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java @@ -5,6 +5,10 @@ import java.util.Collection; import javax.xml.datatype.XMLGregorianCalendar; import org.gcube.informationsystem.parthenos.model.entity.facet.PE29_Access_Point; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D14_Software; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D1_Digital_Object; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E39_Actor; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E70_Thing; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE18_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE18_Dataset.java index a119df1..95284b9 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE18_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE18_Dataset.java @@ -1,6 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; import org.gcube.informationsystem.model.entity.resource.Dataset; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D1_Digital_Object; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE19_Persistent_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE19_Persistent_Digital_Object.java index 4b2710d..9db822b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE19_Persistent_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE19_Persistent_Digital_Object.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D1_Digital_Object; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java index 1f099f9..126cb4b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java @@ -1,6 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; import org.gcube.informationsystem.model.entity.resource.Service; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E7_Activity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE20_Volatile_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE20_Volatile_Digital_Object.java index a2eb3b9..82fead9 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE20_Volatile_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE20_Volatile_Digital_Object.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D1_Digital_Object; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java index 12b9ae0..b891a0b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D14_Software; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java index 02a4437..52b1566 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.D14_Software; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java index 7fa763b..a9cf0ec 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E40_Legal_Body; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java index eeced92..2bc9cb0 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E7_Activity; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE28_Curation_Plan.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE28_Curation_Plan.java index d600f67..ba9f276 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE28_Curation_Plan.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE28_Curation_Plan.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E29_Design_or_Procedure; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE32_Curated_Thing.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE32_Curated_Thing.java index 2308e3b..05e6aac 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE32_Curated_Thing.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE32_Curated_Thing.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; +import org.gcube.informationsystem.parthenos.model.entity.resource.cdoc.E70_Thing; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D14_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D14_Software.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D14_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D14_Software.java index bbb8099..13ea91d 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D14_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D14_Software.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.resource.Software; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D1_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D1_Digital_Object.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D1_Digital_Object.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D1_Digital_Object.java index ac891f0..e93d9b4 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/D1_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/D1_Digital_Object.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.Resource; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E29_Design_or_Procedure.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E29_Design_or_Procedure.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E29_Design_or_Procedure.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E29_Design_or_Procedure.java index 38bcc97..9efc939 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E29_Design_or_Procedure.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E29_Design_or_Procedure.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.Resource; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E39_Actor.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E39_Actor.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E39_Actor.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E39_Actor.java index eb20207..4c8419b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E39_Actor.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E39_Actor.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.resource.Actor; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E40_Legal_Body.java similarity index 95% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E40_Legal_Body.java index 19732fb..c5ecc87 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E40_Legal_Body.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.resource.LegalBody; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E65_Creation.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E65_Creation.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E65_Creation.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E65_Creation.java index d5c2f64..44942d1 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E65_Creation.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E65_Creation.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.Resource; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E70_Thing.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E70_Thing.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E70_Thing.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E70_Thing.java index 61a47d5..99bac83 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E70_Thing.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E70_Thing.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.Resource; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E7_Activity.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E7_Activity.java similarity index 96% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E7_Activity.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E7_Activity.java index 3d0e6de..cf6dca7 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E7_Activity.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cdoc/E7_Activity.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity.resource; +package org.gcube.informationsystem.parthenos.model.entity.resource.cdoc; import org.gcube.informationsystem.model.entity.Resource;