diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-29 17:13:21 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-29 17:13:21 +0100 |
| commit | 88f2ac75cf316c755e35303cf2d6faa2343b9408 (patch) | |
| tree | be370b6b68946cc75a5d9f2369b713f0816ce1dd /id/server | |
| parent | a3002d5966703675e982f5699b7a829d2dc22d84 (diff) | |
| download | moa-id-spss-88f2ac75cf316c755e35303cf2d6faa2343b9408.tar.gz moa-id-spss-88f2ac75cf316c755e35303cf2d6faa2343b9408.tar.bz2 moa-id-spss-88f2ac75cf316c755e35303cf2d6faa2343b9408.zip | |
Perform some cleanup
- Remove ProcessDefinitionFactoryBean from applicationContext.xml.
- Minor code cleanup.
Diffstat (limited to 'id/server')
3 files changed, 5 insertions, 6 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 65a9e7176..818524e49 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -17,11 +17,6 @@ <bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
</property>
<property name="processInstanceMaxIdleTimeSeconds" value="600" />
- <property name="processDefinitions">
- <bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
- <property name="resources" value="classpath:resources/processes/*.process.xml" />
- </bean>
- </property>
</bean>
<task:scheduler id="taskScheduler" pool-size="1" />
@@ -30,5 +25,7 @@ </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" />
+
</beans>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 2dbceb4e9..10c772aca 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -138,6 +138,8 @@ </servlet> <servlet-mapping> <servlet-name>ProcessEngineSignal</servlet-name> + <url-pattern>/signalProcess</url-pattern> + <!-- legacy url patterns --> <url-pattern>/GetMISSessionID</url-pattern> <url-pattern>/GetForeignID</url-pattern> <url-pattern>/VerifyAuthBlock</url-pattern> diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java index 35fbce053..7e16cf637 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -98,7 +98,7 @@ public class ModuleRegistration { for (String uri : module.getProcessDefinitions()) { Resource resource = ctx.getResource(uri); if (resource.isReadable()) { - log.info("Registering process definition resource: '{}'.", resource); + log.info("Registering process definition resource: '{}'.", uri); try (InputStream processDefinitionInputStream = resource.getInputStream()) { processEngine.registerProcessDefinition(processDefinitionInputStream); } catch (IOException e) { |