X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fspring%2FWebConfig.java;h=0a0de7aba0219af2b449164707a0483e2c944b3e;hb=5a44c7fd7f9802f255bf43489ff325af2df5eb94;hp=ba13b48d92e200a39b857076ad3ddf307a0dc2da;hpb=c289d0a023681f6b416fe54fbbf708b11e4f480a;p=proteocache.git

diff --git a/server/compbio/spring/WebConfig.java b/server/compbio/spring/WebConfig.java
index ba13b48..0a0de7a 100644
--- a/server/compbio/spring/WebConfig.java
+++ b/server/compbio/spring/WebConfig.java
@@ -3,6 +3,7 @@ package compbio.spring;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -10,6 +11,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @EnableWebMvc
+@ImportResource("WEB-INF/spring-security.xml")
 @ComponentScan(basePackages = "compbio.controllers")
 public class WebConfig extends WebMvcConfigurerAdapter {
 
@@ -23,8 +25,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		registry.addResourceHandler("classpath:/META-INF/resources/webjars/**").addResourceLocations("/webjars/");
-		registry.addResourceHandler("/bootstrap/**").addResourceLocations("/bootstrap/");
+		registry.addResourceHandler("/bootstrap-3.0.2/**").addResourceLocations("/bootstrap-3.0.2/");
 		registry.addResourceHandler("/css/**").addResourceLocations("/css/");
 		registry.addResourceHandler("/images/**").addResourceLocations("/images/");
 		registry.addResourceHandler("/js/**").addResourceLocations("/js/");