Upgrade to Tomcat 8.5.11

classes/test/spring-context/org/springframework/scheduling/annotation/taskNamespaceTests.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
+
+				http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd">
+
+	<!--
+	<context:load-time-weaver aspectj-weaving="on"/>
+	-->
+
+	<task:annotation-driven executor="executor"  exception-handler="exceptionHandler" scheduler="scheduler"/>
+
+	<task:scheduled-tasks scheduler="scheduler">
+		<task:scheduled ref="target" method="test" fixed-rate="1000"/>
+	</task:scheduled-tasks>
+
+	<bean id="executor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
+		<property name="threadNamePrefix" value="testExecutor"/>
+	</bean>
+
+	<bean id="exceptionHandler"
+		  class="org.springframework.scheduling.annotation.TestableAsyncUncaughtExceptionHandler"/>
+
+	<bean id="scheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler">
+		<property name="threadNamePrefix" value="testScheduler"/>
+	</bean>
+
+	<bean id="target" class="org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessorTests$TestBean"/>
+
+</beans>

classes/test/spring-context/org/springframework/scheduling/config/annotationDrivenContext.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   			http://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/task
+				http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<task:annotation-driven executor="testExecutor" scheduler="testScheduler"
+							exception-handler="testExceptionHandler"/>
+
+	<task:executor id="testExecutor"/>
+
+	<task:scheduler id="testScheduler"/>
+
+	<bean id="testExceptionHandler"
+		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
+
+</beans>

classes/test/spring-context/org/springframework/scheduling/config/executorContext.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:task="http://www.springframework.org/schema/task"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+	default-lazy-init="true">
+
+	<task:executor id="default"/>
+
+	<task:executor id="singleSize" pool-size="42"/>
+
+	<task:executor id="rangeWithBoundedQueue" pool-size="7-42" queue-capacity="11"/>
+
+	<task:executor id="rangeWithUnboundedQueue" pool-size="0-9" keep-alive="37"/>
+
+	<task:executor id="invalidPoolSize" pool-size="zzz"/>
+
+	<task:executor id="propertyPlaceholderWithSingleSize" pool-size="${size.single}"/>
+
+	<task:executor id="propertyPlaceholderWithRange" pool-size="${size.range}" queue-capacity="10"/>
+
+	<task:executor id="propertyPlaceholderWithRangeAndCoreThreadTimeout" pool-size="${size.rangeFromZero}"/>
+
+	<task:executor id="propertyPlaceholderWithInvalidPoolSize" pool-size="${size.invalid}"/>
+
+	<context:property-placeholder properties-ref="props"/>
+
+	<util:properties id="props">
+		<prop key="size.single">123</prop>
+		<prop key="size.range">5-25</prop>
+		<prop key="size.rangeFromZero">0-99</prop>
+		<prop key="size.invalid">22-abc</prop>
+	</util:properties>
+
+</beans>

classes/test/spring-context/org/springframework/scheduling/config/lazyScheduledTasksContext.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:task="http://www.springframework.org/schema/task"
+		xsi:schemaLocation="
+			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
+		default-lazy-init="true">
+
+	<task:scheduled-tasks>
+		<task:scheduled ref="myTask" method="doWork" fixed-rate="10"/>
+	</task:scheduled-tasks>
+
+	<bean id="myTask" class="org.springframework.scheduling.config.LazyScheduledTasksBeanDefinitionParserTests$Task"/>
+</beans>

classes/test/spring-context/org/springframework/scheduling/config/scheduledTasksContext.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   			http://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/task
+				http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<task:scheduled-tasks scheduler="testScheduler">
+		<task:scheduled ref="testBean" method="test" fixed-rate="1000"/>
+		<task:scheduled ref="testBean" method="test" fixed-rate="2000"/>
+		<task:scheduled ref="testBean" method="test" fixed-delay="3000"/>
+		<task:scheduled ref="testBean" method="test" fixed-delay="3500" initial-delay="250"/>
+		<task:scheduled ref="testBean" method="test" cron="*/4 * 9-17 * * MON-FRI"/>
+		<task:scheduled ref="testBean" method="test" trigger="customTrigger"/>
+		<task:scheduled ref="testBean" method="test" fixed-rate="4000" initial-delay="500"/>
+	</task:scheduled-tasks>
+
+	<task:scheduler id="testScheduler"/>
+
+	<bean id="testBean" class="org.springframework.scheduling.config.ScheduledTasksBeanDefinitionParserTests$TestBean"/>
+
+	<bean id="customTrigger" class="org.springframework.scheduling.config.ScheduledTasksBeanDefinitionParserTests$TestTrigger"/>
+
+</beans>

classes/test/spring-context/org/springframework/scheduling/config/schedulerContext.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   			http://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/task
+				http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<task:scheduler id="defaultScheduler"/>
+
+	<task:scheduler id="customScheduler" pool-size="42"/>
+
+</beans>