pre-commit: add XML files to the trailing-whitespace check (apache#9131)

Author: jbampton

.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
       - id: mixed-line-ending
         exclude: \.(cs|xml)$
       - id: trailing-whitespace
-        files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|yaml|yml)$
+        files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
         args: [--markdown-linebreak-ext=md]
         exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
   - repo: https://github.com/pycqa/flake8

api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml

@@ -28,5 +28,5 @@
                       >
 
     <bean id="apiServiceConfiguration" class="org.apache.cloudstack.config.ApiServiceConfiguration" />
-    
+
 </beans>

api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml

@@ -30,5 +30,5 @@
     <bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner">
         <property name="name" value="UserDispersingPlanner" />
     </bean>
-    
+
 </beans>

client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml

@@ -25,7 +25,7 @@
                       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd"
-                      >                     
+                      >
 
     <!-- There is no reason to put anything here -->
 

core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml

@@ -27,7 +27,7 @@
                       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd"
-                      >                     
+                      >
 
     <bean id="usageEventUtils" class="com.cloud.event.UsageEventUtils" />
 

core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml

@@ -27,7 +27,7 @@
                       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd"
-                      >                     
+                      >
 
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="hostAllocatorsRegistry" />

core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml

@@ -62,12 +62,12 @@
         <property name="registry" ref="apiAclCheckersRegistry" />
         <property name="typeClass" value="org.apache.cloudstack.acl.APIAclChecker" />
     </bean>
-    
+
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="querySelectorsRegistry" />
         <property name="typeClass" value="org.apache.cloudstack.acl.QuerySelector" />
     </bean>
-        
+
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="userPasswordEncodersRegistry" />
         <property name="typeClass" value="org.apache.cloudstack.auth.UserAuthenticator" />

core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml

@@ -262,7 +262,7 @@
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.DumpRegistry" >
         <property name="registries" value="#{registryRegistry.registered}" />
     </bean>
-    
+
     <bean id="registryRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
     </bean>
@@ -276,11 +276,11 @@
           class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
         <property name="excludeKey" value="api.checkers.acl.exclude" />
     </bean>
-    
+
     <bean id="querySelectorsRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
         <property name="excludeKey" value="query.selectors.exclude" />
-    </bean>    
+    </bean>
 
     <bean id="apiCommandsRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">

core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml

@@ -92,7 +92,7 @@
         <property name="typeClass"
             value="com.cloud.network.element.Site2SiteVpnServiceProvider" />
     </bean>
-    
+
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="remoteAccessVPNServiceProviderRegistry" />
         <property name="typeClass"

core/src/main/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml

@@ -52,7 +52,7 @@
         <property name="typeClass" value="com.cloud.template.TemplateAdapter" />
     </bean>
 
-    
+
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
         <property name="registry" ref="podAllocatorsRegistry" />
         <property name="typeClass"
@@ -76,7 +76,7 @@
         <property name="typeClass"
             value="org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy" />
     </bean>
-    
 
-    
+
+
 </beans>

core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml

@@ -27,7 +27,7 @@
                       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd"
-                      >                     
+                      >
 
   <!--
     LifeCycle
@@ -43,13 +43,13 @@
   <bean id="transactionContextInterceptor" class="com.cloud.utils.db.TransactionContextInterceptor" />
   <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
   <aop:config>
-    <aop:advisor advice-ref="transactionContextInterceptor" 
+    <aop:advisor advice-ref="transactionContextInterceptor"
         pointcut="target(com.cloud.utils.db.GenericDaoBase)" />
-    <aop:advisor advice-ref="transactionContextInterceptor" 
+    <aop:advisor advice-ref="transactionContextInterceptor"
         pointcut="execution(* com.cloud.utils.db.EntityManager.*(..))" />
-    <aop:advisor advice-ref="actionEventInterceptor" 
+    <aop:advisor advice-ref="actionEventInterceptor"
         pointcut="execution(* *(..)) &amp;&amp; @annotation(com.cloud.event.ActionEvent)" />
-    <aop:advisor advice-ref="actionEventInterceptor" 
+    <aop:advisor advice-ref="actionEventInterceptor"
         pointcut="execution(* *(..)) &amp;&amp; @annotation(com.cloud.event.ActionEvents)" />
   </aop:config>
 

core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context.xml

@@ -36,16 +36,16 @@
     <property name="listeners">
         <list>
             <!-- Put CallContext listener first because it will open and then close a DB connection.
-                If you put it after the TransactionContextListener, the thread will hold open a DB 
+                If you put it after the TransactionContextListener, the thread will hold open a DB
                 connection for the life of the thread -->
             <bean class="org.apache.cloudstack.context.CallContextListener" />
             <bean class="org.apache.cloudstack.context.LogContextListener" />
             <bean class="com.cloud.utils.db.TransactionContextListener" />
         </list>
     </property>
   </bean>
-  
-  <bean class="org.apache.cloudstack.managed.context.ManagedContextRunnable" factory-method="initializeGlobalContext" 
+
+  <bean class="org.apache.cloudstack.managed.context.ManagedContextRunnable" factory-method="initializeGlobalContext"
     autowire-candidate="false" >
     <constructor-arg><ref bean="ManagedContext"/></constructor-arg>
   </bean>

engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml

@@ -40,5 +40,5 @@
     <bean id="volumeRestService" class="org.apache.cloudstack.engine.rest.service.api.VolumeRestService" />
     <bean id="volumeTypeHelper" class="org.apache.cloudstack.engine.subsystem.api.storage.type.VolumeTypeHelper" />
     <bean id="zoneRestService" class="org.apache.cloudstack.engine.rest.service.api.ZoneRestService" />
-    
+
 </beans>

engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml

@@ -21,10 +21,10 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:util="http://www.springframework.org/schema/util"
-       
+
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                       http://www.springframework.org/schema/beans/spring-beans.xsd
-                      http://www.springframework.org/schema/aop 
+                      http://www.springframework.org/schema/aop
                       http://www.springframework.org/schema/aop/spring-aop.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd
@@ -70,15 +70,15 @@
         class="org.apache.cloudstack.engine.orchestration.CloudOrchestrator" />
     <bean id="dataCenterResourceManagerImpl"
         class="org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManagerImpl" />
-    
+
     <bean id="vMEntityManagerImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VMEntityManagerImpl" >
         <property name="planners" value="#{deploymentPlannersRegistry.registered}" />
     </bean>
-    
+
     <bean id="virtualMachineEntityImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityImpl" />
-    
+
     <bean id="virtualMachinePowerStateSyncImpl" class="com.cloud.vm.VirtualMachinePowerStateSyncImpl" />
-    
+
     <bean id= "vmWorkJobDispatcher" class="com.cloud.vm.VmWorkJobDispatcher">
         <property name="name">
             <util:constant static-field="com.cloud.vm.VmWorkConstants.VM_WORK_JOB_DISPATCHER"/>
@@ -96,5 +96,5 @@
             <util:constant static-field="com.cloud.vm.VmWorkConstants.VM_WORK_JOB_WAKEUP_DISPATCHER"/>
         </property>
     </bean>
-    
+
 </beans>

engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml

@@ -34,5 +34,5 @@
     <bean id="StorageCacheReplacementAlgorithm"
         class="org.apache.cloudstack.storage.cache.manager.StorageCacheReplacementAlgorithmLRU" />
 
-    
+
 </beans>

engine/storage/integration-test/src/test/resources/component.xml

@@ -17,13 +17,13 @@
   under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  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:tx="http://www.springframework.org/schema/tx"
   xmlns:aop="http://www.springframework.org/schema/aop"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
                       http://www.springframework.org/schema/beans/spring-beans.xsd
-                      http://www.springframework.org/schema/tx 
+                      http://www.springframework.org/schema/tx
                       http://www.springframework.org/schema/tx/spring-tx.xsd
                       http://www.springframework.org/schema/aop
                       http://www.springframework.org/schema/aop/spring-aop.xsd
@@ -35,10 +35,10 @@
       Compose a CloudStack deployment with selected components here
   -->
   <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
-  
+
   <bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" />
   <bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" />
-   
+
   <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
   <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" />
   <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" />
@@ -47,15 +47,15 @@
   <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" />
   <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" />
   <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" />
-    
-            
+
+
   <!--
      Adapters
   -->
   <bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator">
     <property name="name" value="FirstFitRouting"/>
   </bean>
-  
+
   <!--
     Storage pool allocators
   -->
@@ -74,7 +74,7 @@
     <property name="name" value="Balance"/>
   </bean>
 
- 
+
   <bean id="ExternalIpAddressAllocator" class="com.cloud.network.ExternalIpAddressAllocator">
     <property name="name" value="Basic"/>
   </bean>
@@ -89,7 +89,7 @@
   <bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator">
     <property name="name" value="XenServerInvestigator"/>
   </bean>
-  
+
   <bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator">
     <property name="name" value="PingInvestigator"/>
   </bean>
@@ -138,8 +138,8 @@
   <bean id="BareMetalPlanner" class="com.cloud.deploy.BareMetalPlanner">
     <property name="name" value="BareMetal Fit"/>
   </bean>
-    
-   
+
+
   <!--
     Network Gurus
   -->
@@ -179,11 +179,11 @@
   <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru">
     <property name="name" value="XenServerGuru"/>
   </bean>
-  
+
   <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru">
     <property name="name" value="KVMGuru"/>
   </bean>
-  
+
   <bean id="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru">
     <property name="name" value="BareMetalGuru"/>
   </bean>

engine/storage/integration-test/src/test/resources/s3_testng.xml

@@ -28,17 +28,17 @@
   <parameter name="devcloud-local-storage-uuid" value="cd10cac1-4772-92e5-5da6-c2bc16b1ce1b"/>
   <parameter name="devcloud-host-uuid" value="759ee4c9-a15a-297b-67c6-ac267d8aa429"/>
   <parameter name="devcloud-secondary-storage" value="nfs://192.168.56.10/opt/storage/secondary"/>
-  
+
   <parameter name="s3-accesskey" value="OYAZXCAFUC1DAFOXNJWI"/>
   <parameter name="s3-secretkey" value="YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ=="/>
   <parameter name="s3-endpoint"  value="10.223.89.7:8080" />
   <parameter name="s3-template-bucket" value="s3://cstemplates"/>
   <parameter name="s3-usehttps"  value="false" />
- 
+
    <listeners>
     <listener class-name="org.apache.cloudstack.storage.test.TestNGAop" />
   </listeners>
- 
+
   <test name="integration-tests">
     <packages>
       <package name="org.apache.cloudstack.storage.test"/>

engine/storage/integration-test/src/test/resources/storageContext.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+  license agreements. See the NOTICE file distributed with this work for additional
+  information regarding copyright ownership. The ASF licenses this file to
+  you under the Apache License, Version 2.0 (the "License"); you may not use
+  this file except in compliance with the License. You may obtain a copy of
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+  by applicable law or agreed to in writing, software distributed under the
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific
   language governing permissions and limitations under the License. -->
 <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/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd
-                         http://www.springframework.org/schema/tx 
+                         http://www.springframework.org/schema/tx
        http://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop.xsd
                                  http://www.springframework.org/schema/context
                                           http://www.springframework.org/schema/context/spring-context.xsd">
   <context:annotation-config />
-    
+
    <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
   <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
@@ -36,10 +36,10 @@
   </bean>
 
 <bean id="imageStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDaoImpl" />
-  <bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDaoImpl" /> 
-  <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" /> 
-  <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" /> 
-  <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />   
+  <bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDaoImpl" />
+  <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" />
+  <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
+  <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />
   <bean id="objectInDataStoreDaoImpl" class="org.apache.cloudstack.storage.db.ObjectInDataStoreDaoImpl" />
   <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
   <bean id="primaryDataStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.volume.db.PrimaryDataStoreDetailsDaoImpl" />
@@ -56,7 +56,7 @@
   <bean id="dataObjectManagerImpl" class="org.apache.cloudstack.storage.datastore.DataObjectManagerImpl" />
   <bean id="dataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.DataStoreManagerImpl" />
   <bean id="primaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" />
-  <bean id="imageStoreProviderManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" />  
+  <bean id="imageStoreProviderManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" />
   <bean id="iSCSI" class="org.apache.cloudstack.storage.datastore.type.ISCSI" />
   <bean id="ISO" class="org.apache.cloudstack.storage.image.format.ISO" />
   <bean id="templateDataFactoryImpl" class="org.apache.cloudstack.storage.image.TemplateDataFactoryImpl" />