- * - * @returns a collection of values for the PP32i_was_curated_by property. - */ - Collection getPP32i_was_curated_by(); - - /** - * Checks if the class has a PP32i_was_curated_by property value.
- * - * @return true if there is a PP32i_was_curated_by property value. - */ - boolean hasPP32i_was_curated_by(); - - /** - * Adds a PP32i_was_curated_by property value.
- * - * @param newPP32i_was_curated_by the PP32i_was_curated_by property value to be added - */ - void addPP32i_was_curated_by(PE3_Curating_Service newPP32i_was_curated_by); - - /** - * Removes a PP32i_was_curated_by property value.
- * - * @param oldPP32i_was_curated_by the PP32i_was_curated_by property value to be removed. - */ - void removePP32i_was_curated_by(PE3_Curating_Service oldPP32i_was_curated_by); - - - /* *************************************************** - * Property http://www.ics.forth.gr/isl/CRMpe/PP4i_is_object_hosted_by - */ - - /** - * Gets all property values for the PP4i_is_object_hosted_by property.
- * - * @returns a collection of values for the PP4i_is_object_hosted_by property. - */ - Collection getPP4i_is_object_hosted_by(); - - /** - * Checks if the class has a PP4i_is_object_hosted_by property value.
- * - * @return true if there is a PP4i_is_object_hosted_by property value. - */ - boolean hasPP4i_is_object_hosted_by(); - - /** - * Adds a PP4i_is_object_hosted_by property value.
- * - * @param newPP4i_is_object_hosted_by the PP4i_is_object_hosted_by property value to be added - */ - void addPP4i_is_object_hosted_by(PE2_Hosting_Service newPP4i_is_object_hosted_by); - - /** - * Removes a PP4i_is_object_hosted_by property value.
- * - * @param oldPP4i_is_object_hosted_by the PP4i_is_object_hosted_by property value to be removed. - */ - void removePP4i_is_object_hosted_by(PE2_Hosting_Service oldPP4i_is_object_hosted_by); - - - /* *************************************************** - * Common interfaces - */ - - - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java deleted file mode 100644 index 7e4090a..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE8_E_Service.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.entity; - - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface PE8_E_Service extends PE1_Service { - -} 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/E29_Design_or_Procedure.java index 544a9e1..38bcc97 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/E29_Design_or_Procedure.java @@ -4,6 +4,7 @@ import org.gcube.informationsystem.model.entity.Resource; /** * @author Luca Frosini (ISTI - CNR) + * TODO check if can be removed */ public interface E29_Design_or_Procedure extends 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/E39_Actor.java index 3595861..eb20207 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/E39_Actor.java @@ -2,7 +2,6 @@ package org.gcube.informationsystem.parthenos.model.entity.resource; import org.gcube.informationsystem.model.entity.resource.Actor; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java similarity index 71% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java index f74fbb6..19732fb 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/E40_Legal_Body.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E40_Legal_Body.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; 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/E65_Creation.java new file mode 100644 index 0000000..d5c2f64 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E65_Creation.java @@ -0,0 +1,11 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + +import org.gcube.informationsystem.model.entity.Resource; + +/** + * @author Luca Frosini (ISTI - CNR) + * TODO check if can be removed + */ +public interface E65_Creation extends 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/E70_Thing.java new file mode 100644 index 0000000..61a47d5 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E70_Thing.java @@ -0,0 +1,12 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + +import org.gcube.informationsystem.model.entity.Resource; + + +/** + * @author Luca Frosini (ISTI - CNR) + * TODO check if can be removed + */ +public interface E70_Thing extends 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/E7_Activity.java new file mode 100644 index 0000000..3d0e6de --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/E7_Activity.java @@ -0,0 +1,11 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + +import org.gcube.informationsystem.model.entity.Resource; + +/** + * @author Luca Frosini (ISTI - CNR) + * TODO check if can be removed + */ +public interface E7_Activity extends Resource { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE10_Digital_Curating_Service.java similarity index 64% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE10_Digital_Curating_Service.java index 88945ee..31f2ccc 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE10_Digital_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE10_Digital_Curating_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE11_Software_Curating_Service.java similarity index 66% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE11_Software_Curating_Service.java index 82b046a..1e58d97 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE11_Software_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE11_Software_Curating_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE12_Data_Curating_Service.java similarity index 66% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE12_Data_Curating_Service.java index f8aeee4..da6d8c7 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE12_Data_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE12_Data_Curating_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java similarity index 97% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java index 7571997..42bbb03 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE13_Software_Computing_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE13_Software_Computing_E_Service.java @@ -1,13 +1,10 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; 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.D14_Software; -import org.gcube.informationsystem.parthenos.model.entity.resource.D1_Digital_Object; -import org.gcube.informationsystem.parthenos.model.entity.resource.E39_Actor; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE14_Software_Delivery_E_Service.java similarity index 68% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE14_Software_Delivery_E_Service.java index 6390376..e67c0a7 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE14_Software_Delivery_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE14_Software_Delivery_E_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE15_Data_E_Service.java similarity index 66% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE15_Data_E_Service.java index da3c4fc..30c862b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE15_Data_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE15_Data_E_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE16_Curated_Software_E_Service.java similarity index 75% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE16_Curated_Software_E_Service.java index c6bb93a..717a5bc 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE16_Curated_Software_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE16_Curated_Software_E_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE17_Curated_Data_E_Service.java similarity index 68% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE17_Curated_Data_E_Service.java index 6a66edf..0b45a15 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE17_Curated_Data_E_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE17_Curated_Data_E_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** 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 new file mode 100644 index 0000000..4b2710d --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE19_Persistent_Digital_Object.java @@ -0,0 +1,10 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE19_Persistent_Digital_Object extends D1_Digital_Object { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java similarity index 71% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java index 0b47c58..1f099f9 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE1_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE1_Service.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; import org.gcube.informationsystem.model.entity.resource.Service; 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 new file mode 100644 index 0000000..a2eb3b9 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE20_Volatile_Digital_Object.java @@ -0,0 +1,10 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE20_Volatile_Digital_Object extends D1_Digital_Object { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java similarity index 51% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java index f6a2161..12b9ae0 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE21_Persistent_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE21_Persistent_Software.java @@ -1,6 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; -import org.gcube.informationsystem.parthenos.model.entity.resource.D14_Software; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE22_Persistent_Dataset.java similarity index 51% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE22_Persistent_Dataset.java index 8dd8622..7c66a89 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE22_Persistent_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE22_Persistent_Dataset.java @@ -1,6 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; -import org.gcube.informationsystem.parthenos.model.entity.resource.PE18_Dataset; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java similarity index 50% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java index 44f62c5..02a4437 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE23_Volatile_Software.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE23_Volatile_Software.java @@ -1,6 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; -import org.gcube.informationsystem.parthenos.model.entity.resource.D14_Software; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE24_Volatile_Dataset.java similarity index 50% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE24_Volatile_Dataset.java index 90ad4e6..16d540c 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE24_Volatile_Dataset.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE24_Volatile_Dataset.java @@ -1,6 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; -import org.gcube.informationsystem.parthenos.model.entity.resource.PE18_Dataset; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java similarity index 61% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java index 37d1961..7fa763b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE25_RI_Consortium.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE25_RI_Consortium.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java similarity index 60% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java index e2db3a1..eeced92 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE26_RI_Project.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE26_RI_Project.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** 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 new file mode 100644 index 0000000..d600f67 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE28_Curation_Plan.java @@ -0,0 +1,10 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE28_Curation_Plan extends E29_Design_or_Procedure { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE2_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE2_Hosting_Service.java new file mode 100644 index 0000000..0f9c29e --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE2_Hosting_Service.java @@ -0,0 +1,11 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + +import org.gcube.informationsystem.model.entity.resource.HostingNode; + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE2_Hosting_Service extends PE1_Service, HostingNode { + +} 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 new file mode 100644 index 0000000..2308e3b --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE32_Curated_Thing.java @@ -0,0 +1,9 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE32_Curated_Thing extends E70_Thing { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java similarity index 60% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java index 8389000..cbed4b1 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE3_Curating_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE3_Curating_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE5_Digital_Hosting_Service.java similarity index 63% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE5_Digital_Hosting_Service.java index fb3dde6..af2fd61 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE5_Digital_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE5_Digital_Hosting_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE6_Software_Hosting_Service.java similarity index 66% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE6_Software_Hosting_Service.java index d057af8..e19c150 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE6_Software_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE6_Software_Hosting_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE7_Data_Hosting_Service.java similarity index 65% rename from src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE7_Data_Hosting_Service.java index b683eab..bb4d006 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/PE7_Data_Hosting_Service.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE7_Data_Hosting_Service.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.entity; +package org.gcube.informationsystem.parthenos.model.entity.resource; + /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE8_E_Service.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE8_E_Service.java new file mode 100644 index 0000000..bb08978 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/PE8_E_Service.java @@ -0,0 +1,11 @@ +package org.gcube.informationsystem.parthenos.model.entity.resource; + +import org.gcube.informationsystem.model.entity.resource.EService; + + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PE8_E_Service extends PE1_Service, EService { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP28_has_designated_access_point.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP28_has_designated_access_point.java index c033666..f937f2c 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP28_has_designated_access_point.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP28_has_designated_access_point.java @@ -1,7 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; -import org.gcube.informationsystem.parthenos.model.entity.PE8_E_Service; import org.gcube.informationsystem.parthenos.model.entity.facet.PE29_Access_Point; +import org.gcube.informationsystem.parthenos.model.entity.resource.PE8_E_Service; import org.gcube.informationsystem.parthenos.model.relation.consistsof.P1_is_identified_by; /**