diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java similarity index 79% rename from src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right_Facet.java rename to src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java index 7f576ba..c89e606 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right_Facet.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java @@ -6,7 +6,7 @@ import org.gcube.informationsystem.model.entity.facet.LicenseFacet; * @author Luca Frosini (ISTI - CNR) * @author Alessia Bardi */ -public interface E30_Right_Facet extends LicenseFacet { +public interface E30_Right extends LicenseFacet { } diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java index 827d4c8..d06c085 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.model.entity.resource.cidoc; -import org.gcube.informationsystem.model.entity.facet.parthenos.P_Contact_Reference_Facet; import org.gcube.informationsystem.model.entity.resource.Actor; /** diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java index bdc30b0..697677e 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java @@ -1,6 +1,7 @@ package org.gcube.informationsystem.model.entity.resource.parthenos; import org.gcube.informationsystem.model.annotations.Abstract; +import org.gcube.informationsystem.model.entity.facet.EventFacet; import org.gcube.informationsystem.model.entity.facet.IdentifierFacet; import org.gcube.informationsystem.model.entity.facet.parthenos.P_Info_Facet; import org.gcube.informationsystem.model.entity.resource.Service; diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/run.sh b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/run.sh deleted file mode 100755 index 7f93fdc..0000000 --- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/run.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/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('')" - 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 diff --git a/target/classes/references/3. Parthenos Entities Model Description v 1.8.docx b/target/classes/references/3. Parthenos Entities Model Description v 1.8.docx new file mode 100644 index 0000000..dd67438 Binary files /dev/null and b/target/classes/references/3. Parthenos Entities Model Description v 1.8.docx differ diff --git a/target/classes/references/5. Parthenos Entities Minimal Metadata v 1.8.docx b/target/classes/references/5. Parthenos Entities Minimal Metadata v 1.8.docx new file mode 100644 index 0000000..137cc5f Binary files /dev/null and b/target/classes/references/5. Parthenos Entities Minimal Metadata v 1.8.docx differ diff --git a/target/classes/references/CIDOC CRM_v6.2.2_esIP.pdf b/target/classes/references/CIDOC CRM_v6.2.2_esIP.pdf new file mode 100644 index 0000000..31a8ce6 Binary files /dev/null and b/target/classes/references/CIDOC CRM_v6.2.2_esIP.pdf differ diff --git a/target/classes/references/CRMdig3.2.pdf b/target/classes/references/CRMdig3.2.pdf new file mode 100644 index 0000000..9e5554a Binary files /dev/null and b/target/classes/references/CRMdig3.2.pdf differ diff --git a/target/classes/references/CRMpe_v1.8.1.rdfs b/target/classes/references/CRMpe_v1.8.1.rdfs new file mode 100644 index 0000000..f47b209 --- /dev/null +++ b/target/classes/references/CRMpe_v1.8.1.rdfs @@ -0,0 +1,540 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file