升级spring到3.2.5

添加tomcat plugin
jianlongjiang · Dec 9, 2013 · f94f642 · f94f642
1 parent ca3b652
commit f94f642
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -709,7 +709,7 @@
         <standard.version>1.1.2</standard.version>
 
         <aspectj.version>1.7.2</aspectj.version>
-        <spring.version>3.2.4.RELEASE</spring.version>
+        <spring.version>3.2.5.RELEASE</spring.version>
         <spring.data.jpa.version>1.4.1.RELEASE</spring.data.jpa.version>
 
         <hibernate.core.version>4.2.6.Final</hibernate.core.version>

diff --git a/web/pom.xml b/web/pom.xml
@@ -43,6 +43,27 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>${tomcat.maven.version}</version>
+                <configuration>
+                    <port>9080</port>
+                    <path>/${project.build.finalName}</path>
+                    <!-- spring profile  -->
+                    <systemProperties>
+                        <systemProperty>
+                            <name>spring.profiles.active</name>
+                            <value>development</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+
+            </plugin>
+
+
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>native2ascii-maven-plugin</artifactId>
@@ -185,6 +206,7 @@
     <properties>
         <sishuok.common.version>1.0-SNAPSHOT</sishuok.common.version>
         <jetty.version>8.1.8.v20121106</jetty.version>
+        <tomcat.maven.version>2.2</tomcat.maven.version>
         <support.basedir>${project.parent.parent.basedir}/src/support</support.basedir>
         <site.basedir>${project.parent.parent.basedir}</site.basedir>
         <mysql.version>5.1.27</mysql.version>

diff --git a/web/src/main/java/com/sishuok/es/maintain/push/service/PushService.java b/web/src/main/java/com/sishuok/es/maintain/push/service/PushService.java
@@ -59,7 +59,6 @@ public void offline(final Long userId) {
 
     public DeferredResult newDeferredResult(final Long userId) {
         final DeferredResult<Object> deferredResult = new DeferredResult<Object>();
-
         deferredResult.onCompletion(new Runnable() {
             @Override
             public void run() {
@@ -70,7 +69,12 @@ public void run() {
                 }
             }
         });
-
+        deferredResult.onTimeout(new Runnable() {
+            @Override
+            public void run() {
+                deferredResult.setErrorResult("");
+            }
+        });
         Queue<DeferredResult<Object>> queue = userIdToDeferredResultMap.get(userId);
         if(queue == null) {
             queue = new LinkedBlockingDeque<DeferredResult<Object>>();

diff --git a/web/src/main/resources/spring-mvc.xml b/web/src/main/resources/spring-mvc.xml
@@ -30,7 +30,6 @@
             content-negotiation-manager="contentNegotiationManager"
             >
         <!--enableMatrixVariables="true">-->
-
         <!-- 异步支持 默认30秒超时 -->
         <mvc:async-support default-timeout="30000" task-executor="executor"/>
 
@@ -89,8 +88,19 @@
         <bean class="org.springframework.web.servlet.handler.ConversionServiceExposingInterceptor">
             <constructor-arg ref="conversionService"/>
         </bean>
-        <bean class="com.sishuok.es.common.web.interceptor.SetCommonDataInterceptor"/>
-        <bean class="org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor"/>
+        <bean class="com.sishuok.es.common.web.interceptor.SetCommonDataInterceptor">
+            <property name="excludeUrlPatterns">
+                <value>
+                    /admin/polling
+                </value>
+            </property>
+        </bean>
+        <mvc:interceptor>
+            <mvc:mapping path="/admin/**" />
+            <mvc:mapping path="/office/**" />
+            <!--<mvc:exclude-mapping path="/admin/polling"/>-->
+            <bean class="org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor"/>
+        </mvc:interceptor>
         <!--<mvc:interceptor>-->
         <!--<mvc:mapping path="/**"/>-->
         <!--<bean class="cn.javass.test.interceptor.TestInterceptor"/>-->

diff --git a/web/src/main/webapp/WEB-INF/web.xml b/web/src/main/webapp/WEB-INF/web.xml
@@ -122,6 +122,7 @@
     <servlet>
         <servlet-name>DruidStatView</servlet-name>
         <servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
+        <async-supported>true</async-supported>
     </servlet>
     <servlet-mapping>
         <servlet-name>DruidStatView</servlet-name>