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.

Sign up for GitHub

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

feat: Enabled resourceChain for the webjars handler #85

Merged
merged 3 commits into from
Feb 18, 2019
Merged

feat: Enabled resourceChain for the webjars handler #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb3b5a3
feat: Enabled resourceChain for the webjars handler
Sep 12, 2018
df73169
feat: add webjars-locator as a dependency of resource-server-webapp …
drewwills Sep 27, 2018
8902820
chore: update NOTICE files
drewwills Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ This project includes:

AOP alliance under Public Domain
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Compress under The Apache Software License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Log4j API under Apache License, Version 2.0
Apache Log4j to SLF4J Adapter under Apache License, Version 2.0
ASM based accessors helper used by json-smart under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -121,6 +123,8 @@ This project includes:
tomcat-embed-core under Apache License, Version 2.0
tomcat-embed-el under Apache License, Version 2.0
tomcat-embed-websocket under Apache License, Version 2.0
webjars-locator under MIT
webjars-locator-core under MIT
XMLUnit for Java under BSD License
yui compressor under BSD License

4 changes: 4 additions & 0 deletions resource-server-webapp/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ This project includes:
http://www.famfamfam.com/lab/icons/silk/

Apache Commons Codec under Apache License, Version 2.0
Apache Commons Compress under The Apache Software License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Log4j API under Apache License, Version 2.0
Apache Log4j to SLF4J Adapter under Apache License, Version 2.0
ASM based accessors helper used by json-smart under The Apache Software License, Version 2.0
Expand Down Expand Up @@ -93,4 +95,6 @@ This project includes:
tomcat-embed-core under Apache License, Version 2.0
tomcat-embed-el under Apache License, Version 2.0
tomcat-embed-websocket under Apache License, Version 2.0
webjars-locator under MIT
webjars-locator-core under MIT

11 changes: 10 additions & 1 deletion resource-server-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,16 @@
<artifactId>resource-server-utils</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<!--
| Allows resources in webjars to be included without their version numbers;
| see https://www.webjars.org/documentation#springboot
+-->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
<version>0.34</version>
</dependency>
</dependencies>

<build>
<finalName>ResourceServingWebapp</finalName>
Expand Down
3 changes: 2 additions & 1 deletion resource-server-webapp/src/main/java/org/jasig/portal/resourceserver/WebConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
.addResourceLocations("/rs/");
registry
.addResourceHandler("/webjars/**")
.addResourceLocations("/webjars/");
.addResourceLocations("/webjars/")
.resourceChain(true);
}

}