-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Locally rebasing and merging PR #56
- Loading branch information
Showing
9 changed files
with
92 additions
and
75 deletions.
There are no files selected for viewing
53 changes: 0 additions & 53 deletions
53
...r/src/main/java/org/hl7/davinci/ehrServer/requestGenerator/RequestGeneratorMvcConfig.java
This file was deleted.
Oops, something went wrong.
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
2 changes: 1 addition & 1 deletion
2
...ava/org/hl7/davinci/ehrServer/Config.java → ...ava/org/hl7/davinci/ehrserver/Config.java
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
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
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
2 changes: 1 addition & 1 deletion
2
...7/davinci/ehrServer/FhirTesterConfig.java → ...7/davinci/ehrserver/FhirTesterConfig.java
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
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
62 changes: 62 additions & 0 deletions
62
...r/src/main/java/org/hl7/davinci/ehrserver/requestgenerator/RequestGeneratorMvcConfig.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package org.hl7.davinci.ehrserver.requestgenerator; | ||
|
|
||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.ComponentScan; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.web.servlet.config.annotation.EnableWebMvc; | ||
| import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; | ||
| import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; | ||
| import org.thymeleaf.spring4.SpringTemplateEngine; | ||
| import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver; | ||
| import org.thymeleaf.spring4.view.ThymeleafViewResolver; | ||
| import org.thymeleaf.templatemode.TemplateMode; | ||
|
|
||
|
|
||
| @Configuration | ||
| @EnableWebMvc | ||
| @ComponentScan(basePackages = "org.hl7.davinci.ehrserver.requestgenerator") | ||
| public class RequestGeneratorMvcConfig implements WebMvcConfigurer { | ||
|
|
||
| @Override | ||
| public void addResourceHandlers(ResourceHandlerRegistry theRegistry) { | ||
| theRegistry.addResourceHandler("/**").addResourceLocations("/WEB-INF/reqgen/"); | ||
| theRegistry.addResourceHandler("/static/css/**").addResourceLocations("/WEB-INF/reqgen/static/css/"); | ||
| theRegistry.addResourceHandler("/static/js/**").addResourceLocations("/WEB-INF/reqgen/static/js/"); | ||
| theRegistry.addResourceHandler("/static/media/**").addResourceLocations("/WEB-INF/reqgen/static/media/"); | ||
| } | ||
|
|
||
| /** | ||
| * Setup the template resolver with the location of the templates. | ||
| */ | ||
| @Bean | ||
| public SpringResourceTemplateResolver templateResolver() { | ||
| SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); | ||
| resolver.setPrefix("/WEB-INF/reqgen/"); | ||
| resolver.setSuffix(".html"); | ||
| resolver.setTemplateMode(TemplateMode.HTML); | ||
| resolver.setCharacterEncoding("UTF-8"); | ||
| return resolver; | ||
| } | ||
|
|
||
| /** | ||
| * Setup the view resolver. | ||
| */ | ||
| @Bean | ||
| public ThymeleafViewResolver viewResolver() { | ||
| ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); | ||
| viewResolver.setTemplateEngine(templateEngine()); | ||
| viewResolver.setCharacterEncoding("UTF-8"); | ||
| return viewResolver; | ||
| } | ||
|
|
||
| /** | ||
| * Setup the template engine. | ||
| */ | ||
| @Bean | ||
| public SpringTemplateEngine templateEngine() { | ||
| SpringTemplateEngine templateEngine = new SpringTemplateEngine(); | ||
| templateEngine.setTemplateResolver(templateResolver()); | ||
| return templateEngine; | ||
| } | ||
|
|
||
| } |
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