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

.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,7 +36,7 @@
     <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" />
@@ -44,8 +44,8 @@
         </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 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDaoImpl" />
-  <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" /> 
+  <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" />
-  <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" /> 
+  <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
-  <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />   
+  <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" />

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

@@ -27,10 +27,10 @@
   <parameter name="primary-storage-want-to-add" value="nfs://192.168.56.2/opt/storage/primarynfs"/>
   <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="devcloud-secondary-storage" value="nfs://192.168.56.10/opt/storage/secondary"/>
   <parameter name="primary-storage-uuid-want-to-add" value="759ee4c9-a15a-297b-67c6-ac267d8abe29" />
   <parameter name="script-path" value="/Users/minc/dev/cloud-asf" />
-  
+
 
   <parameter name="s3-accesskey" value="OYAZXCAFUC1DAFOXNJWI"/>
   <parameter name="s3-secretkey" value="YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ=="/>
@@ -40,11 +40,11 @@
 
   <parameter name="image-install-path" value="template/tmpl/1/5/"/>
 
-   
+
   <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/object/src/test/resource/testContext.xml

@@ -22,7 +22,7 @@
   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
@@ -38,7 +38,7 @@
   <context:component-scan base-package="com.cloud.dc.dao" />
   <context:component-scan base-package="com.cloud.dc.dao" />
   <context:component-scan base-package="org.apache.cloudstack.framework" />
-  
+
   <tx:annotation-driven transaction-manager="transactionManager" />
   <bean class="org.apache.cloudstack.storage.volume.test.TestConfiguration" />
   <aop:config proxy-target-class="true">
@@ -49,7 +49,7 @@
   </aop:config>
 
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
-  
+
   <bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
     init-method="scan" >
     <property name="packages">
@@ -58,7 +58,7 @@
       </list>
     </property>
   </bean>
-  
+
   <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
@@ -68,12 +68,12 @@
     <property name="nodeId" value="Node1" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
   <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
     <constructor-arg ref="transportProvider" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
 
   <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
-  
+
 </beans>

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

@@ -35,5 +35,5 @@
 
     <bean id="snapshotStateMachineManagerImpl"
         class="org.apache.cloudstack.storage.snapshot.SnapshotStateMachineManagerImpl" />
-    
+
 </beans>

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

@@ -32,7 +32,7 @@
 
     <bean id="storageSystemSnapshotStrategy"
         class="org.apache.cloudstack.storage.snapshot.StorageSystemSnapshotStrategy" />
-        
+
     <bean id="cephSnapshotStrategy"
         class="org.apache.cloudstack.storage.snapshot.CephSnapshotStrategy" />
 

engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml

@@ -1,19 +1,19 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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

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

@@ -35,7 +35,7 @@
     <bean id="VHDX" class="org.apache.cloudstack.storage.image.format.VHDX" />
     <bean id="unknown" class="org.apache.cloudstack.storage.image.format.Unknown" />
     <bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" />
-    
+
     <bean id="hypervisorHelperImpl" class="org.apache.cloudstack.storage.helper.HypervisorHelperImpl" />
 
     <bean id="VMSnapshotHelperImpl"
@@ -63,13 +63,13 @@
             <list />
         </property>
     </bean>
-    
+
     <bean id="storageStrategyFactoryImpl" class="org.apache.cloudstack.storage.helper.StorageStrategyFactoryImpl" >
         <property name="dataMotionStrategies" value="#{dataMotionStrategiesRegistry.registered}" />
         <property name="snapshotStrategies" value="#{snapshotStrategiesRegistry.registered}" />
         <property name="vmSnapshotStrategies" value="#{vmSnapshotStrategiesRegistry.registered}" />
     </bean>
-    
+
     <bean id="imageStoreDetailsUtil" class="com.cloud.storage.ImageStoreDetailsUtil" />
 
     <bean id="deployAsIsImageStoreHelper" class="org.apache.cloudstack.storage.image.deployasis.DeployAsIsHelperImpl" />

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

@@ -31,7 +31,7 @@
         class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator">
         <property name="name" value="LocalStorage" />
     </bean>
-    
+
     <bean id="clusterScopeStoragePoolAllocator"
         class="org.apache.cloudstack.storage.allocator.ClusterScopeStoragePoolAllocator" />
     <bean id="zoneWideStoragePoolAllocator"
@@ -45,5 +45,5 @@
         class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator">
         <property name="name" value="UserFirst" />
     </bean>
-    
+
 </beans>

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

@@ -45,5 +45,5 @@
 
     <bean id="primaryDataStoreProviderMgr"
         class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" />
- 
+
 </beans>

engine/storage/volume/src/test/resource/testContext.xml

@@ -22,7 +22,7 @@
   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
@@ -38,7 +38,7 @@
   <context:component-scan base-package="com.cloud.dc.dao" />
   <context:component-scan base-package="com.cloud.dc.dao" />
   <context:component-scan base-package="org.apache.cloudstack.framework" />
-  
+
   <tx:annotation-driven transaction-manager="transactionManager" />
   <bean class="org.apache.cloudstack.storage.volume.test.TestConfiguration" />
   <aop:config proxy-target-class="true">
@@ -49,7 +49,7 @@
   </aop:config>
 
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
-  
+
   <bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
     init-method="scan" >
     <property name="packages">
@@ -58,7 +58,7 @@
       </list>
     </property>
   </bean>
-  
+
   <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
@@ -68,12 +68,12 @@
     <property name="nodeId" value="Node1" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
   <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
     <constructor-arg ref="transportProvider" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
 
   <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
-  
+
 </beans>

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

@@ -30,5 +30,5 @@
     <bean id="userDataManager" class="org.apache.cloudstack.userdata.UserDataManagerImpl">
         <property name="userDataProviders" value="#{userDataProvidersRegistry.registered}" />
     </bean>
- 
+
 </beans>

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

@@ -28,9 +28,9 @@
                       >
 
     <bean id="clusterServiceServletAdapter" class="com.cloud.cluster.ClusterServiceServletAdapter" />
-    
+
     <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
-    
+
     <bean id="clusterFenceManagerImpl" class="com.cloud.cluster.ClusterFenceManagerImpl" />
-    
+
 </beans>

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

@@ -25,13 +25,13 @@
                       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="scopedConfigStorageRegistry" />
     <property name="typeClass" value="org.apache.cloudstack.framework.config.ScopedConfigStorage" />
   </bean>
-  
+
   <bean class="org.apache.cloudstack.spring.lifecycle.ConfigDepotLifeCycle" />
 
 

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

@@ -28,5 +28,5 @@
                       >
 
     <bean id="entityManagerImpl" class="com.cloud.dao.EntityManagerImpl" />
-    
+
 </beans>

framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.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"
-                      >                     
+                      >
 
   <!--
     RPC/Async/EventBus
@@ -38,7 +38,7 @@
       </list>
     </property>
   </bean>
-  
+
   <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
@@ -48,7 +48,7 @@
     <property name="nodeId" value="Node1" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
   <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
     <constructor-arg ref="transportProvider" />
     <property name="messageSerializer" ref="messageSerializer" />

framework/ipc/src/test/resources/MessageBusTestContext.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
@@ -39,7 +39,7 @@
       </list>
     </property>
   </bean>
-  
+
   <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
@@ -47,5 +47,5 @@
   <bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase">
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
 </beans>

framework/ipc/src/test/resources/SampleManagementServerAppContext.xml

@@ -18,13 +18,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
@@ -41,7 +41,7 @@
       </list>
     </property>
   </bean>
-  
+
   <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
     <property name="onwireClassRegistry" ref="onwireRegistry" />
   </bean>
@@ -51,12 +51,12 @@
     <property name="nodeId" value="Node1" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
-  
+
   <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
     <constructor-arg ref="transportProvider" />
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
 
   <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
-  
+
 </beans>

framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml

@@ -22,7 +22,7 @@
   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
@@ -34,5 +34,5 @@
     	class="org.apache.cloudstack.framework.jobs.AsyncJobManagerTestConfiguration" />
     <bean id="TestJobDispatcher" class="org.apache.cloudstack.framework.jobs.AsyncJobTestDispatcher">
         <property name="name" value="TestJobDispatcher" />
-    </bean>      
+    </bean>
 </beans>

framework/jobs/src/test/resources/commonContext.xml

@@ -1,19 +1,19 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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

framework/spring/module/src/test/resources/testhierarchy/base/test-context-inheritable.xml

@@ -24,5 +24,5 @@
                       http://www.springframework.org/schema/context/spring-context.xsd">
 
     <bean id="count" class="org.apache.cloudstack.spring.module.factory.ModuleBasedContextFactoryTest.InstantiationCounter" />
-    
+
 </beans>

framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml

@@ -26,9 +26,9 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="base" />
     </bean>
-    
+
     <bean id="base" class="java.lang.String" >
         <constructor-arg value="base" />
     </bean>
-    
+
 </beans>

framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml

@@ -26,9 +26,9 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="child1-1" />
     </bean>
-    
+
     <bean id="child1-1" class="java.lang.String" >
         <constructor-arg value="child1-1" />
     </bean>
-    
+
 </beans>

framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml

@@ -22,9 +22,9 @@
                       http://www.springframework.org/schema/beans/spring-beans.xsd
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd">
-    
+
     <bean id="override" class="java.lang.String" >
         <constructor-arg value="a string" />
     </bean>
-    
+
 </beans>

framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml

@@ -28,11 +28,11 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="child1" />
     </bean>
-    
+
     <bean id="child1" class="java.lang.String" >
         <constructor-arg value="child1" />
     </bean>
-    
+
     <bean id="override" class="org.apache.cloudstack.spring.module.factory.InitTest" />
-    
+
 </beans>

framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml

@@ -26,7 +26,7 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="child2" />
     </bean>
-    
+
     <bean id="child2" class="java.lang.String" >
         <constructor-arg value="child2" />
     </bean>

framework/spring/module/src/test/resources/testhierarchy/excluded/test-context.xml

@@ -26,7 +26,7 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="excluded" />
     </bean>
-    
+
     <bean id="excluded" class="java.lang.String" >
         <constructor-arg value="excluded" />
     </bean>

framework/spring/module/src/test/resources/testhierarchy/excluded2/test-context.xml

@@ -26,7 +26,7 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="excluded2" />
     </bean>
-    
+
     <bean id="excluded" class="java.lang.String" >
         <constructor-arg value="excluded2" />
     </bean>

framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/test-context.xml

@@ -26,7 +26,7 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="orphan-of-excluded" />
     </bean>
-    
+
     <bean id="excluded" class="java.lang.String" >
         <constructor-arg value="orphan-of-excluded" />
     </bean>

framework/spring/module/src/test/resources/testhierarchy/orphan1/test-context.xml

@@ -26,5 +26,5 @@
     <bean id="name" class="java.lang.String" >
         <constructor-arg value="orphan1" />
     </bean>
-    
+
 </beans>

plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.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"
-                      >                     
+                      >
 
     <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker" >
         <property name="services" value="#{apiCommandsRegistry.registered}" />

plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml

@@ -32,5 +32,5 @@
         <property name="name" value="ExplicitDedicationProcessor" />
         <property name="type" value="ExplicitDedication" />
     </bean>
-    
+
 </beans>

plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml

@@ -33,5 +33,5 @@
         <property name="type" value="host anti-affinity" />
     </bean>
 
-    
+
 </beans>

plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml

@@ -33,5 +33,5 @@
         <property name="type" value="non-strict host affinity" />
     </bean>
 
-    
+
 </beans>

plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml

@@ -33,5 +33,5 @@
         <property name="type" value="non-strict host anti-affinity" />
     </bean>
 
-    
+
 </beans>

plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml

@@ -28,5 +28,5 @@
                       >
 
       <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
-    
+
 </beans>

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

@@ -29,5 +29,5 @@
 
     <bean id="DedicatedResourceManagerImpl"
         class="org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl" />
-    
+
 </beans>

plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-    license agreements. See the NOTICE file distributed with this work for additional 
+    license agreements. See the NOTICE file distributed with this work for additional
-    information regarding copyright ownership. The ASF licenses this file to 
+    information regarding copyright ownership. The ASF licenses this file to
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    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 
+    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 
+    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 
+    by applicable law or agreed to in writing, software distributed under the
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    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 
+    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"

plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/spring-user-concentrated-pod-context.xml

@@ -31,5 +31,5 @@
     <property name="name" value="UserConcentratedPodPlanner"/>
   </bean>
 
-    
+
 </beans>

plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-    license agreements. See the NOTICE file distributed with this work for additional 
+    license agreements. See the NOTICE file distributed with this work for additional
-    information regarding copyright ownership. The ASF licenses this file to 
+    information regarding copyright ownership. The ASF licenses this file to
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    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 
+    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 
+    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 
+    by applicable law or agreed to in writing, software distributed under the
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    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 
+    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"

plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml

@@ -30,5 +30,5 @@
     <bean id="randomAllocator"
         class="com.cloud.agent.manager.allocator.impl.RandomAllocator" />
 
-    
+
 </beans>

plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-    license agreements. See the NOTICE file distributed with this work for additional 
+    license agreements. See the NOTICE file distributed with this work for additional
-    information regarding copyright ownership. The ASF licenses this file to 
+    information regarding copyright ownership. The ASF licenses this file to
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    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 
+    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 
+    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 
+    by applicable law or agreed to in writing, software distributed under the
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    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 
+    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"

plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-discoverer/spring-hyperv-discoverer-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-    license agreements. See the NOTICE file distributed with this work for additional 
+    license agreements. See the NOTICE file distributed with this work for additional
-    information regarding copyright ownership. The ASF licenses this file to 
+    information regarding copyright ownership. The ASF licenses this file to
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    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 
+    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 
+    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 
+    by applicable law or agreed to in writing, software distributed under the
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    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 
+    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"

plugins/hypervisors/kvm/src/main/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml

@@ -37,5 +37,5 @@
     <bean id="KVMHAProvider" class="org.apache.cloudstack.kvm.ha.KVMHAProvider">
         <property name="name" value="KVMHAProvider" />
     </bean>
-    
+
 </beans>

plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml

@@ -35,5 +35,5 @@
         <property name="name" value="OvmGuru" />
     </bean>
 
-    
+
 </beans>

plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml

@@ -30,5 +30,5 @@
     <bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer">
         <property name="name" value="Ovm Discover" />
     </bean>
-    
+
 </beans>

plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml

@@ -32,5 +32,5 @@
     </bean>
     <bean id="SimulatorSecondaryDiscoverer" class="com.cloud.resource.SimulatorSecondaryDiscoverer">
     </bean>
-    
+
 </beans>

plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml

@@ -31,5 +31,5 @@
     <bean id="ucsBladeDaoImpl" class="com.cloud.ucs.database.UcsBladeDaoImpl" />
     <bean id="ucsManagerDaoImpl" class="com.cloud.ucs.database.UcsManagerDaoImpl" />
 
-    
+
 </beans>

plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml

@@ -41,5 +41,5 @@
         <property name="name" value="VMwareInvestigator" />
     </bean>
 
-    
+
 </beans>

plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-	license agreements. See the NOTICE file distributed with this work for additional 
+	license agreements. See the NOTICE file distributed with this work for additional
-	information regarding copyright ownership. The ASF licenses this file to 
+	information regarding copyright ownership. The ASF licenses this file to
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	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 
+	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 
+	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 
+	by applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	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 
+	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"

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/associate-acl-policy-set.xml

@@ -16,7 +16,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<configConfMos 
+<configConfMos
   cookie="%cookie%"
   inHierarchical="false">
   <inConfigs>

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml

@@ -60,13 +60,13 @@ under the License.
         status="created"/>
     </pair>
 
-  </inConfigs>  
+  </inConfigs>
-</configConfMos> 
+</configConfMos>
-  
+
 <!--
-    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy" 
+    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy"
-    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/ip-range-iprange" 
+    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/ip-range-iprange"
     "org-root/org-TenantC/org-VDC-TenantC/dhcp-server-TenantC-Dhcp-Policy/ip-range-iprange"
-    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS" 
+    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS"
-    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS/dns-8.8.8.8" 
+    "org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS/dns-8.8.8.8"
 -->

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml

@@ -74,7 +74,7 @@ under the License.
       </pair>
     </inConfigs>
 </configConfMos>
-  
+
 <!--
     edgefwdn="org-root/org-TenantD/org-VDC-TenantD/efw-ASA-1000v-TenantD"
     insideintfdn="org-root/org-TenantD/org-VDC-TenantD/efw-ASA-1000v-TenantD/interface-Edge_Inside"

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-nat-policy-ref.xml

@@ -16,7 +16,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<configConfMos 
+<configConfMos
   cookie="%cookie%"
   inHierarchical="false">
   <inConfigs>

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml

@@ -22,7 +22,7 @@ under the License.
   <inConfigs>
     <pair key="%snatpoolexprdn%" >
       <policyObjectGroupExpression
-        dn="%snatpoolexprdn%" 
+        dn="%snatpoolexprdn%"
         opr="eq"
         order="unspecified"
         status="created"/>

plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml

@@ -16,8 +16,8 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<configConfMos 
+<configConfMos
-  cookie="%cookie%" 
+  cookie="%cookie%"
   inHierarchical="false">
     <inConfigs>
 
@@ -56,7 +56,7 @@ under the License.
       </pair>
       <pair key="%natruledn%/rule-cond-2/nw-expr2">
         <policyNetworkExpression
-          dn="%natruledn%/rule-cond-2/nw-expr2" 
+          dn="%natruledn%/rule-cond-2/nw-expr2"
           id="2"
           opr="range"
           status="created"/>

plugins/network-elements/dns-notifier/src/main/resources/components-example.xml

@@ -170,7 +170,7 @@ under the License.
              <param name="premium">true</param>
         </dao>
         <dao name="Snapshot policy defaults" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl" singleton="false"/>
-        <dao name="DiskOffering configuration server" class="com.cloud.storage.dao.DiskOfferingDaoImpl" singleton="false"/>         
+        <dao name="DiskOffering configuration server" class="com.cloud.storage.dao.DiskOfferingDaoImpl" singleton="false"/>
         <dao name="ServiceOffering configuration server" class="com.cloud.service.dao.ServiceOfferingDaoImpl" singleton="false"/>
         <dao name="host zone configuration server" class="com.cloud.dc.dao.DataCenterDaoImpl" singleton="false"/>
         <dao name="host pod configuration server" class="com.cloud.dc.dao.HostPodDaoImpl" singleton="false"/>
@@ -178,7 +178,7 @@ under the License.
         <dao name="NetworkOfferingDao" class="com.cloud.offerings.dao.NetworkOfferingDaoImpl" singleton="false"/>
         <dao name="DataCenterDao" class="com.cloud.dc.dao.DataCenterDaoImpl" singleton="false"/>
         <dao name="NetworkDao" class="com.cloud.network.dao.NetworkDaoImpl" singleton="false"/>
-        <dao name="IpAddressDao" class="com.cloud.network.dao.IPAddressDaoImpl" singleton="false"/>     
+        <dao name="IpAddressDao" class="com.cloud.network.dao.IPAddressDaoImpl" singleton="false"/>
         <dao name="VlanDao" class="com.cloud.dc.dao.VlanDaoImpl" singleton="false"/>
         <dao name="ResourceCountDao" class="com.cloud.configuration.dao.ResourceCountDaoImpl" singleton="false"/>
         <dao name="AccountDao" class="com.cloud.user.dao.AccountDaoImpl" singleton="false"/>

plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml

@@ -31,7 +31,7 @@
         class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
         <property name="name" value="InternalLbVm" />
     </bean>
-    
+
     <bean id="InternalLoadBalancerVMManager" class="org.apache.cloudstack.network.lb.InternalLoadBalancerVMManagerImpl" />
 
 </beans>

plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml

@@ -1,19 +1,19 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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

plugins/network-elements/internal-loadbalancer/src/test/resources/lb_mgr.xml

@@ -1,19 +1,19 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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
@@ -23,7 +23,7 @@
      <context:annotation-config />
 
     <!-- @DB support -->
-      
+
   <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
 
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
@@ -46,5 +46,5 @@
     </bean>
 
     <bean class="org.apache.cloudstack.internallbvmmgr.LbChildTestConfiguration" />
-    
+
 </beans>

plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml

@@ -1,19 +1,19 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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
@@ -23,7 +23,7 @@
      <context:annotation-config />
 
     <!-- @DB support -->
-      
+
   <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
 
   <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
@@ -44,7 +44,7 @@
     <bean id="UserDao" class="com.cloud.user.dao.UserDaoImpl">
         <property name="name" value="UserDao"/>
     </bean>
-  
+
     <bean class="org.apache.cloudstack.internallbvmmgr.LbChildTestConfiguration" />
-    
+
 </beans>

plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml

@@ -1,18 +1,18 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to you under 
+  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 
+  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 
+  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 
+  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 
+  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 
+  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
@@ -68,7 +68,7 @@
     <property name="registry" ref="networkGurusRegistry" />
     <property name="typeClass" value="com.cloud.network.guru.NetworkGuru" />
    </bean>
- 
+
   <!-- registry users -->
   <bean id="NetworkModel" class="com.cloud.network.NetworkModelImpl">
     <property name="networkElements" value="#{networkElementsRegistry.registered}" />

plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml

@@ -22,7 +22,7 @@
   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

plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  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

plugins/storage/image/default/src/main/resources/META-INF/cloudstack/storage-image-default/spring-storage-image-default-context.xml

@@ -29,5 +29,5 @@
 
     <bean id="cloudStackImageStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.CloudStackImageStoreProviderImpl" />
-    
+
 </beans>

plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml

@@ -30,5 +30,5 @@
     <bean id="s3ImageStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.S3ImageStoreProviderImpl" />
 
-    
+
 </beans>

plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml

@@ -29,5 +29,5 @@
 
     <bean id="swiftImageStoreProviderImpl"
         class="org.apache.cloudstack.storage.datastore.provider.SwiftImageStoreProviderImpl" />
-    
+
 </beans>

plugins/storage/volume/datera/pom.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional 
+  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to 
+  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  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 
+  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 
+  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 
+  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  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 
+  OF ANY KIND, either express or implied. See the License for the specific
   language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml

@@ -31,5 +31,5 @@
         class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl" />
 
 
-    
+
 </beans>

plugins/storage/volume/solidfire/src/test/resource/storageContext.xml

@@ -22,7 +22,7 @@
   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,7 +35,7 @@
   <context:component-scan base-package="com.cloud.utils.component" />
   <context:component-scan base-package="com.cloud.host.dao" />
   <context:component-scan base-package="com.cloud.dc.dao" />
- 
+
    <context:component-scan base-package=" com.cloud.upgrade.dao" />
    <tx:annotation-driven transaction-manager="transactionManager" />
   <bean id="aopTestBean" class="org.apache.cloudstack.storage.test.AopTestAdvice"/>
@@ -43,10 +43,10 @@
     <aop:aspect id="AopTestAdvice" ref="aopTestBean">
     <aop:pointcut id="aoptest"
       expression="@annotation(com.cloud.utils.db.DB)" />
-      <aop:around pointcut-ref="aoptest" method="AopTestMethod"/> 
+      <aop:around pointcut-ref="aoptest" method="AopTestMethod"/>
     </aop:aspect>
   </aop:config>
-  
+
   <bean class="org.apache.cloudstack.storage.test.ChildTestConfiguration" />
 
 </beans>

plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml

@@ -1,12 +1,12 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-	license agreements. See the NOTICE file distributed with this work for additional 
+	license agreements. See the NOTICE file distributed with this work for additional
-	information regarding copyright ownership. The ASF licenses this file to 
+	information regarding copyright ownership. The ASF licenses this file to
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	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 
+	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 
+	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 
+	by applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	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 
+	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"

plugins/user-authenticators/md5/src/main/resources/META-INF/cloudstack/md5/spring-md5-context.xml

@@ -30,5 +30,5 @@
     <bean id="MD5UserAuthenticator" class="org.apache.cloudstack.auth.MD5UserAuthenticator">
         <property name="name" value="MD5"/>
     </bean>
-    
+
 </beans>

plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml

@@ -31,5 +31,5 @@
         <property name="name" value="PLAINTEXT" />
     </bean>
 
-    
+
 </beans>

plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml

@@ -30,5 +30,5 @@
     <bean id="SHA256SaltedUserAuthenticator" class="org.apache.cloudstack.auth.SHA256SaltedUserAuthenticator">
         <property name="name" value="SHA256SALT"/>
     </bean>
-    
+
 </beans>

plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/spring-staticpin-context.xml

@@ -31,5 +31,5 @@
         <property name="name" value="STATICPIN" />
     </bean>
 
-    
+
 </beans>

plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/spring-google-context.xml

@@ -31,5 +31,5 @@
         <property name="name" value="TOTP" />
     </bean>
 
-    
+
 </beans>

quickcloud/src/main/resources/META-INF/cloudstack/core/spring-quickcloud-core-context-override.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"
-                      >                     
+                      >
 
     <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.StaticConsoleProxyManager" />
 

scripts/network/juniper/application-add.xml

@@ -20,11 +20,11 @@ under the License.
 <load-configuration>
 <configuration>
 <applications>
-<application>           
+<application>
-<name>%name%</name>     
+<name>%name%</name>
-<protocol>%protocol%</protocol>    
+<protocol>%protocol%</protocol>
 %dest-port-icmp%
-</application>   
+</application>
 </applications>
 </configuration>
 </load-configuration>

scripts/network/juniper/application-getone.xml

@@ -20,9 +20,9 @@ under the License.
 <get-configuration>
 <configuration>
 <applications>
-<application %delete%>           
+<application %delete%>
-<name>%name%</name>        
+<name>%name%</name>
-</application>   
+</application>
 </applications>
 </configuration>
 </get-configuration>

scripts/network/juniper/dest-nat-rule-add.xml

@@ -49,8 +49,4 @@ under the License.
 </security>
 </configuration>
 </load-configuration>
-</rpc>     
+</rpc>
-                        
-                        
-                        
-          

scripts/network/juniper/guest-vlan-filter-term-add.xml

@@ -19,17 +19,17 @@ under the License.
 <rpc>
 <load-configuration>
 <configuration>
-<firewall>        
+<firewall>
-<filter>            
+<filter>
-<name>%filter-name%</name>            
+<name>%filter-name%</name>
-<term>                
+<term>
-<name>%term-name%</name>                               
+<name>%term-name%</name>
-<then>                    
+<then>
-<count>%term-name%</count>                    
+<count>%term-name%</count>
-<accept/>                
+<accept/>
-</then>            
+</then>
-</term>        
+</term>
-</filter>    
+</filter>
 </firewall>
 </configuration>
 </load-configuration>

scripts/network/juniper/private-interface-add.xml

@@ -20,21 +20,21 @@ under the License.
 <load-configuration>
 <configuration>
 <interfaces>
-<interface>            
+<interface>
-<name>%private-interface-name%</name>            
+<name>%private-interface-name%</name>
-<vlan-tagging/>            
+<vlan-tagging/>
-<unit>                
+<unit>
-<name>%vlan-id%</name>                
+<name>%vlan-id%</name>
-<vlan-id>%vlan-id%</vlan-id>                
+<vlan-id>%vlan-id%</vlan-id>
-<family>                    
+<family>
-<inet>                        
+<inet>
-<address>                            
+<address>
-<name>%private-interface-ip%</name>                        
+<name>%private-interface-ip%</name>
-</address>                    
+</address>
-</inet>                
+</inet>
-</family>            
+</family>
-</unit>                           
+</unit>
-</interface>    
+</interface>
 </interfaces>
 </configuration>
 </load-configuration>

scripts/network/juniper/private-interface-getone.xml

@@ -20,13 +20,13 @@ under the License.
 <get-configuration>
 <configuration>
 <interfaces>
-<interface>            
+<interface>
-<name>%private-interface-name%</name>            
+<name>%private-interface-name%</name>
-<vlan-tagging/>            
+<vlan-tagging/>
-<unit %delete%>                
+<unit %delete%>
-<name>%vlan-id%</name>                        
+<name>%vlan-id%</name>
-</unit>                           
+</unit>
-</interface>    
+</interface>
 </interfaces>
 </configuration>
 </get-configuration>

scripts/network/juniper/private-interface-with-filters-add.xml

@@ -20,14 +20,14 @@ under the License.
 <load-configuration>
 <configuration>
 <interfaces>
-<interface>            
+<interface>
-<name>%private-interface-name%</name>            
+<name>%private-interface-name%</name>
-<vlan-tagging/>            
+<vlan-tagging/>
-<unit>                
+<unit>
-<name>%vlan-id%</name>                
+<name>%vlan-id%</name>
-<vlan-id>%vlan-id%</vlan-id>                
+<vlan-id>%vlan-id%</vlan-id>
-<family>                    
+<family>
-<inet>             
+<inet>
 <filter>
 <input>
 <filter-name>%input-filter-name%</filter-name>
@@ -35,14 +35,14 @@ under the License.
 <output>
 <filter-name>%output-filter-name%</filter-name>
 </output>
-</filter>           
+</filter>
-<address>                            
+<address>
-<name>%private-interface-ip%</name>                        
+<name>%private-interface-ip%</name>
-</address>                    
+</address>
-</inet>                
+</inet>
-</family>            
+</family>
-</unit>                           
+</unit>
-</interface>    
+</interface>
 </interfaces>
 </configuration>
 </load-configuration>