From 759ac5f42c6aff901dbeede4fbf1a1d2e08cad0f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 4 Dec 2019 19:43:32 +0100
Subject: common EGIZ code-style refactoring

---
 .../resources/SpringTest-context_authManager.xml   | 89 +++++++++++-----------
 .../resources/SpringTest-context_eaaf_core.xml     | 32 ++++----
 eaaf_core/src/test/resources/log4j.xml             | 26 ++++---
 ...ingExpressionAwareProcessEngineTest-context.xml |  8 +-
 4 files changed, 78 insertions(+), 77 deletions(-)

(limited to 'eaaf_core/src/test/resources')

diff --git a/eaaf_core/src/test/resources/SpringTest-context_authManager.xml b/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
index b8eef11f..9c94d4a7 100644
--- a/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
+++ b/eaaf_core/src/test/resources/SpringTest-context_authManager.xml
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		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-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-	<bean id="TestAuthenticationDataBuilder" 
-				class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder"/>
-								
-	<bean 	id="dummyAuthManager"
-			class="at.gv.egiz.eaaf.core.impl.idp.auth.DummyAuthManager" />
-			
-	<bean 	id="dummyRevisionLogger"
-			class="at.gv.egiz.eaaf.core.impl.logging.DummyRevisionsLogger" /> 				
-				
-	<bean	id="DummyProtocolAuthService"
-			class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyProtocolAuthService" />
-			
-	<bean	id="DummyTransactionStorage"
-			class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.DummyTransactionStorage" />				
-			
-	<bean	id="DummyStatusMessager"
-			class="at.gv.egiz.eaaf.core.impl.logging.DummyStatusMessager" />								
-	
-	<bean 	id="springElAwareExpressionEvaluator" 
-			class="at.gv.egiz.eaaf.core.impl.idp.process.spring.SpringExpressionEvaluator" />
-
-	<bean 	id="processEngine" 
-			class="at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl">
-		<property name="transitionConditionExpressionEvaluator" ref="springElAwareExpressionEvaluator" />
-	</bean>
-	
-	<bean 	id="ProcessInstanceStoreage" 
-			class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDAOImpl"/>	
-	
-	<bean 	id="RequestStorage" 
-			class="at.gv.egiz.eaaf.core.impl.idp.auth.RequestStorage"/>
-			
-	<bean	id="simplePendingRequestIdGenerationStrategy"
-			class="at.gv.egiz.eaaf.core.impl.utils.SimplePendingRequestIdGenerationStrategy" />
-																			
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    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-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <bean id="TestAuthenticationDataBuilder"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder" />
+
+  <bean id="dummyAuthManager"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.DummyAuthManager" />
+
+  <bean id="dummyRevisionLogger"
+    class="at.gv.egiz.eaaf.core.impl.logging.DummyRevisionsLogger" />
+
+  <bean id="DummyProtocolAuthService"
+    class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyProtocolAuthService" />
+
+  <bean id="DummyTransactionStorage"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.DummyTransactionStorage" />
+
+  <bean id="DummyStatusMessager"
+    class="at.gv.egiz.eaaf.core.impl.logging.DummyStatusMessager" />
+
+  <bean id="springElAwareExpressionEvaluator"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.spring.SpringExpressionEvaluator" />
+
+  <bean id="processEngine"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.ProcessEngineImpl">
+    <property name="transitionConditionExpressionEvaluator"
+      ref="springElAwareExpressionEvaluator" />
+  </bean>
+
+  <bean id="ProcessInstanceStoreage"
+    class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDaoImpl" />
+
+  <bean id="RequestStorage"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.RequestStorage" />
+
+  <bean id="simplePendingRequestIdGenerationStrategy"
+    class="at.gv.egiz.eaaf.core.impl.utils.SimplePendingRequestIdGenerationStrategy" />
+
 </beans>
diff --git a/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml b/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml
index 523e9fc7..77d70740 100644
--- a/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml
+++ b/eaaf_core/src/test/resources/SpringTest-context_eaaf_core.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		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-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    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-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <bean id="TestAuthenticationDataBuilder"
+    class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder" />
+
+
+  <!-- Dummy test classes -->
+  <bean id="DummyConfig"
+    class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyConfiguration" />
 
-	<bean id="TestAuthenticationDataBuilder" 
-				class="at.gv.egiz.eaaf.core.impl.idp.auth.TestAuthenticationDataBuilder"/>
-								
-								
-	<!-- Dummy test classes -->								
-	<bean id="DummyConfig" 
-				class="at.gv.egiz.eaaf.core.impl.idp.module.test.DummyConfiguration"/>
-												
 </beans>
diff --git a/eaaf_core/src/test/resources/log4j.xml b/eaaf_core/src/test/resources/log4j.xml
index 90e3c763..83d8b703 100644
--- a/eaaf_core/src/test/resources/log4j.xml
+++ b/eaaf_core/src/test/resources/log4j.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- -->
+<!-- -->
 
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} - %m%n" />
-		</layout>
-	</appender>
+<log4j:configuration
+  xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <appender name="consoleAppender"
+    class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern"
+        value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} - %m%n" />
+    </layout>
+  </appender>
 
-	<root>
-		<priority value="info" />
-		<appender-ref ref="consoleAppender" />
-	</root>
+  <root>
+    <priority value="info" />
+    <appender-ref ref="consoleAppender" />
+  </root>
 
 </log4j:configuration>
diff --git a/eaaf_core/src/test/resources/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/eaaf_core/src/test/resources/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
index ebbd89e9..b84aad57 100644
--- a/eaaf_core/src/test/resources/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
+++ b/eaaf_core/src/test/resources/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -22,7 +20,7 @@
 				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.DummyTransactionStorage"/>
 	
 	<bean id="ProcessInstanceStoreage" 
-				class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDAOImpl"/>	
+				class="at.gv.egiz.eaaf.core.impl.idp.process.dao.ProcessInstanceStoreDaoImpl"/>	
 	
 	<bean id="HelloWorldTask" 
 				class="at.gv.egiz.eaaf.core.impl.idp.process.test.HelloWorldTask"/>
@@ -37,10 +35,10 @@
 				class="at.gv.egiz.eaaf.core.impl.idp.process.test.ThrowExceptionTask"/>
 				
 	<bean id="SelectBKUTask" 
-				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task.SelectBKUTask"/>
+				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task.SelectBkuTask"/>
 				
 	<bean id="CreateSAML1AssertionTask" 
-				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task.CreateSAML1AssertionTask"/>
+				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task.CreateSaml1AssertionTask"/>
 
 	<bean id="GetIdentityLinkTask" 
 				class="at.gv.egiz.eaaf.core.impl.idp.process.spring.test.task.GetIdentityLinkTask"/>
-- 
cgit v1.2.3