Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dspace 6 ds 3545 mirage2: custom sitemap.xmap is ignored #1690

Merged
merged 1 commit into from
Jul 5, 2019

Conversation

samuelcambien
Copy link
Contributor

@samuelcambien samuelcambien commented Mar 28, 2017

Fixes #6895

There are two resources plugins:

  • one for the local customizations (outside the maven-iterator-plugin)
  • one for the dspace source files (inside the maven-iterator-plugin)

The first one is ran first, afterwards the other one runs.
The property 'overwrite=false' should avoid that local customizations would be overwritten by dspace source files.
But the property 'filtering=true' causes maven to ignore the overwrite property.
So the sitemap (the only file that will be filtered) will always be overwritten by the dspace original!

To fix this, I also moved the local customizations resources-plugin to inside the maven-iterator-plugin.
This is necessary anyway, because to filter a sitemap, the name of the theme directory is needed for the ${theme-path} and ${theme-name} variables.
I put it after the resources-plugin for the dspace source, and gave it 'overwrite=true'.
So the order is now reversed: first the source files are processed, and then overwritten by any local customizations.

I also made the split between files to filter and files not to filter consistent accross the two resources plugins: only filter the sitemap.
(instead of filtering everything, except a list of image extensions)

@samuelcambien samuelcambien changed the base branch from master to dspace-6_x March 28, 2017 11:04
@samuelcambien
Copy link
Contributor Author

also committed this to

dspace-5_x
#1691

master
#1689

@hardyoyo
Copy link
Member

hardyoyo commented Nov 19, 2017

I'm not sure why Travis-CI testing of this PR has stalled, I can't find it anywhere in the Travis-CI logs for pull requests. I think our only option is to temporarily close then re-open this PR, which I'm willing to do, but I figured I'd mention it here before I try. Another option is to rebase this PR on upstream dspace-6_x, which isn't required, but would force Travis-CI to re-run tests. @samuelcambien it's up to you, would you prefer to rebase this pull request, or close & reopen it? Either alternative will force Travis-CI to rebuild, and if Travis-CI gives this PR a green light, that ought to be enough of a test to approve this.

@hardyoyo
Copy link
Member

This PR looks good, though, and should be easy to test, since it's just a change to the build.

@samuelcambien
Copy link
Contributor Author

Hi hardyoyo, thanks for the advice!
I rebased the pull request, looks like this put Travis-Cl to action..

@kshepherd kshepherd added this to the 6.3 milestone Apr 10, 2018
@kshepherd kshepherd added the bug label Apr 10, 2018
@mwoodiupui mwoodiupui changed the title Dspace 6 ds 3545 Dspace 6 ds 3545 mirage2: custom sitemap.xmap is ignored May 16, 2018
@kshepherd kshepherd modified the milestones: 6.3, 6.4 May 20, 2018
@tdonohue tdonohue added the interface: XMLUI (obsolete) XMLUI in DSpace versions 1.x through 6.x. Removed in 7.x label Aug 22, 2018
@bram-atmire bram-atmire merged commit 4671202 into DSpace:dspace-6_x Jul 5, 2019
juliapim pushed a commit to juliapim/DSpace-1 that referenced this pull request Dec 9, 2020
Dspace 6 ds 3545 mirage2: custom sitemap.xmap is ignored
4science-it pushed a commit to 4Science/DSpace that referenced this pull request Feb 13, 2024
DSC-1531 Updated modules version to reflect the correct one

Approved-by: Vincenzo Mecca
Approved-by: Stefano Maffei
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug interface: XMLUI (obsolete) XMLUI in DSpace versions 1.x through 6.x. Removed in 7.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants