This is the 7.6 merge with local changes. #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DONE - map /data and platform def to use sql
modified: docker-compose.yml
DONE - to support withdraw reason.
modified: dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
DONE - to support noDoi option
modified: dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
DONE - to support noDoi option
modified: dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLIScriptConfiguration.java
DONE - to support noDoi option
modified: dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportScriptConfiguration.java
DONE - noDoi, embargo, mapping and PR.
modified: dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
DONE - to support noDoi option.
modified: dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
DONE - to support bitstreamurl metadata.
modified: dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java
DONE - to support bitstreamurl metadata.
modified: dspace-api/src/main/java/org/dspace/app/itemupdate/DeleteBitstreamsAction.java
DONE - to support bitstreamurl metadata.
modified: dspace-api/src/main/java/org/dspace/app/itemupdate/DeleteBitstreamsByFilterAction.java
DONE - for RequestCopy to send all files.
modified: dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
INPRO - for mapping and proxy deposit form building.
modified: dspace-api/src/main/java/org/dspace/app/util/DCInput.java
INPRO - for mapping and proxy deposit form building.
modified: dspace-api/src/main/java/org/dspace/app/util/DCInputSet.java
INPRO - for mapping and proxy deposit form building.
modified: dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java
INPRO - for mapping and proxy deposit from building.
modified: dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
DONE - to support stats subscription.
modified: dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
DONE - request to update metadata.
modified: dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
DONE - to have subject in feedback
modified: dspace-api/src/main/java/org/dspace/content/FeedbackServiceImpl.java
DONE - to have file description metadata, proxies metadata.
modified: dspace-api/src/main/java/org/dspace/content/InstallItemServiceImpl.java
DONE - get list of files and get monthly stats.
modified: dspace-api/src/main/java/org/dspace/content/Item.java
DONE - used for withdraw. get lift of files, stats methods, withdraw
modified: dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
DONE - Because of Persistence error I was getting when adding a bitstreamurl metadata.
modified: dspace-api/src/main/java/org/dspace/content/MetadataValue.java
DONE - to support noDoi
modified: dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java
DONE - to support tombstone.
modified: dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
DONE - to support stats.
modified: dspace-api/src/main/java/org/dspace/content/dao/CollectionDAO.java
DONE - to support stats.
modified: dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
DONE - to support stats.
modified: dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
DONE - to support community listing in the right order.
modified: dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
DONE - to support stats.
modified: dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
DONE - to support embargo.
modified: dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java
DONE - to support embargo
modified: dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
DONE - to support stats subscription.
modified: dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
DONE - to support Feedback form.
modified: dspace-api/src/main/java/org/dspace/content/service/FeedbackService.java
DONE - to support tombstone and stats.
modified: dspace-api/src/main/java/org/dspace/content/service/ItemService.java
DONE - to support noDoi
modified: dspace-api/src/main/java/org/dspace/core/Context.java
DONE changes so that subject would appear in email.
modified: dspace-api/src/main/java/org/dspace/core/Email.java
DONE to support view_item_details and bitstream_details.
modified: dspace-api/src/main/java/org/dspace/core/LogHelper.java
DONE changes for the citation page.
modified: dspace-api/src/main/java/org/dspace/disseminate/CitationDocumentServiceImpl.java
DONE for the Embargo.
modified: dspace-api/src/main/java/org/dspace/embargo/EmbargoServiceImpl.java
DONE for proxies and stats.
modified: dspace-api/src/main/java/org/dspace/eperson/EPerson.java
DONE for proxies and stats.
modified: dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
DONE for proxies and stats.
modified: dspace-api/src/main/java/org/dspace/eperson/dao/EPersonDAO.java
DONE for proxies and stats.
modified: dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
DONE for proxies and stats.
modified: dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
DONE really no change.
modified: dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
DONE to support noDoi.
modified: dspace-api/src/main/java/org/dspace/identifier/IdentifierServiceImpl.java
DONE to support noDoi
modified: dspace-api/src/main/java/org/dspace/identifier/service/IdentifierService.java
DONE to support logging view_details.
modified: dspace-api/src/main/java/org/dspace/usage/LoggerUsageEventListener.java
DONE to support logging view_details
modified: dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
DONE to support PR, mapping and embargo
modified: dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
DONE to support tombstone.
modified: dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
DONE to support tombstone.
modified: dspace-api/src/test/java/org/dspace/content/ItemTest.java
DONE to support tombstone
modified: dspace-api/src/test/java/org/dspace/content/logic/LogicalFilterTest.java
DONE to support bitstreamurl
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
INPROGRESS to support subscribe to stats.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/GroupRestController.java
INPRO to support tombstone.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ItemConverter.java
DONE to support tombstone
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/JsonPatchConverter.java
DONE to support subject in feedback form.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FeedbackRest.java
DONE to support tombstone.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/Operation.java
DONE to support tombstone.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/ReplaceOperation.java
INPRO to support bitstreamurl
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamRestRepository.java
DONE just a comment about permissions.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleBitstreamLinkRepository.java
INPRO for sort order of collections. Not sure this one is needed.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java
INPRO for sort order of collections. Not sure this one is needed.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java
DONE subject for feedback form.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/FeedbackRestRepository.java
INPRO has something about permission here that I should revisit.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
INPRO I think this is for pros deposit issue.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionFormRestRepository.java
DONE to lombsonte an item via submission form this was necessary.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemStepLinkRepository.java
DONE to add prove reason when metadata is changed.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/DSpaceObjectMetadataAddOperation.java
INPRO need to check if this is still necessary. This is for removing a metadata and having a provenance about it.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/DSpaceObjectMetadataRemoveOperation.java
INPRO for updating a metadata.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/DSpaceObjectMetadataReplaceOperation.java
DONE to tombstone an item.
modified: dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ItemWithdrawReplaceOperation.java
DONE to support subject in Feedback form.
modified: dspace-server-webapp/src/test/java/org/dspace/app/rest/FeedbackRestRepositoryIT.java
DONE for DOI
modified: dspace/config/crosswalks/DIM2DataCite.xsl
DONE Doc license.
modified: dspace/config/default.license
DONE configs. Don't send this one
modified: dspace/config/dspace.cfg
DONE for subject in Feedback form.
modified: dspace/config/emails/feedback
DONE email submit form change.
modified: dspace/config/emails/submit_archive
DONE for new tables.
modified: dspace/config/hibernate.cfg.xml
DONE all below for configurations.
modified: dspace/config/item-submission.xml
modified: dspace/config/launcher.xml
modified: dspace/config/modules/citation-page.cfg
modified: dspace/config/modules/identifiers.cfg
modified: dspace/config/spring/api/core-dao-services.xml
modified: dspace/config/spring/api/core-services.xml
modified: dspace/config/spring/api/identifier-service.xml
modified: dspace/config/spring/api/requestitem.xml
modified: dspace/config/submission-forms.xml
Untracked files:
(use "git add ..." to include in what will be committed)
dspace-api/src/main/java/org/dspace/administer/ReleaseRestricted.java
dspace-api/src/main/java/org/dspace/app/checker/PasswordCreator.java
dspace-api/src/main/java/org/dspace/app/util/Restrict.java