[DURACOM-427] configuration fix

Author: AdamF42

dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java

@@ -49,7 +49,7 @@
  * Broker for ChoiceAuthority plugins, and for other information configured
  * about the choice aspect of authority control for a metadata field.
  *
- * Configuration keys, per metadata field (e.g. "dc.contributer.author")
+ * Configuration keys, per metadata field (e.g. "dc.contributor.author")
  *
  * {@code
  * # names the ChoiceAuthority plugin called for this field

dspace/config/dspace.cfg

@@ -1003,13 +1003,7 @@ access.status.for-user.bitstream = current
 # implementation of access status helper plugin - replace with local implementation if applicable
 # This default access status helper provides an item status based on the policies of the primary
 # bitstream (or first bitstream in the original bundles if no primary file is specified).
-#plugin.single.org.dspace.access.status.AccessStatusHelper = org.dspace.access.status.DefaultAccessStatusHelper
-
-plugin.single.org.dspace.access.status.AccessStatusHelper = org.dspace.access.status.MetadataAccessStatusHelper
-
-#access status metadata
-access.status.access-status-metadata = datacite.rights
-access.status.availability-date-metadata = datacite.available
+plugin.single.org.dspace.access.status.AccessStatusHelper = org.dspace.access.status.DefaultAccessStatusHelper
 
 #### Checksum Checker Settings ####
 # Default dispatcher in case none specified
@@ -1850,7 +1844,6 @@ include = ${module_dir}/google-analytics.cfg
 include = ${module_dir}/healthcheck.cfg
 include = ${module_dir}/identifiers.cfg
 include = ${module_dir}/irus-statistics.cfg
-include = ${module_dir}/metadata-security.cfg
 include = ${module_dir}/cris.cfg
 include = ${module_dir}/oai.cfg
 include = ${module_dir}/openaire-client.cfg

dspace/config/modules/cris.cfg

@@ -0,0 +1,32 @@
+#---------------------------------------------------------------#
+#--------------------CRIS CONFIGURATIONS------------------------#
+#---------------------------------------------------------------#
+# These configs are used by the CRIS extended functionalities   #
+#---------------------------------------------------------------#
+# which entity-types are enforce in the system
+cris.entity-type = Person
+cris.entity-type = Project
+cris.entity-type = Funding
+cris.entity-type = OrgUnit
+cris.entity-type = Journal
+cris.entity-type = Publication
+cris.entity-type = Product
+cris.entity-type = Patent
+cris.entity-type = Event
+cris.entity-type = Equipment
+
+########### CRIS Consumer configuration ###############
+cris-consumer.skip-empty-authority = true
+cris.item-reference-resolution.override-metadata-value = false
+
+# It specifies whether CrisConsumer should use template while creating related items.
+# By default it is false and so no template is used.
+# cris.import.submission.enabled.entity.use-template = true
+
+# It specifies whether CrisConsumer should use template while creating
+# related item linked via specified authority field.
+# cris.import.submission.enabled.entity.{authority_field_separated_by_underscores}.use-template = true
+
+# Max size, in bytes of bitstreams without a custom thumbnail
+# to be rendered directly as thumbnail
+cris.layout.thumbnail.maxsize = 250000

dspace/config/modules/relationship.cfg

@@ -14,3 +14,40 @@
 # and the right side. Indirectly related items requiring more than 5 items will be skipped. Defaults to 5
 # relationship.update.relateditems.maxdepth = 5
 
+# Relationship for which only right place value will be set with its correct place value,
+# while left place field will be used by DSpace-CRIS to store max value of right place considering other entities
+# having same relationship with right entity
+# key is repeatable, a relationship should be reported with this syntax: leftType::rightType::leftwardValue::rightwardValue
+# for example:
+# Publication::Person::isAuthorOfPublication::isPublicationOfAuthor
+# null::Person::isResearchoutputsSelectedFor::hasSelectedResearchoutputs
+# Please Note: the same relationship details could not be defined in both
+# relationship.places.onlyright and relationship.places.onlyleft
+relationship.places.onlyright=
+
+# out of the box, settings for relationships already defined are provided
+relationship.places.onlyright=null::Person::isResearchoutputsSelectedFor::hasSelectedResearchoutputs
+relationship.places.onlyright=null::Person::isProjectsSelectedFor::hasSelectedProjects
+
+relationship.places.onlyright=null::OrgUnit::isRpprojectsSelectedFor::hasSelectedRpprojects
+relationship.places.onlyright=null::OrgUnit::isPublicationsSelectedFor::hasSelectedPublications
+relationship.places.onlyright=null::OrgUnit::isRppublicationsSelectedFor::hasSelectedRppublications
+relationship.places.onlyright=null::OrgUnit::isPeopleSelectedFor::hasSelectedPeople
+relationship.places.onlyright=null::OrgUnit::isProjectsSelectedFor::hasSelectedProjects
+relationship.places.onlyright=null::OrgUnit::isOrganizationsSelectedFor::hasSelectedOrganizations
+
+relationship.places.onlyright=null::Project::isProjectsSelectedFor::hasSelectedProjects
+relationship.places.onlyright=null::Project::isGrantsSelectedFor::hasSelectedGrants
+relationship.places.onlyright=null::Project::isResearchoutputsSelectedFor::hasSelectedResearchoutputs
+
+# Relationship for which only left place value will be set with its correct place value,
+# while right place field will be used by DSpace-CRIS to store max value of left place considering other entities
+# having same relationship with left entity
+# key is repeatable, a relationship should be reported with this syntax: leftType::rightType::leftwardValue::rightwardValue
+# for example:
+# Publication::Person::isAuthorOfPublication::isPublicationOfAuthor
+# null::Person::isResearchoutputsSelectedFor::hasSelectedResearchoutputs
+# Please Note: the same relationship details could not be defined in both
+# relationship.places.onlyright and relationship.places.onlyleft
+relationship.places.onlyleft=
+