Merge branch 'master' into features/TS

OpenNMS · Sep 16, 2013 · 3afef61 · 3afef61
2 parents 11f80ce + 90af85b
commit 3afef61
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-linkdTest.xml b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-linkdTest.xml
@@ -13,10 +13,6 @@
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
 	">
 
-    <context:annotation-config />
-    <tx:annotation-driven/>
-    <aop:aspectj-autoproxy proxy-target-class="true" />
-
     <bean id="scheduler" class="org.opennms.netmgt.linkd.scheduler.Scheduler">
       <constructor-arg value="Linkd" />
       <constructor-arg>