From 19213f2faf7a7504ec66683daa446b6e624feb6a Mon Sep 17 00:00:00 2001 From: Luca Frosini <luca.frosini@isti.cnr.it> Date: Tue, 31 Jan 2017 14:54:03 +0000 Subject: [PATCH] Creating Parthenos Entities Mapping to gCube Resources git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/parthenos-entities@141959 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../model/entity/facet/parthenos/PE29_Access_Point.java | 2 +- .../model/entity/resource/cidoc/E70_Thing.java | 1 - .../model/relation/PP14_runs_on_request.java | 7 ++++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java index 44ce3c8..12c6091 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java @@ -4,7 +4,7 @@ import org.gcube.informationsystem.model.entity.facet.AccessPointFacet; import org.gcube.informationsystem.model.entity.facet.cidoc.E51_Contact_Point; /** - * @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. */ diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E70_Thing.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E70_Thing.java index 84df93d..4969eb4 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E70_Thing.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E70_Thing.java @@ -2,7 +2,6 @@ package org.gcube.informationsystem.model.entity.resource.cidoc; import org.gcube.informationsystem.model.entity.Resource; - /** * @author Luca Frosini (ISTI - CNR) * TODO check if can be removed diff --git a/src/main/java/org/gcube/informationsystem/model/relation/PP14_runs_on_request.java b/src/main/java/org/gcube/informationsystem/model/relation/PP14_runs_on_request.java index 21cb600..ae7d380 100644 --- a/src/main/java/org/gcube/informationsystem/model/relation/PP14_runs_on_request.java +++ b/src/main/java/org/gcube/informationsystem/model/relation/PP14_runs_on_request.java @@ -1,11 +1,16 @@ package org.gcube.informationsystem.model.relation; +import org.gcube.informationsystem.model.entity.resource.cidoc.D14_Software; +import org.gcube.informationsystem.model.entity.resource.parthenos.PE13_Software_Computing_E_Service; import org.gcube.informationsystem.model.relation.isrelatedto.cidoc.P16_used_specific_object; + /** * @author Luca Frosini (ISTI - CNR) */ -public interface PP14_runs_on_request extends P16_used_specific_object { +public interface PP14_runs_on_request + <Out extends PE13_Software_Computing_E_Service, In extends D14_Software> + extends P16_used_specific_object<Out, In> { }