Split task configuration out into its own spring file

openid-connect-server/.springBeans

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[3.1.0.201210040510-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -13,6 +13,7 @@
 		<config>src/main/webapp/WEB-INF/data-context.xml</config>
 		<config>src/main/webapp/WEB-INF/crypto-config.xml</config>
 		<config>src/main/webapp/WEB-INF/application-context.xml</config>
+		<config>src/main/webapp/WEB-INF/task-config.xml</config>
 	</configs>
 	<configSets>
 	</configSets>

openid-connect-server/src/main/webapp/WEB-INF/application-context.xml

@@ -16,16 +16,14 @@
   limitations under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:mvc="http://www.springframework.org/schema/mvc" 
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" 
+	xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:task="http://www.springframework.org/schema/task" 
 	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd
-		http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
@@ -239,15 +237,8 @@
 
 	<!-- End view configuration -->
 
-	<!-- scheduled tasks -->
+	<!--Import scheduled task configuration -->
-	<task:scheduler id="taskScheduler" pool-size="10" /> 
+	<import resource="task-config.xml" />
-	<task:executor id="taskExecutor" pool-size="5" /> 
-	<task:annotation-driven scheduler="taskScheduler" executor="taskExecutor" /> 
-	
-	<task:scheduled-tasks scheduler="taskScheduler">
-	    <task:scheduled ref="defaultOAuth2ProviderTokenService" method="clearExpiredTokens" fixed-rate="300000"/>
-	    <task:scheduled ref="defaultApprovedSiteService" method="clearExpiredSites" fixed-rate="300000"/>
-	</task:scheduled-tasks>
 
 	<!-- import application-local configuration information (such as bean definitions) -->
 	<import resource="local-config.xml" />