From 1df8ae8248d60d8de0505a4401aaa4bd71bd7ea1 Mon Sep 17 00:00:00 2001
From: Richard Richter <richard.richter@evolveum.com>
Date: Tue, 26 May 2020 10:43:03 +0200
Subject: [PATCH] testing/rest spring+logback XML cleanup

---
 .../src/test/resources/ctx-rest-test-main.xml | 22 +++---------
 .../rest/src/test/resources/ctx-rest-test.xml | 33 ++++++-----------
 .../rest/src/test/resources/logback-test.xml  | 36 +++++++++----------
 3 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/testing/rest/src/test/resources/ctx-rest-test-main.xml b/testing/rest/src/test/resources/ctx-rest-test-main.xml
index 9523d9902c6..7df9c260810 100644
--- a/testing/rest/src/test/resources/ctx-rest-test-main.xml
+++ b/testing/rest/src/test/resources/ctx-rest-test-main.xml
@@ -7,24 +7,10 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jee="http://www.springframework.org/schema/jee"
-    xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:ws="http://jax-ws.dev.java.net/spring/core" xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xsi:schemaLocation="
-     http://www.springframework.org/schema/jee
-     http://www.springframework.org/schema/jee/spring-jee-3.0.xsd
-     http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-     http://www.springframework.org/schema/context
-     http://www.springframework.org/schema/context/spring-context-3.0.xsd
-     http://www.springframework.org/schema/aop
-     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-     http://jax-ws.dev.java.net/spring/core
-     https://jax-ws.dev.java.net/spring/core.xsd
-     http://jax-ws.dev.java.net/spring/servlet
-     https://jax-ws.dev.java.net/spring/servlet.xsd"
-    default-lazy-init="false" default-autowire="byName">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+        default-lazy-init="false">
 
     <import resource="classpath*:ctx-task.xml"/>
     <import resource="ctx-model.xml"/>
diff --git a/testing/rest/src/test/resources/ctx-rest-test.xml b/testing/rest/src/test/resources/ctx-rest-test.xml
index 8efdfc64687..00086179725 100644
--- a/testing/rest/src/test/resources/ctx-rest-test.xml
+++ b/testing/rest/src/test/resources/ctx-rest-test.xml
@@ -1,32 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2020 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jee="http://www.springframework.org/schema/jee"
-    xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:ws="http://jax-ws.dev.java.net/spring/core" xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xsi:schemaLocation="
-     http://www.springframework.org/schema/jee
-     http://www.springframework.org/schema/jee/spring-jee-3.0.xsd
-     http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-     http://www.springframework.org/schema/context
-     http://www.springframework.org/schema/context/spring-context-3.0.xsd
-     http://www.springframework.org/schema/aop
-     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-     http://jax-ws.dev.java.net/spring/core
-     https://jax-ws.dev.java.net/spring/core.xsd
-     http://jax-ws.dev.java.net/spring/servlet
-     https://jax-ws.dev.java.net/spring/servlet.xsd"
-    default-lazy-init="false" default-autowire="byName">
-
-    <context:annotation-config />
-    <!-- <context:spring-configured/> -->
-    <context:component-scan base-package="com.evolveum.midpoint.testing.rest" />
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:context="http://www.springframework.org/schema/context"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+            http://www.springframework.org/schema/context
+            http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+        default-lazy-init="false">
 
+    <context:annotation-config/>
+    <context:component-scan base-package="com.evolveum.midpoint.testing.rest"/>
 </beans>
diff --git a/testing/rest/src/test/resources/logback-test.xml b/testing/rest/src/test/resources/logback-test.xml
index b6617d3b40c..767227a4f09 100644
--- a/testing/rest/src/test/resources/logback-test.xml
+++ b/testing/rest/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2020 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -15,32 +15,30 @@
     </appender>
 
     <logger name="com.evolveum.midpoint.util.ClassPathUtil" level="INFO"/>
-    <logger name="org.springframework" level="WARN" />
-    <logger name="com.evolveum.midpoint" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.provisioning" level="TRACE" />
-    <logger name="com.evolveum.midpoint.model" level="TRACE" />
-    <logger name="com.evolveum.midpoint.model.impl.controller" level="TRACE" />
+    <logger name="org.springframework" level="WARN"/>
+    <logger name="com.evolveum.midpoint" level="DEBUG"/>
+    <logger name="com.evolveum.midpoint.provisioning" level="TRACE"/>
+    <logger name="com.evolveum.midpoint.model" level="TRACE"/>
+    <logger name="com.evolveum.midpoint.model.impl.controller" level="TRACE"/>
 
-    <logger name="org.apache.cxf" level="FINE" />
-    <!--<logger name="com.evolveum.midpoint.provisioning" level="TRACE" />-->
-<!--     <logger name="com.evolveum.midpoint.common" level="TRACE" /> -->
+    <logger name="org.apache.cxf" level="FINE"/>
 
     <!-- Silencing some chatty packages -->
-    <logger name="com.evolveum.midpoint.model.repo.sql.query" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.repo" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.schema" level="TRACE" />
+    <logger name="com.evolveum.midpoint.model.repo.sql.query" level="DEBUG"/>
+    <logger name="com.evolveum.midpoint.repo" level="DEBUG"/>
+    <logger name="com.evolveum.midpoint.schema" level="TRACE"/>
     <logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" level="OFF"/>
-    <logger name="com.evolveum.midpoint.model.sync.action" level="DEBUG" />
+    <logger name="com.evolveum.midpoint.model.sync.action" level="DEBUG"/>
 
     <!-- Projector traces are just too much info. DEBUG is enough. Also, clockwork will dump the context at important points. -->
-    <logger name="com.evolveum.midpoint.model.lens.projector" level="DEBUG" />
+    <logger name="com.evolveum.midpoint.model.lens.projector" level="DEBUG"/>
 
-    <logger name="com.evolveum.midpoint.rest.impl" level="TRACE" />
-    <logger name="com.evolveum.midpoint.testing.rest" level="TRACE" />
-    <logger name="com.evolveum.midpoint.test" level="TRACE" />
-    <logger name="PROFILING" level="TRACE" />
+    <logger name="com.evolveum.midpoint.rest.impl" level="TRACE"/>
+    <logger name="com.evolveum.midpoint.testing.rest" level="TRACE"/>
+    <logger name="com.evolveum.midpoint.test" level="TRACE"/>
+    <logger name="PROFILING" level="TRACE"/>
     <root level="INFO">
-        <appender-ref ref="X" />
+        <appender-ref ref="X"/>
     </root>
 </configuration>