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
Allow dynamic skin files to be stored in S3. (updated for uPortal 5) #735
Allow dynamic skin files to be stored in S3. (updated for uPortal 5) #735
Conversation
… an AWS S3 bucket.
…ybal-UP-4677 Conflicts: uportal-war/src/main/resources/properties/contexts/applicationContext.xml
…ybal-UP-4677 Also, clean up scan to look for specific beans vs. using a regexp. Conflicts: uportal-war/src/main/resources/properties/contexts/applicationContext.xml
… options into portal.properties vs. introducing a new set of property files.
# Conflicts: # uportal-war/src/main/java/org/jasig/portal/portlets/dynamicskin/DynamicRespondrSkinConfigController.java # uportal-war/src/main/java/org/jasig/portal/portlets/dynamicskin/DynamicRespondrSkinViewController.java # uportal-war/src/main/resources/properties/contexts/applicationContext.xml # uportal-war/src/main/resources/properties/contexts/flowsContext.xml # uportal-war/src/main/resources/properties/contexts/portlet/DynamicRespondrSkin-portlet.xml # uportal-war/src/main/resources/properties/contexts/portlet/GoogleAnalytics-portlet.xml # uportal-war/src/main/resources/properties/contexts/portlet/Translator-portlet.xml # uportal-war/src/main/resources/properties/contexts/servlet/mvcServletContext.xml # uportal-war/src/main/resources/properties/portal.properties
# Conflicts: # uportal-war/src/main/java/org/jasig/portal/portlets/dynamicskin/DynamicRespondrSkinConfigController.java # uportal-war/src/main/java/org/jasig/portal/portlets/dynamicskin/DynamicRespondrSkinViewController.java # uportal-war/src/main/resources/properties/contexts/applicationContext.xml # uportal-war/src/main/resources/properties/contexts/flowsContext.xml # uportal-war/src/main/resources/properties/contexts/portlet/DynamicRespondrSkin-portlet.xml # uportal-war/src/main/resources/properties/contexts/portlet/GoogleAnalytics-portlet.xml # uportal-war/src/main/resources/properties/contexts/portlet/Translator-portlet.xml # uportal-war/src/main/resources/properties/contexts/servlet/mvcServletContext.xml # uportal-war/src/main/resources/properties/portal.properties
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me
@jhelmer-unicon We need to coordinate on this to get the changes merged before others create conflicts. |
@jhelmer-unicon merge conflicts have cropped up, could you resolve them? |
…uPortal into jhelmer-unicon-UP-4676_uportal5 # Conflicts: # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/FileSystemDynamicSkinService.java # uportal-war/src/main/resources/properties/contexts/applicationContext.xml
# Conflicts: # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/FileSystemDynamicSkinService.java # uportal-war/src/main/resources/properties/contexts/applicationContext.xml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @jhelmer-unicon!
Merge conflicts fixed. I completely forgot this PR was still outstanding. Baring down-votes, I'll probably try to get this merged in the next few days. |
@jhelmer-unicon Travis CI tests are timing out, during cobertura. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skimmed. Little skin in the game, as MyUW not using dynamic skins.
Observation: this feels like a lot of code and complexity for a fringe feature. It'll be a really good day when this kind of thing can be implemented in a separate repository that compiles against semantically versioned uPortal APIs and builds a separate .jar that becomes an optional dependency published to Maven Central that one pulls into a uPortal implementation iff one needs this feature.
I appreciate we're not there yet. Progress is progress. 👍. That'll be more progress.
@jhelmer-unicon any update on this? |
@jhelmer-unicon a merge conflict has cropped up, could you resolve it? |
…uPortal into jhelmer-unicon-UP-4676_uportal5
# Conflicts: # pom.xml # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/DynamicRespondrSkinConfigController.java # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/DynamicRespondrSkinViewController.java # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/DynamicSkinService.java # uportal-war/src/main/java/org/apereo/portal/portlets/dynamicskin/FileSystemDynamicSkinService.java
https://issues.jasig.org/browse/UP-4677
This PR is a revamp of a previous PR that was created before the 5.x branch was created.