diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/D14_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/D14_Software.java similarity index 58% rename from src/main/java/org/gcube/informationsystem/parthenos/model/D14_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/D14_Software.java index 93913c9..0508c75 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/D14_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/D14_Software.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/D1_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/D1_Digital_Object.java similarity index 59% rename from src/main/java/org/gcube/informationsystem/parthenos/model/D1_Digital_Object.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/D1_Digital_Object.java index f8bdd69..a453155 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/D1_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/D1_Digital_Object.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E29_Design_or_Procedure.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E29_Design_or_Procedure.java similarity index 60% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E29_Design_or_Procedure.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E29_Design_or_Procedure.java index 596764d..4990270 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E29_Design_or_Procedure.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E29_Design_or_Procedure.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E39_Actor.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E39_Actor.java similarity index 56% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E39_Actor.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E39_Actor.java index ad6c424..b39c6f2 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E39_Actor.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E39_Actor.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E40_Legal_Body.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java similarity index 58% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E40_Legal_Body.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java index 81ce2d6..52ae314 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E40_Legal_Body.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E51_Contact_Point.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E51_Contact_Point.java similarity index 58% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E51_Contact_Point.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E51_Contact_Point.java index 094c5ba..d8086e4 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E51_Contact_Point.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E51_Contact_Point.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E65_Creation.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E65_Creation.java similarity index 57% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E65_Creation.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E65_Creation.java index 9411655..a53bde4 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E65_Creation.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E65_Creation.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E70_Thing.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E70_Thing.java similarity index 56% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E70_Thing.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E70_Thing.java index 36954ea..1b2e235 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E70_Thing.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E70_Thing.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/E7_Activity.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E7_Activity.java similarity index 57% rename from src/main/java/org/gcube/informationsystem/parthenos/model/E7_Activity.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/E7_Activity.java index 8504860..65fda4b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/E7_Activity.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E7_Activity.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE10_Digital_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java similarity index 68% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE10_Digital_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java index 9ebd795..88945ee 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE10_Digital_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE11_Software_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java similarity index 70% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE11_Software_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java index aed38ab..82b046a 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE11_Software_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE12_Data_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java similarity index 69% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE12_Data_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java index 90663b9..f8aeee4 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE12_Data_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE13_Software_Computing_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java similarity index 99% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE13_Software_Computing_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java index 2d5dfb3..3029617 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE13_Software_Computing_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; import java.util.Collection; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE14_Software_Delivery_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java similarity index 72% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE14_Software_Delivery_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java index bc9fbc7..6390376 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE14_Software_Delivery_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE15_Data_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java similarity index 69% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE15_Data_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java index 8ad4d2c..da3c4fc 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE15_Data_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE16_Curated_Software_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java similarity index 78% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE16_Curated_Software_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java index 9a9aa4e..c6bb93a 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE16_Curated_Software_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE17_Curated_Data_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java similarity index 72% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE17_Curated_Data_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java index 4059b34..6a66edf 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE17_Curated_Data_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE18_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE18_Dataset.java similarity index 64% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE18_Dataset.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE18_Dataset.java index d3ed227..38b35e7 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE18_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE18_Dataset.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE19_Persistent_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE19_Persistent_Digital_Object.java similarity index 67% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE19_Persistent_Digital_Object.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE19_Persistent_Digital_Object.java index 9082a50..5a1063c 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE19_Persistent_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE19_Persistent_Digital_Object.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE1_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java similarity index 62% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE1_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java index b21981d..410be4b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE1_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE20_Volatile_Digital_Object.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE20_Volatile_Digital_Object.java similarity index 67% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE20_Volatile_Digital_Object.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE20_Volatile_Digital_Object.java index ee1b0bc..69938c7 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE20_Volatile_Digital_Object.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE20_Volatile_Digital_Object.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE21_Persistent_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java similarity index 71% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE21_Persistent_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java index 0066eb0..a798e3b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE21_Persistent_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE22_Persistent_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java similarity index 71% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE22_Persistent_Dataset.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java index a5d97a4..4645d41 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE22_Persistent_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE23_Volatile_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java similarity index 70% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE23_Volatile_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java index 9a074fa..fb05840 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE23_Volatile_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE24_Volatile_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java similarity index 70% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE24_Volatile_Dataset.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java index 6c43118..5df5e37 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE24_Volatile_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE25_RI_Consortium.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java similarity index 64% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE25_RI_Consortium.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java index c8fd5c5..37d1961 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE25_RI_Consortium.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE26_RI_Project.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java similarity index 63% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE26_RI_Project.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java index 6e64164..e2db3a1 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE26_RI_Project.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE28_Curation_Plan.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE28_Curation_Plan.java similarity index 66% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE28_Curation_Plan.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE28_Curation_Plan.java index 154a104..b3917df 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE28_Curation_Plan.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE28_Curation_Plan.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE29_Access_Point.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE29_Access_Point.java similarity index 65% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE29_Access_Point.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE29_Access_Point.java index 9e71779..dad5ec9 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE29_Access_Point.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE29_Access_Point.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE2_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE2_Hosting_Service.java similarity index 64% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE2_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE2_Hosting_Service.java index d5e3170..f938067 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE2_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE2_Hosting_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE32_Curated_Thing.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE32_Curated_Thing.java similarity index 97% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE32_Curated_Thing.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE32_Curated_Thing.java index 463ae7c..a81cc01 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE32_Curated_Thing.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE32_Curated_Thing.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; import java.util.Collection; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE3_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java similarity index 64% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE3_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java index a01319f..8389000 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE3_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE5_Digital_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java similarity index 67% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE5_Digital_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java index a83418b..fb3dde6 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE5_Digital_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE6_Software_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java similarity index 69% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE6_Software_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java index d4ad300..d057af8 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE6_Software_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE7_Data_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java similarity index 68% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE7_Data_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java index e1ebe74..b683eab 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE7_Data_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/PE8_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java similarity index 63% rename from src/main/java/org/gcube/informationsystem/parthenos/model/PE8_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java index 027007f..7e4090a 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/PE8_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model; +package org.gcube.informationsystem.parthenos.model.entity; /**