Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 20, 2014 · a18db73 · a18db73
2 parents c9e4e5a + d5ef5c8
commit a18db73
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/model/model-intest/src/test/resources/ctx-model-intest-test-main.xml b/model/model-intest/src/test/resources/ctx-model-intest-test-main.xml
@@ -32,8 +32,14 @@
      https://jax-ws.dev.java.net/spring/core.xsd
      http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"
 	default-lazy-init="false" default-autowire="byName">
+
+	<!-- enabling annotation driven configuration -->
+    <context:annotation-config/>
+    <context:component-scan base-package="com.evolveum.midpoint.model.intest"/>
+    <context:spring-configured/>
 
     <import resource="ctx-model.xml"/>
+    <import resource="ctx-model-test.xml"/>
     <import resource="classpath*:ctx-repository.xml"/>
     <import resource="ctx-repo-cache.xml"/>
     <import resource="ctx-configuration-test.xml"/>