|
@@ -1,19 +1,19 @@
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
|
|
|
|
- xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context"
|
|
|
|
- xmlns:task="http://www.springframework.org/schema/task"
|
|
|
|
- xsi:schemaLocation="
|
|
|
|
- http://www.springframework.org/schema/beans
|
|
|
|
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
|
|
- http://www.springframework.org/schema/context
|
|
|
|
|
|
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
|
|
|
|
+ xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context"
|
|
|
|
+ xmlns:task="http://www.springframework.org/schema/task"
|
|
|
|
+ xsi:schemaLocation="
|
|
|
|
+ http://www.springframework.org/schema/beans
|
|
|
|
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
|
|
+ http://www.springframework.org/schema/context
|
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
|
- http://www.springframework.org/schema/mvc
|
|
|
|
|
|
+ http://www.springframework.org/schema/mvc
|
|
http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
|
|
http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
|
|
- http://www.springframework.org/schema/task
|
|
|
|
- http://www.springframework.org/schema/task/spring-task-3.2.xsd">
|
|
|
|
|
|
+ http://www.springframework.org/schema/task
|
|
|
|
+ http://www.springframework.org/schema/task/spring-task-3.2.xsd">
|
|
|
|
|
|
- <import resource="applicationContext.xml"/>
|
|
|
|
|
|
+ <!-- <import resource="applicationContext.xml"/>-->
|
|
|
|
|
|
<!-- Handles HTTP GET requests for /static/** by efficiently serving
|
|
<!-- Handles HTTP GET requests for /static/** by efficiently serving
|
|
up static resources in the ${webappRoot}/static/ directory -->
|
|
up static resources in the ${webappRoot}/static/ directory -->
|
|
@@ -31,9 +31,8 @@
|
|
<context:include-filter type="annotation" expression="org.springframework.stereotype.Component" />
|
|
<context:include-filter type="annotation" expression="org.springframework.stereotype.Component" />
|
|
</context:component-scan>
|
|
</context:component-scan>
|
|
|
|
|
|
- <task:annotation-driven />
|
|
|
|
<mvc:annotation-driven />
|
|
<mvc:annotation-driven />
|
|
-
|
|
|
|
|
|
+
|
|
<mvc:interceptors>
|
|
<mvc:interceptors>
|
|
<mvc:interceptor>
|
|
<mvc:interceptor>
|
|
<mvc:mapping path="/**" />
|
|
<mvc:mapping path="/**" />
|
|
@@ -134,6 +133,16 @@
|
|
</bean>
|
|
</bean>
|
|
|
|
|
|
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
|
|
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
|
|
|
|
+
|
|
|
|
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" >
|
|
|
|
+ <property name="ignoreResourceNotFound" value="true" />
|
|
|
|
+ <property name="locations">
|
|
|
|
+ <list>
|
|
|
|
+ <value>/WEB-INF/application.properties</value>
|
|
|
|
+ </list>
|
|
|
|
+ </property>
|
|
|
|
+ </bean>
|
|
|
|
+
|
|
<bean id="properties" class="org.springframework.beans.factory.config.PropertiesFactoryBean" >
|
|
<bean id="properties" class="org.springframework.beans.factory.config.PropertiesFactoryBean" >
|
|
<property name="ignoreResourceNotFound" value="true" />
|
|
<property name="ignoreResourceNotFound" value="true" />
|
|
<property name="locations">
|
|
<property name="locations">
|