Fix webapp resource lookup #76
Conversation
|
The last commit fixes the URL like http://localhost:8080/plugin/credentials/help/domain/name.html My apologies for getting this wrong, I have no idea how these slipped through. |
| </resource> | ||
| <resource> | ||
| <directory>plugins/credentials-plugin/src/main/webapp</directory> | ||
| <targetPath>webapp</targetPath> |
There was a problem hiding this comment.
So the interesting bit is, as currently proposed, plugin webapp/ resources would like in a subdirectory, while core webapp/ resources would not. This is due to #getPluginResource being exclusively used for plugin webapp resources, while #getResource is used for other resources as well.
|
Conflicted because the other PR was squash-merged, with a regular merge commit this would not have happened. |
|
It might because I made some changes at #77 |
|
Let me fix this conflict. |
Git understand commit history and can easily merge without conflict — unless you use squash-merges or rebase-merges, as those will create different commits, and histories diverging so that the tool cannot automatically merge anymore. |
|
Yes, I understand this. I just want to keep a clean commit log. |
2 participants
Currently, Core webapp resources such as
/help/system-config/master-slave/usage.htmldo not work. This was an oversight in the previous PR. This change should address the problem.@LinuxSuRen Please confirm.