Added references of Parthenos model

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/parthenos-entities@142113 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE20_Volatile_Digital_Object.java

@@ -5,6 +5,7 @@ import org.gcube.informationsystem.model.entity.resource.cidoc.D1_Digital_Object
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public interface PE20_Volatile_Digital_Object extends D1_Digital_Object {
+public interface PE20_Volatile_Digital_Object extends PE32_Curated_Thing,
+		D1_Digital_Object {
 
 }

src/main/java/org/gcube/informationsystem/model/relation/PP11i_was_volatile_digital_object_curated_by.java

@@ -1,13 +0,0 @@
-package org.gcube.informationsystem.model.relation;
-
-import org.gcube.informationsystem.model.relation.isrelatedto.parthenos.inverse.PP32i_is_curated_by;
-
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP11i_was_volatile_digital_object_curated_by extends
-		PP32i_is_curated_by {
-
-}

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P9_consists_of.java

@@ -5,6 +5,8 @@ import org.gcube.informationsystem.model.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
+ * 
+ * P9 consists of (forms part of)
  * Domain: E4 Period
  * Range: E4 Period
  * Subproperty of: E92 Spacetime Volume. P132 spatiotemporally overlaps 

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP11_curates_volatile_digital_object.java

@@ -1,8 +1,7 @@
-package org.gcube.informationsystem.model.relation;
+package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE10_Digital_Curating_Service;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE20_Volatile_Digital_Object;
-import org.gcube.informationsystem.model.relation.isrelatedto.parthenos.PP32_curates;
 
 
 public interface PP11_curates_volatile_digital_object

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP12_curates_volatile_software.java

@@ -2,7 +2,6 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE11_Software_Curating_Service;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE23_Volatile_Software;
-import org.gcube.informationsystem.model.relation.PP11_curates_volatile_digital_object;
 
 
 /**

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP13_curates_volatile_dataset.java

@@ -2,7 +2,6 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE12_Data_Curating_Service;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE24_Volatile_Dataset;
-import org.gcube.informationsystem.model.relation.PP11_curates_volatile_digital_object;
 
 /**
  * @author Luca Frosini (ISTI - CNR)

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/inverse/PP11i_was_volatile_digital_object_curated_by.java

@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.model.relation.isrelatedto.parthenos.inverse;
+
+
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP11i_was_volatile_digital_object_curated_by extends
+		PP32i_is_curated_by {
+
+}

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/inverse/PP12i_was_volatile_software_curated_by.java

@@ -1,6 +1,5 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.parthenos.inverse;
 
-import org.gcube.informationsystem.model.relation.PP11i_was_volatile_digital_object_curated_by;
 
 
 

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/inverse/PP13i_was_volatile_dataset_curated_by.java

@@ -1,6 +1,5 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.parthenos.inverse;
 
-import org.gcube.informationsystem.model.relation.PP11i_was_volatile_digital_object_curated_by;
 
 
 

src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/run.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+# The "directory/directory.yml" is the old way that we used to simplify jobs execution.
+# The "directory/site.yml" is the syntax used by roles (from ansible version 1.2)
+#
+# Otherwise we can directly execute a single play (file)
+#
+
+PAR=50
+TIMEOUT=15
+PLAY=site.yml
+HOSTS_DIR=.
+ANSIBLE_HOSTS=
+
+export TMPDIR=/var/tmp/${USER}
+if [ ! -d ${TMPDIR} ] ; then
+    mkdir -p ${TMPDIR}
+fi
+
+# No cows!
+export ANSIBLE_NOCOWS=1
+
+export ANSIBLE_ERROR_ON_UNDEFINED_VARS=True
+export ANSIBLE_HOST_KEY_CHECKING=False
+export ANSIBLE_LIBRARY="/usr/share/ansible:./modules:../modules:$ANSIBLE_LIBRARY"
+
+#
+# Talk with Foreman
+export FOREMAN_URL=https://cm.research-infrastructures.eu
+export FOREMAN_SSL_VERIFY=False
+
+PLAY_OPTS="-T $TIMEOUT -f $PAR"
+
+if [ -f "$1"  ] ; then
+    PLAY=$1
+elif [ ! -f $PLAY ] ; then
+    echo "No play file available."
+    exit 1
+fi
+
+if [  -f "${PLAY}" ] ; then
+    MAIN="${PLAY}"
+    shift
+elif [ -f "${PLAY}.yml" ]; then
+    MAIN="${PLAY}.yml"
+    shift
+fi
+
+if [ -f ${HOSTS_DIR}/hosts ] ; then
+    ANSIBLE_HOSTS=${HOSTS_DIR}/hosts
+fi
+if [ -f ${HOSTS_DIR}/inventory/hosts ] ; then
+    ANSIBLE_HOSTS=${HOSTS_DIR}/inventory/hosts
+fi
+if [ ! -z "$ANSIBLE_HOSTS" ] ; then
+   PLAY_OPTS="-i $ANSIBLE_HOSTS"
+fi
+
+#echo "Find vault encrypted files if any"
+if [ -d ./group_vars ] ; then
+    VAULT_GROUP_FILES=$( find ./group_vars -name \*vault\* )
+fi
+if [ -d ./host_vars ] ; then
+    VAULT_HOST_FILES=$( find ./host_vars -name \*vault\* )
+fi
+ 
+
+if [ ! -z "$VAULT_GROUP_FILES" -o ! -z "$VAULT_HOST_FILES" ] ; then
+    # Vault needs a password. You can run playbooks that don't have encrypted files just passing a blank one.
+    # To encrypt a password for a user: python -c "from passlib.hash import sha512_crypt; print sha512_crypt.encrypt('<password>')"
+    echo "There are password protected encrypted files, we will ask for password before proceeding"
+    PLAY_OPTS="$PLAY_OPTS --ask-vault-pass"
+fi
+
+# Main
+ansible-playbook $PLAY_OPTS $MAIN $@
+
+rm -f /tmp/passwordfile

src/main/resources/references/CRMpe_v1.8.1.rdfs

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-PARTHENOS Entities CRMpe 1.8 Encoded in RDFS
+PARTHENOS Entities CRMpe 1.8.1 Encoded in RDFS
+
+RDFS updated by CNR February 2, 2017
+added PE20_Volatile_Digital_Object as subclass of PE32_Curated_Thing
+
+RDFS updated by CNR January 30, 2017
+corrected PE20, PE21 and PP28i (they contained blanks)
 
-RDFS created by FORTH-ICS August 19, 2016
 RDFS updated by FORTH-ICS September 19, 2016
 corrected some typos, added PE26, removed PE27, added PP41 and PP42
 
+RDFS created by FORTH-ICS August 19, 2016
 
 Encoding Rules:
 1. The RDF spelling rules do not allow blanks. Hence we have replaced them by underscores.
@@ -105,6 +111,7 @@ xml:base="http://www.ics.forth.gr/isl/CRMpe/" xml:lang="en">
 </rdfs:Class>
 
 <rdfs:Class  rdf:about="PE20_Volatile_Digital_Object">
+	<rdfs:subClassOf rdf:resource="PE32_Curated_Thing"/>
 	<rdfs:subClassOf rdf:resource="http://www.ics.forth.gr/isl/CRMdig/D1_Digital_Object"/>
 </rdfs:Class>
 
@@ -446,7 +453,7 @@ xml:base="http://www.ics.forth.gr/isl/CRMpe/" xml:lang="en">
 </rdf:Property>
 
 <rdf:Property rdf:about="PP28_has_designated_access_point">
-	<rdfs:domain rdf:resource="PE8_E_Service"/>
+	<rdfs:domain rdf:resource="PE8_E-Service"/>
 	<rdfs:range rdf:resource="PE29_Access_Point"/>
 	<rdfs:subPropertyOf rdf:resource="http://www.cidoc-crm.org/cidoc-crm/P1_is_identified_by"/>
 </rdf:Property>