diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 14:59:54 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-30 14:59:54 +0100 |
| commit | 202b235da770f0d8752a21391e411a701c6666cf (patch) | |
| tree | 1ec9e4ab72507e9bdce4c63dc9036850e51cbeb1 /id/server/auth/src | |
| parent | e873da6795c75e37cd3b3e2cd0c41831157ffe32 (diff) | |
| parent | 23fc42a3c273ceb05938c741508537bfaedab00a (diff) | |
| download | moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.tar.gz moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.tar.bz2 moa-id-spss-202b235da770f0d8752a21391e411a701c6666cf.zip | |
Merge branch 'MOAID-62'
Conflicts:
id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
Diffstat (limited to 'id/server/auth/src')
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index df59c2739..1fe3b4254 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -2,9 +2,7 @@ <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:annotation-config />
@@ -13,14 +11,8 @@ <property name="transitionConditionExpressionEvaluator">
<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
</property>
- <property name="processInstanceMaxIdleTimeSeconds" value="600" />
</bean>
- <task:scheduler id="taskScheduler" pool-size="1" />
- <task:scheduled-tasks scheduler="taskScheduler">
- <task:scheduled ref="processEngine" method="cleanup" fixed-delay="60000" />
- </task:scheduled-tasks>
-
<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
|