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

diff --git a/server/compbio/spring/WebConfig.java b/server/compbio/spring/WebConfig.java
index ba13b48..0a1642c 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,11 +25,11 @@ 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("/datatables-1.9.4/**").addResourceLocations("/datatables-1.9.4/");
 		registry.addResourceHandler("/css/**").addResourceLocations("/css/");
 		registry.addResourceHandler("/images/**").addResourceLocations("/images/");
 		registry.addResourceHandler("/js/**").addResourceLocations("/js/");
+		registry.addResourceHandler("/results/**").addResourceLocations("/results/");
 	}
-
-}
\ No newline at end of file
+}