diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml index a7c5b5268659..c7b93f6ac377 100644 --- a/dspace-api/pom.xml +++ b/dspace-api/pom.xml @@ -858,6 +858,24 @@ + + + io.findify + s3mock_2.13 + 0.2.6 + test + + + com.amazonawsl + aws-java-sdk-s3 + + + com.amazonaws + aws-java-sdk-s3 + + + + diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/dspace-api/src/test/data/dspaceFolder/assetstore/README.md b/dspace-api/src/test/data/dspaceFolder/assetstore/README.md new file mode 100644 index 000000000000..6e37c1139bf8 --- /dev/null +++ b/dspace-api/src/test/data/dspaceFolder/assetstore/README.md @@ -0,0 +1,4 @@ +# file `good-cmdi-example.cmdi` +Can be used to manually test `hasCMDI` functionality, where +in correct procedure, OAI-PMH displays this file instead +of generating OAI-PMH one. diff --git a/dspace-api/src/test/data/dspaceFolder/assetstore/good-cmdi-example.cmdi b/dspace-api/src/test/data/dspaceFolder/assetstore/good-cmdi-example.cmdi new file mode 100644 index 000000000000..5d333b211750 --- /dev/null +++ b/dspace-api/src/test/data/dspaceFolder/assetstore/good-cmdi-example.cmdi @@ -0,0 +1,101 @@ + + + http://hdl.handle.net/11234/5-CESILKO-URL + clarin.eu:cr1:p_1320657629644 + + + + + Resource + http://lindat.mff.cuni.cz/services/cesilko/cesilko.wadl + + + + + + + + + Cesilko translator (ces->slk) + Cesilko translator (ces->slk) + Cesilko translator (ces->slk) + webService + RESTfull + https://lindat.mff.cuni.cz/services/rest/cesilko/translate + development + 2014-03-19T18:02:38.963+01:00 + 2014-03-19T18:06:08.390+01:00 + + + misutka@ufal.mff.cuni.cz + + + + + + Charles University in Prague, UFAL + + + + + + + Default + + + Input Parameters + + + type + + false + + + text/plain + + + + + lang + + false + + + cs + + + + + + + + + Output Parameters + true + + + type + + + text/plain + + + + + lang + + + sk + + + + + + + + + + + + \ No newline at end of file diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml index be79818fd203..5ffec7e1a337 100644 --- a/dspace-server-webapp/pom.xml +++ b/dspace-server-webapp/pom.xml @@ -243,7 +243,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-data-rest ${spring-boot.version} @@ -253,16 +253,16 @@ + org.springframework.boot - spring-boot-starter-tomcat - provided + spring-boot-starter-aop ${spring-boot.version} org.springframework.boot - spring-boot-starter-data-rest + spring-boot-starter-actuator ${spring-boot.version} @@ -275,10 +275,10 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-actuator ${spring-boot.version} - + org.springframework.boot spring-boot-starter-actuator diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties index 8233298ef0b0..f6fba076c0dd 100644 --- a/dspace-server-webapp/src/main/resources/application.properties +++ b/dspace-server-webapp/src/main/resources/application.properties @@ -38,11 +38,6 @@ # interact with or read its configuration from dspace.cfg. dspace.dir=${dspace.dir} -######################## -# Servlet context path configuration for spring boot application running with embedded tomcat -# -server.servlet.context-path=/server - ######################## # Jackson serialization settings # diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java index 04b83098bd2f..acc3e3a505e3 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java @@ -5074,7 +5074,7 @@ public void discoverSearchObjectsWorkflowAdminConfigurationTest() throws Excepti .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects"))) ; - // reviewer2 should not see pool items, as he is not an administrator + // reviewer2 should not see pool items, as it is not an administrator getClient(reviewer2Token).perform(get("/api/discover/search/objects").param("configuration", "workflowAdmin")) //** THEN ** //The status has to be 200 OK diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java index a4a69ca8b1d7..55be6be9e428 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java @@ -83,7 +83,7 @@ public void findAll() throws Exception { context.restoreAuthSystemState(); getClient().perform(get("/api/core/metadatafields") - .param("size", String.valueOf(100))) + .param("size", String.valueOf(200))) .andExpect(status().isOk()) .andExpect(content().contentType(contentType)) .andExpect(jsonPath("$._embedded.metadatafields", Matchers.hasItems( @@ -95,7 +95,7 @@ public void findAll() throws Exception { .andExpect(jsonPath("$._links.next.href", Matchers.containsString("/api/core/metadatafields"))) .andExpect(jsonPath("$._links.last.href", Matchers.containsString("/api/core/metadatafields"))) - .andExpect(jsonPath("$.page.size", is(100))); + .andExpect(jsonPath("$.page.size", is(200))); } @Test diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java index e7664ceaad78..2ac5c586c170 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java @@ -19,7 +19,6 @@ import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase; import org.hamcrest.Matcher; -import org.hamcrest.Matchers; /** * Utility class to construct a Matcher for a browse index @@ -106,7 +105,7 @@ public static Matcher hierarchicalBrowseIndex(final String vocab public static Matcher publisherBrowseIndex(final String order) { return allOf( hasJsonPath("$.metadata", contains("dc.publisher")), - hasJsonPath("$.metadataBrowse", Matchers.is(true)), + hasJsonPath("$.metadataBrowse", is(true)), hasJsonPath("$.dataType", equalToIgnoringCase("text")), hasJsonPath("$.order", equalToIgnoringCase(order)), hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")), @@ -130,7 +129,7 @@ public static Matcher languageBrowseIndex(final String order) { public static Matcher itemtypeBrowseIndex(final String order) { return allOf( hasJsonPath("$.metadata", contains("dc.type")), - hasJsonPath("$.metadataBrowse", Matchers.is(true)), + hasJsonPath("$.metadataBrowse", is(true)), hasJsonPath("$.dataType", equalToIgnoringCase("text")), hasJsonPath("$.order", equalToIgnoringCase(order)), hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")), @@ -142,7 +141,7 @@ public static Matcher itemtypeBrowseIndex(final String order) { public static Matcher rightsBrowseIndex(final String order) { return allOf( hasJsonPath("$.metadata", contains("dc.rights.label")), - hasJsonPath("$.metadataBrowse", Matchers.is(true)), + hasJsonPath("$.metadataBrowse", is(true)), hasJsonPath("$.dataType", equalToIgnoringCase("text")), hasJsonPath("$.order", equalToIgnoringCase(order)), hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")), diff --git a/dspace/config/clarin-dspace.cfg b/dspace/config/clarin-dspace.cfg index bc9687fdebd1..0496541b3e5c 100644 --- a/dspace/config/clarin-dspace.cfg +++ b/dspace/config/clarin-dspace.cfg @@ -137,7 +137,7 @@ featured.service.teitok.description = A web-based platform for viewing, creating # Turn off the discofeed, it is allowed by default shibboleth.discofeed.allowed = false # File where is DiscoJuiceFeed response -shibboleth.discofeed.url = https://lindat.mff.cuni.cz/Shibboleth.sso/DiscoFeed +shibboleth.discofeed.url = https://dev-5.pc:8443/Shibboleth.sso/DiscoFeed # CRON job refresh time definition - default is refresh in every 2 hours. discojuice.refresh = 0 0 */2 * * ? @@ -169,7 +169,7 @@ statistics.cache-server.uri = http://cache-server.none # citace.pro.allowed = true #google config -# google.analytics.key = +google.analytics.key = # The max number of events held in the GA buffer (default: 256) # google.analytics.buffer.limit = 256 @@ -209,13 +209,13 @@ identifier.doi.namespaceseparator = dspace/ ## crosswalk.dissemination.DataCite.stylesheet = crosswalks/DIM2DataCite.xsl crosswalk.dissemination.DataCite.schemaLocation = \ - http://datacite.org/schema/kernel-4 \ - https://schema.datacite.org/meta/kernel-4.4/metadata.xsd + http://datacite.org/schema/kernel-3 \ + http://schema.datacite.org/meta/kernel-3/metadata.xsd crosswalk.dissemination.DataCite.preferList = false crosswalk.dissemination.DataCite.publisher = My University #crosswalk.dissemination.DataCite.dataManager = # defaults to publisher #crosswalk.dissemination.DataCite.hostingInstitution = # defaults to publisher -crosswalk.dissemination.DataCite.namespace = http://datacite.org/schema/kernel-4 +crosswalk.dissemination.DataCite.namespace = http://datacite.org/schema/kernel-3 # consumer to update metadata of DOIs event.consumer.doi.class = org.dspace.identifier.doi.DOIConsumer @@ -225,7 +225,7 @@ event.consumer.doi.filters = Item+Modify_Metadata # Adding doi here makes DSpace send metadata updates to your doi registration agency. # Add rdf here, if you are using dspace-rdf to export your repository content as RDF. # Add iiif here, if you are using dspace-iiif. -event.dispatcher.default.consumers = versioning, discovery, eperson, doi +event.dispatcher.default.consumers = versioning, discovery, eperson # Edit Item - Status option identifiers.item-status.register-doi = false diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg index 971757f34794..c07753e4a9e6 100644 --- a/dspace/config/dspace.cfg +++ b/dspace/config/dspace.cfg @@ -932,6 +932,7 @@ registry.metadata.load = iiif-types.xml # This property cannot be added in the `clarin-dspace.cfg` because then some Unit tests are failing.. registry.metadata.load = metashare-schema.xml registry.metadata.load = edm.xml +registry.metadata.load = datacite.xml #---------------------------------------------------------------# #-----------------UI-Related CONFIGURATIONS---------------------# diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml index 18b25e5c2d0c..ee6857735934 100644 --- a/dspace/config/item-submission.xml +++ b/dspace/config/item-submission.xml @@ -18,7 +18,10 @@ - + + + + - @@ -283,7 +318,7 @@ - + @@ -307,17 +342,6 @@ - - - - - - - - - - - +
+ + + + local + contact + person + true + + + complex + This is contact person + + + + + + local + sponsor + true + + + complex + This is funding + + + dc @@ -293,9 +320,15 @@ author true - onebox + clarin-name Enter the author's name (Family name, Given names). + @@ -313,13 +346,40 @@ dc - title - alternative + source + uri + false + + onebox + Enter the project url. + + http.* + + + + + local + demo + uri + false + + onebox + A url with samples of the resource or, in the case of tools,of samples of the output. + + http.* + + + + + dc + relation + isreferencedby true - + onebox - If the item has any alternative titles, please enter them here. - + Link to original paper that references this dataset. + + http.* @@ -368,6 +428,7 @@ ispartofseries true + Technical Report series Enter the series and number assigned to this item by your community. @@ -408,12 +469,174 @@ iso false + corpus,lexicalConceptualResource,languageDescription dropdown Select the language of the main content of the item. If the language does not appear in the list, please select 'Other'. If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'. + Please choose a language for the resource. + + + + + dc + language + iso + true + + toolService + onebox + If the tool/service is language dependent, select the appropriate language(s). Otherwise leave the field empty. Multiple languages are possible. Start typing the language and use autocomplete form that will appear. + + + + + + local + size + info + true + + corpus,languageDescription,lexicalConceptualResource + complex + You can state the extent of the submitted data, eg. the number of tokens. + + + + + metashare + ResourceInfo#ContentInfo + mediaType + false + + corpus,lexicalConceptualResource + dropdown + Media type of the main content of the item e.g., "text" for + textual corpora or "audio" for audio recordings. + + Media type is required + + + + + metashare + ResourceInfo#ContentInfo + mediaType + false + + languageDescription + dropdown + Media type of the main content of the item e.g., "text" for + textual corpora or "audio" for audio recordings. + + Media type is required + + + + + + + metashare + ResourceInfo#ContentInfo + detailedType + false + + toolService + dropdown + + Choose one of the types + + + + + metashare + ResourceInfo#ContentInfo + detailedType + false + + languageDescription + dropdown + + Choose one of the types + + + + + metashare + ResourceInfo#ContentInfo + detailedType + false + + lexicalConceptualResource + dropdown + + Choose one of the types + + + + + metashare + ResourceInfo#ResourceComponentType#ToolServiceInfo + languageDependent + false + + toolService + list + Indicate whether the operation of the tool or service is + language dependent or not + + Please indicate whether the tool is language dependent + + + + + local + hasCMDI + true + + list + Are you going to upload cmdi file? + + + policy=deny,action=read,grantee-type=user,grantee-id=* + + + + + + local + hidden + + true + + + list + Should item be harvestable thru OAI-PMH but behave like private? + + + policy=deny,action=read,grantee-type=user,grantee-id=* + + + + + + local + bitstream + redirectToURL + false + + onebox + + The actual maximum upload size of the file is 4GB. To upload a file bigger than the + maximum upload size, enter the URL of that large file. The admin must know the URL + of that bitstream file. Then, click on the 'Save' button, and the file will start + to upload. The file path must be an absolute path. + + + policy=deny,action=read,grantee-type=user,grantee-id=* + @@ -428,10 +651,14 @@ true - + tag - Enter appropriate subject keywords or phrases. - + Enter appropriate subject keyword or phrase and press the Add button. You can repeat it for + multiple keywords or use separators i.e., Enter and comma, which will split it accordingly. + Start typing the keyword and use autocomplete form that will appear. End your input by pressing + ESC if you don't want to use the preselected value. + + Please enter at least one subject related to your submission srsc
@@ -1582,671 +1809,1593 @@ - - - - - - - - - - - - - - - - - - - - Yes - yes - - - - - ISSN - issn - - - Other - other - - - ISMN - ismn - - - Gov't Doc # - govdoc - - - URI - uri - - - ISBN - isbn - - - - - - - N/A - N/A - - - EU - euFunds - - - Own funds - ownFunds - - - National - nationalFunds - - - other - Other - - - - - - Animation - Animation - - - Article - Article - - - Book - Book - - - Book chapter - Book chapter - - - Dataset - Dataset - - - Learning Object - Learning Object - - - Image - Image - - - Image, 3-D - Image, 3-D - - - Map - Map - - - Musical Score - Musical Score - - - Plan or blueprint - Plan or blueprint - - - Preprint - Preprint - - - Presentation - Presentation - - - Recording, acoustical - Recording, acoustical - - - Recording, musical - Recording, musical - - - Recording, oral - Recording, oral - - - Software - Software - - - Technical Report - Technical Report - - - Thesis - Thesis - - - Video - Video - - - Working Paper - Working Paper - - - Other - Other - - - - + Indicate whether you will upload cmdi file in the next step. Combine with "hide" for weblicht + submissions. + + + + policy=deny,action=read,grantee-type=user,grantee-id=* + + + + +
+ + + dc + contributor + author + true + + clarin-name + Enter the names of the authors of this item. Start typing the author's last name and use + autocomplete form that will appear if applicable. End your input by pressing ESC if you don't + want to use the preselected value. + + Please add author(s) + + + + + dc + publisher + + true + + autocomplete + The name of the publisher of the original analog or born + digital object. Use your home institution if this is a born digital object being published now. Start typing the + publisher and use autocomplete form that will appear if applicable. End your input by pressing ESC if you + don't want to use the preselected value. + + You must enter the name of the publisher. + + + + + local + dataProvider + + false + + autocomplete + This concerns the digital object (not the analog + original). An institution from which the data come. Used eg. to give proper attribution. Generally + different from publisher. + + + + + + local + contact + person + true + + complex + Person to contact in case of any issues with this submission. + Please fill all the fields for the contact person. + + + + + local + sponsor + true + + complex + Acknowledge sponsors and funding that supported work described by this submission. + + +
+
+ + + dc + type + + false + + autocomplete + The type should be different from what you have + entered in the first step. Examples: photo or painting for IMAGE, book or letter for TEXT, etc. + Type is required + + + + + + dc + description + + false + + textarea + Enter a description of the submitted data. + Please give us a description + + + + + dc + language + iso + true + + TEXT + autocomplete + Select the language of the main content of the item. Multiple languages are possible. Start + typing the language and use autocomplete form that will appear if applicable. Better to list all the languages then to use the 'mul' iso code (if there are too many, contact support). + + The language is required for TEXT resources + + + + + dc + language + iso + true + + VIDEO,IMAGE,SOUND,3D + autocomplete + Optionally, select the language of the main content + of the item. Multiple languages are possible. Start + typing the language and use autocomplete form that will appear if applicable. Better to list all the languages then to use the 'mul' iso code (if there are too many, contact support). + + + + + + + dc + subject + + + true + + tag + Enter appropriate subject keyword or phrase and press + the Add button. Use keywords to specify also people, places and times (period, era, date range etc) the resource + is about. You can use hierarchical subjects, separate the hierarchy levels with two colons (::). Eg. + People::John Doe, Places::New York, Times::WWII. + You can repeat it for multiple keywords or use separators i.e., comma and semicolon, which will split it accordingly. + Start typing the keyword and use autocomplete form that will appear. End your input by pressing + ESC if you don't want to use the preselected value. + + Please enter at least one subject related to your submission + + + + + dc + identifier + other + true + + + onebox + The item will get a handle. If the item has any + identification numbers or codes associated with it, please enter the types and the actual numbers or codes. + + + + + + + local + size + info + true + + complex + You can state the extent of the submitted data, eg. the number of tokens. + + +
+ +
+ + + + + dc + title + + false + + onebox + Enter the main title of the item in English. + You must enter a main title for this item. + + + + + local + demo + uri + false + + onebox + Course homepage + + http.* + + + + + dc + relation + isreferencedby + true + + onebox + Link to original paper that references this dataset. + + http.* + + + + + dc + date + issued + false + + date + Please give the date when the submission data were issued if any e.g., 2014-01-21 or at least + the year. + + You must enter the date or at least the year in a valid format. + + + + + local + hidden + + false + + list + Indicate whether you want to hide this item from browse and search. Combine with "Upload cmdi" + for weblicht submissions. + + + + policy=deny,action=read,grantee-type=user,grantee-id=* + + + + + + local + hasMetadata + + false + + list + + Indicate whether you will upload cmdi file in the next step. Combine with "hide" for weblicht + submissions. + + + + policy=deny,action=read,grantee-type=user,grantee-id=* + + + +
+ +
+ + + + dc + contributor + author + true + + clarin-name + Enter the names of the authors of this item. Start typing the author's last name and use + autocomplete form that will appear if applicable. End your input by pressing ESC if you don't + want to use the preselected value. + + Please add author(s) + + + + + dc + publisher + + true + + autocomplete + The name of the publisher of the original analog or born + digital object. Use your home institution if this is a born digital object being published now. Start typing the + publisher and use autocomplete form that will appear if applicable. End your input by pressing ESC if you + don't want to use the preselected value. + + You must enter the name of the publisher. + + + + + local + contact + person + true + + complex + Person to contact in case of any issues with this submission. + Please fill all the fields for the contact person. + + + + + local + sponsor + true + + complex + Acknowledge sponsors and funding that supported work described by this submission. + + +
+ +
+ + + dc + type + + false + + dropdown + This is here to autofill a value. The value should not be changed. + Please select a resource type for your submission. + + + + + dc + description + + false + + textarea + Enter a description of the submitted data. + Please give us a description + + + + + dc + language + iso + true + + autocomplete + Select the language of the main content of the item. Multiple languages are possible. Start + typing the language and use autocomplete form that will appear if applicable. Better to list all the languages then to use the 'mul' iso code (if there are too many, contact support). + + Please choose a language for the resource. + + + + + dc + subject + + + true + + autocomplete + Enter appropriate subject keyword or phrase and press the Add button. You can repeat it for + multiple keywords or use separators i.e., comma and semicolon, which will split it accordingly. + Start typing the keyword and use autocomplete form that will appear. End your input by pressing + ESC if you don't want to use the preselected value. + + Please enter at least one subject related to your submission + + + + + dc + identifier + other + true + + + onebox + The item will get a handle. If the item has any + identification numbers or codes associated with it, please enter the types and the actual numbers or codes. + + + + +
+ + + + + + + + + + + + + + + + + + + + + Yes + true + + + + + ISSN + issn + + + Other + other + + + ISMN + ismn + + + Gov't Doc # + govdoc + + + URI + uri + + + ISBN + isbn + + + + + + + N/A + N/A + + + EU + euFunds + + + Own funds + ownFunds + + + National + nationalFunds + + + other + Other + + + + + + N/A + + + + Corpus + corpus + + + Lexical conceptual + lexicalConceptualResource + + + Language description + languageDescription + + + Technology / Tool / Service + toolService + + + + + + - N/A - + N/A + + + + English (United States) + en_US + + + English + en + + + Spanish + es + + + German + de + + + French + fr + + + Italian + it + + + Japanese + ja + + + Chinese + zh + + + Portuguese + pt + + + Turkish + tr + + + (Other) + other + + + + + + + + + + + Without License + + + + Attribution (CC-BY) + http://creativecommons.org/licenses/by/4.0/ + + + Attribution, No Derivative Works (CC-BY-ND) + http://creativecommons.org/licenses/by-nd/4.0/ + + + Attribution, Share-alike (CC-BY-SA) + http://creativecommons.org/licenses/by-sa/4.0/ + + + Attribution, Non-commercial (CC-BY-NC) + http://creativecommons.org/licenses/by-nc/4.0/ + + + Attribution, Non-commercial, No Derivative Works (CC-BY-NC-ND) + http://creativecommons.org/licenses/by-nc-nd/4.0/ + + + Attribution, Non-commercial, Share-alike (CC-BY-NC-SA) + http://creativecommons.org/licenses/by-nc-sa/4.0/ + + + + Other + other + + + + + + + + Interactive Resource + interactive resource + + + - Website + website + + + Dataset + dataset + + + - Interview + interview + + + Image + image + + + - Moving Image + moving image + + + -- Video + video + + + - Still Image + still image + + + Other + other + + + Software + software + + + - Research Software + research software + + + Workflow + workflow + + + Cartographic Material + cartographic material + + + - Map + map + + + Sound + sound + + + - Musical Composition + musical composition + + + Text + text + + + - Annotation + annotation + + + - Bibliography + bibliography + + + - Book + book + + + -- Book Part + book part + + + - Conference Object + conference object + + + -- Conference Proceedings + conference proceedings + + + --- Conference Paper + conference paper + + + --- Conference Poster + conference poster + + + -- Conference Paper Not In Proceedings + conference paper not in proceedings + + + -- Conference Poster Not In Proceedings + conference poster not in proceedings + + + - Lecture + lecture + + + - Letter + letter + + + - Periodical + periodical + + + -- Journal + journal + + + --- Contribution to Journal + contribution to journal + + + ---- Journal Article + journal article + + + ----- Data Paper + data paper + + + ----- Review Article + review article + + + ----- Research Article + research article + + + ----- Corrigendum + corrigendum + + + ----- Software Paper + software paper + + + ---- Editorial + editorial + + + ---- Letter to the Editor + letter to the editor + + + -- Newspaper + newspaper + + + --- Newspaper Article + newspaper article + + + -- Magazine + magazine - English (United States) - en_US + - Patent + patent - English - en + - Preprint + preprint - Spanish - es + - Report + report - German - de + -- Report Part + report part - French - fr + -- Internal Report + internal report - Italian - it + -- Memorandum + memorandum - Japanese - ja + -- Other Type of Report + other type of report - Chinese - zh + -- Policy Report + policy report - Portuguese - pt + -- Project Deliverable + project deliverable - Turkish - tr + --- Data Management Plan + data management plan - (Other) - other + -- Report to Funding Agency + report to funding agency + + + -- Research Report + research report + + + -- Technical Report + technical report + + + - Research Proposal + research proposal + + + - Review + review + + + -- Book Review + book review + + + - Technical Documentation + technical documentation + + + - Working Paper + working paper + + + - Thesis + thesis + + + -- Bachelor Thesis + bachelor thesis + + + -- Doctoral Thesis + doctoral thesis + + + -- Master Thesis + master thesis + + + - Musical Notation + musical notation + + + - Blog Post + blog post + + + - Manuscript + website + + + Learning Object + learning object + + + Clinical Trial + clinical trial + + + Clinical Study + clinical study - - - + + + Author’s Original + http://purl.org/coar/version/c_b1a7d7d4d402bcce + + + Submitted Manuscript Under Review + http://purl.org/coar/version/c_71e4c1898caa6e32 + + + Accepted Manuscript + http://purl.org/coar/version/c_ab4af688f83e57aa + + + Proof + http://purl.org/coar/version/c_fa2ee174bc00049f + + + Version of Record + http://purl.org/coar/version/c_970fb48d4fbd8a85 + + + Corrected Version of Record + http://purl.org/coar/version/c_e19f295774971610 + + + Enhanced Version of Record + http://purl.org/coar/version/c_dc82b40f9837b551 + + + Not Applicable (or Unknown) + http://purl.org/coar/version/c_be7fb7dd8ff6fe43 + + - + + + open access + http://purl.org/coar/access_right/c_abf2 + + + embargoed access + http://purl.org/coar/access_right/c_f1cf + + + restricted access + http://purl.org/coar/access_right/c_16ec + + + metadata only access + http://purl.org/coar/access_right/c_14cb + + + - Without License - + Scopus Author ID + scopus-author-id - Attribution (CC-BY) - http://creativecommons.org/licenses/by/4.0/ + Ciencia ID + ciencia-id - Attribution, No Derivative Works (CC-BY-ND) - http://creativecommons.org/licenses/by-nd/4.0/ + Google Scholar ID + gsid - Attribution, Share-alike (CC-BY-SA) - http://creativecommons.org/licenses/by-sa/4.0/ + Open Researcher and Contributor ID (ORCID) + orcid - Attribution, Non-commercial (CC-BY-NC) - http://creativecommons.org/licenses/by-nc/4.0/ + Web of Science ResearcherID + rid - Attribution, Non-commercial, No Derivative Works (CC-BY-NC-ND) - http://creativecommons.org/licenses/by-nc-nd/4.0/ + ISNI - International Standard Name Identifier + isni - Attribution, Non-commercial, Share-alike (CC-BY-NC-SA) - http://creativecommons.org/licenses/by-nc-sa/4.0/ + Other + + + + + + + ISNI - International Standard Name Identifier + isni + + + Ringgold identifier + rin + + + Research Organization Registry + ror - Other - other + + + + + + + N/A + + + + Is a Funding Organization + FundingOrganization + + + + TEXT + TEXT + + + VIDEO + VIDEO + + + SOUND + SOUND + + + IMAGE + IMAGE + + + 3D + 3D + - - + + + + + - Interactive Resource - interactive resource + N/A + + + + Web Executable + webExecutable - - Website - website + Paper copy + paperCopy - Dataset - dataset + HardDisk + hardDisk - - Interview - interview + Blu Ray + bluRay - Image - image + DVD-R + DVD-R - - Moving Image - moving image + CD-ROM + CD-ROM - -- Video - video + Download + downloadable - - Still Image - still image + Accessible Through Interface + accessibleThroughInterface - Other + other other + + + + - Software - software + N/A + - - Research Software - research software + True + True - Workflow - workflow + False + False + + + + - Cartographic Material - cartographic material + N/A + - - Map - map + text + text - Sound - sound + audio + audio - - Musical Composition - musical composition + video + video - Text + image + image + + + + + + N/A + + + + text text - - Annotation - annotation + video + video - - Bibliography - bibliography + image + image + + + + - - Book - book + N/A + - -- Book Part - book part + tool + tool - - Conference Object - conference object + service + service - -- Conference Proceedings - conference proceedings + platform + platform - --- Conference Paper - conference paper + suiteOfTools + suiteOfTools - --- Conference Poster - conference poster + infrastructure + infrastructure - -- Conference Paper Not In Proceedings - conference paper not in proceedings + architecture + architecture - -- Conference Poster Not In Proceedings - conference poster not in proceedings + nlpDevelopmentEnvironment + nlpDevelopmentEnvironment - - Lecture - lecture + other + other + + - - Letter - letter + N/A + - - Periodical - periodical + wordList + wordList - -- Journal - journal + computationalLexicon + computationalLexicon - --- Contribution to Journal - contribution to journal + ontology + ontology - ---- Journal Article - journal article + wordnet + wordnet - ----- Data Paper - data paper + thesaurus + thesaurus - ----- Review Article - review article + framenet + framenet - ----- Research Article - research article + terminologicalResource + terminologicalResource - ----- Corrigendum - corrigendum + machineReadableDictionary + machineReadableDictionary - ----- Software Paper - software paper + lexicon + lexicon - ---- Editorial - editorial + other + other + + - ---- Letter to the Editor - letter to the editor + N/A + - -- Newspaper - newspaper + grammar + grammar - --- Newspaper Article - newspaper article + machine learning model + mlmodel - -- Magazine - magazine + n-gram model + ngrammodel - - Patent - patent + other + other + + + + - - Preprint - preprint + N/A + + - - Report - report + terms + terms - -- Report Part - report part + entries + entries - -- Internal Report - internal report + turns + turns - -- Memorandum - memorandum + utterances + utterances - -- Other Type of Report - other type of report + articles + articles - -- Policy Report - policy report + files + files - -- Project Deliverable - project deliverable + items + items - --- Data Management Plan - data management plan + seconds + seconds - -- Report to Funding Agency - report to funding agency + elements + elements - -- Research Report - research report + units + units - -- Technical Report - technical report + minutes + minutes - - Research Proposal - research proposal + hours + hours - - Review - review + texts + texts - -- Book Review - book review + sentences + sentences - - Technical Documentation - technical documentation + pages + pages - - Working Paper - working paper + bytes + bytes - - Thesis - thesis + tokens + tokens - -- Bachelor Thesis - bachelor thesis + words + words - -- Doctoral Thesis - doctoral thesis + keywords + keywords - -- Master Thesis - master thesis + idiomaticExpressions + idiomaticExpressions - - Musical Notation - musical notation + neologisms + neologisms - - Blog Post - blog post + multiWordUnits + multiWordUnits - - Manuscript - website + expressions + expressions - Learning Object - learning object + synsets + synsets - Clinical Trial - clinical trial + classes + classes - Clinical Study - clinical study + concepts + concepts - - - - Author’s Original - http://purl.org/coar/version/c_b1a7d7d4d402bcce + lexicalTypes + lexicalTypes - Submitted Manuscript Under Review - http://purl.org/coar/version/c_71e4c1898caa6e32 + phoneticUnits + phoneticUnits - Accepted Manuscript - http://purl.org/coar/version/c_ab4af688f83e57aa + syntacticUnits + syntacticUnits - Proof - http://purl.org/coar/version/c_fa2ee174bc00049f + semanticUnits + semanticUnits - Version of Record - http://purl.org/coar/version/c_970fb48d4fbd8a85 + predicates + predicates - Corrected Version of Record - http://purl.org/coar/version/c_e19f295774971610 + phonemes + phonemes - Enhanced Version of Record - http://purl.org/coar/version/c_dc82b40f9837b551 + diphones + diphones - Not Applicable (or Unknown) - http://purl.org/coar/version/c_be7fb7dd8ff6fe43 + T-HPairs + T-HPairs - - - - open access - http://purl.org/coar/access_right/c_abf2 + syllables + syllables - embargoed access - http://purl.org/coar/access_right/c_f1cf + frames + frames - restricted access - http://purl.org/coar/access_right/c_16ec + images + images - metadata only access - http://purl.org/coar/access_right/c_14cb + kb + kb - - - - Scopus Author ID - scopus-author-id + mb + mb - Ciencia ID - ciencia-id + gb + gb - Google Scholar ID - gsid + rb + rb - Open Researcher and Contributor ID (ORCID) - orcid + shots + shots - Web of Science ResearcherID - rid + unigrams + unigrams - ISNI - International Standard Name Identifier - isni + bigrams + bigrams - Other - + trigrams + trigrams - - - - ISNI - International Standard Name Identifier - isni + 4-grams + 4-grams - Ringgold identifier - rin + 5-grams + 5-grams - Research Organization Registry - ror + n-grams + n-grams - Other - + rules + rules + + + other + other - + - N/A - + Yes + true - Is a Funding Organization - FundingOrganization + No + false + + + + + Hidden + hidden + + + + + + teachingMaterials + teachingMaterials @@ -2660,37 +3809,29 @@ Uncomment the example row of the complex input type definition to see this input in the submission UI. --> - - - - - + + + + - - - - - - - - - - + + + + + - - - + + + - - - + + + diff --git a/dspace/config/submission-forms_cs.xml b/dspace/config/submission-forms_cs.xml index d1fcbc629c66..e7f7f31cf8d4 100644 --- a/dspace/config/submission-forms_cs.xml +++ b/dspace/config/submission-forms_cs.xml @@ -277,10 +277,10 @@ true - + tag Enter appropriate subject keywords or phrases. - + Please enter at least one subject related to your submission srsc diff --git a/pom.xml b/pom.xml index caeeb3794699..d2747ca4ad70 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ LYRASIS - http://www.dspace.org + https://dspace.org