Merge pull request #35 from paas/feature/workspace-view

Reviewed By: JunHo Yoon
naver · Jun 18, 2017 · 219122e · 219122e
2 parents 26151b6 + 41b17a2
commit 219122e
Show file tree

Hide file tree

Showing 27 changed files with 22,188 additions and 4 deletions.
diff --git a/ngrinder-controller/src/main/java/org/ngrinder/infra/config/WebMvcConfig.java b/ngrinder-controller/src/main/java/org/ngrinder/infra/config/WebMvcConfig.java
@@ -129,6 +129,7 @@ public ViewResolver freemarkerResolver() {
 	public FreeMarkerConfigurer freemarkerConfig(ServletContext servletContext) {
 		FreeMarkerConfigurer configurer = new NGrinderFreeMarkerConfigure();
 		configurer.setTemplateLoaderPath("classpath:/templates/");
+		configurer.setPreferFileSystemAccess(false);
 		configurer.setDefaultEncoding("UTF-8");
 		return configurer;
 	}
@@ -137,7 +138,7 @@ public FreeMarkerConfigurer freemarkerConfig(ServletContext servletContext) {
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 	    String staticPathPatterns[] = new String[]{"/**/*.js" , "/**/*.png"
 			, "/**/*.jpg" , "/**/*.swf" , "/**/*.csv" , "/**/*.css"
-			, "/**/*.html" , "/**/*.gif" , "/**/*.ico"};
+			, "/**/*.html" , "/**/*.gif" , "/**/*.ico" , "/**/*.woff2" , "/**/*.woff" , "/**/*.ttf"};
 		Integer cachePeriod = this.resourceProperties.getCachePeriod();
 		registry.addResourceHandler(staticPathPatterns).addResourceLocations(this.resourceProperties.getStaticLocations()).setCachePeriod(cachePeriod);
 	}

diff --git a/ngrinder-controller/src/main/java/org/ngrinder/user/service/UserService.java b/ngrinder-controller/src/main/java/org/ngrinder/user/service/UserService.java
@@ -63,6 +63,7 @@ public class UserService extends AbstractUserService {
 	@Autowired
 	private FileEntryService scriptService;
 
+	@Lazy
 	@Autowired
 	private SaltSource saltSource;
 

diff --git a/ngrinder-pasta/src/main/java/org/ngrinder/pasta/controller/IndexController.java b/ngrinder-pasta/src/main/java/org/ngrinder/pasta/controller/IndexController.java
@@ -3,15 +3,20 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Created by lopiter on 2017. 6. 16..
  */
 
 @Controller
-@RequestMapping("/index")
+@RequestMapping("/welcome")
 public class IndexController {
 	@RequestMapping({"/", ""})
-	public String index() {
-		return "";
+	public String index(HttpServletResponse response) {
+		response.setHeader("X-pasta-platform-render-template" , "basic-titleless");
+		return "welcome";
 	}
 }