Skip to content

Commit c923e67

Browse files
jbamptonjbampton
authored
pre-commit: add XML files to the trailing-whitespace check (apache#9131)
1 parent cea4801 commit c923e67

File tree

179 files changed

+3335
-3339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+3335
-3339
lines changed

‎.pre-commit-config.yaml

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
>
2929

3030
<bean id="apiServiceConfiguration" class="org.apache.cloudstack.config.ApiServiceConfiguration" />
31-
31+
3232
</beans>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
<bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner">
3131
<property name="name" value="UserDispersingPlanner" />
3232
</bean>
33-
33+
3434
</beans>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
2626
http://www.springframework.org/schema/context
2727
http://www.springframework.org/schema/context/spring-context.xsd"
28-
>
28+
>
2929

3030
<!-- There is no reason to put anything here -->
3131

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
2828
http://www.springframework.org/schema/context
2929
http://www.springframework.org/schema/context/spring-context.xsd"
30-
>
30+
>
3131

3232
<bean id="usageEventUtils" class="com.cloud.event.UsageEventUtils" />
3333

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
2828
http://www.springframework.org/schema/context
2929
http://www.springframework.org/schema/context/spring-context.xsd"
30-
>
30+
>
3131

3232
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
3333
<property name="registry" ref="hostAllocatorsRegistry" />

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<property name="registry" ref="apiAclCheckersRegistry" />
6363
<property name="typeClass" value="org.apache.cloudstack.acl.APIAclChecker" />
6464
</bean>
65-
65+
6666
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
6767
<property name="registry" ref="querySelectorsRegistry" />
6868
<property name="typeClass" value="org.apache.cloudstack.acl.QuerySelector" />
6969
</bean>
70-
70+
7171
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
7272
<property name="registry" ref="userPasswordEncodersRegistry" />
7373
<property name="typeClass" value="org.apache.cloudstack.auth.UserAuthenticator" />

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<bean class="org.apache.cloudstack.spring.lifecycle.registry.DumpRegistry" >
263263
<property name="registries" value="#{registryRegistry.registered}" />
264264
</bean>
265-
265+
266266
<bean id="registryRegistry"
267267
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
268268
</bean>
@@ -276,11 +276,11 @@
276276
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
277277
<property name="excludeKey" value="api.checkers.acl.exclude" />
278278
</bean>
279-
279+
280280
<bean id="querySelectorsRegistry"
281281
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
282282
<property name="excludeKey" value="query.selectors.exclude" />
283-
</bean>
283+
</bean>
284284

285285
<bean id="apiCommandsRegistry"
286286
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<property name="typeClass"
9393
value="com.cloud.network.element.Site2SiteVpnServiceProvider" />
9494
</bean>
95-
95+
9696
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
9797
<property name="registry" ref="remoteAccessVPNServiceProviderRegistry" />
9898
<property name="typeClass"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<property name="typeClass" value="com.cloud.template.TemplateAdapter" />
5353
</bean>
5454

55-
55+
5656
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
5757
<property name="registry" ref="podAllocatorsRegistry" />
5858
<property name="typeClass"
@@ -76,7 +76,7 @@
7676
<property name="typeClass"
7777
value="org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy" />
7878
</bean>
79-
8079

81-
80+
81+
8282
</beans>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
2828
http://www.springframework.org/schema/context
2929
http://www.springframework.org/schema/context/spring-context.xsd"
30-
>
30+
>
3131

3232
<!--
3333
LifeCycle
@@ -43,13 +43,13 @@
4343
<bean id="transactionContextInterceptor" class="com.cloud.utils.db.TransactionContextInterceptor" />
4444
<bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
4545
<aop:config>
46-
<aop:advisor advice-ref="transactionContextInterceptor"
46+
<aop:advisor advice-ref="transactionContextInterceptor"
4747
pointcut="target(com.cloud.utils.db.GenericDaoBase)" />
48-
<aop:advisor advice-ref="transactionContextInterceptor"
48+
<aop:advisor advice-ref="transactionContextInterceptor"
4949
pointcut="execution(* com.cloud.utils.db.EntityManager.*(..))" />
50-
<aop:advisor advice-ref="actionEventInterceptor"
50+
<aop:advisor advice-ref="actionEventInterceptor"
5151
pointcut="execution(* *(..)) &amp;&amp; @annotation(com.cloud.event.ActionEvent)" />
52-
<aop:advisor advice-ref="actionEventInterceptor"
52+
<aop:advisor advice-ref="actionEventInterceptor"
5353
pointcut="execution(* *(..)) &amp;&amp; @annotation(com.cloud.event.ActionEvents)" />
5454
</aop:config>
5555

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
<property name="listeners">
3737
<list>
3838
<!-- Put CallContext listener first because it will open and then close a DB connection.
39-
If you put it after the TransactionContextListener, the thread will hold open a DB
39+
If you put it after the TransactionContextListener, the thread will hold open a DB
4040
connection for the life of the thread -->
4141
<bean class="org.apache.cloudstack.context.CallContextListener" />
4242
<bean class="org.apache.cloudstack.context.LogContextListener" />
4343
<bean class="com.cloud.utils.db.TransactionContextListener" />
4444
</list>
4545
</property>
4646
</bean>
47-
48-
<bean class="org.apache.cloudstack.managed.context.ManagedContextRunnable" factory-method="initializeGlobalContext"
47+
48+
<bean class="org.apache.cloudstack.managed.context.ManagedContextRunnable" factory-method="initializeGlobalContext"
4949
autowire-candidate="false" >
5050
<constructor-arg><ref bean="ManagedContext"/></constructor-arg>
5151
</bean>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
<bean id="volumeRestService" class="org.apache.cloudstack.engine.rest.service.api.VolumeRestService" />
4141
<bean id="volumeTypeHelper" class="org.apache.cloudstack.engine.subsystem.api.storage.type.VolumeTypeHelper" />
4242
<bean id="zoneRestService" class="org.apache.cloudstack.engine.rest.service.api.ZoneRestService" />
43-
43+
4444
</beans>

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
xmlns:context="http://www.springframework.org/schema/context"
2222
xmlns:aop="http://www.springframework.org/schema/aop"
2323
xmlns:util="http://www.springframework.org/schema/util"
24-
24+
2525
xsi:schemaLocation="http://www.springframework.org/schema/beans
2626
http://www.springframework.org/schema/beans/spring-beans.xsd
27-
http://www.springframework.org/schema/aop
27+
http://www.springframework.org/schema/aop
2828
http://www.springframework.org/schema/aop/spring-aop.xsd
2929
http://www.springframework.org/schema/context
3030
http://www.springframework.org/schema/context/spring-context.xsd
@@ -70,15 +70,15 @@
7070
class="org.apache.cloudstack.engine.orchestration.CloudOrchestrator" />
7171
<bean id="dataCenterResourceManagerImpl"
7272
class="org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManagerImpl" />
73-
73+
7474
<bean id="vMEntityManagerImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VMEntityManagerImpl" >
7575
<property name="planners" value="#{deploymentPlannersRegistry.registered}" />
7676
</bean>
77-
77+
7878
<bean id="virtualMachineEntityImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityImpl" />
79-
79+
8080
<bean id="virtualMachinePowerStateSyncImpl" class="com.cloud.vm.VirtualMachinePowerStateSyncImpl" />
81-
81+
8282
<bean id= "vmWorkJobDispatcher" class="com.cloud.vm.VmWorkJobDispatcher">
8383
<property name="name">
8484
<util:constant static-field="com.cloud.vm.VmWorkConstants.VM_WORK_JOB_DISPATCHER"/>
@@ -96,5 +96,5 @@
9696
<util:constant static-field="com.cloud.vm.VmWorkConstants.VM_WORK_JOB_WAKEUP_DISPATCHER"/>
9797
</property>
9898
</bean>
99-
99+
100100
</beans>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
<bean id="StorageCacheReplacementAlgorithm"
3535
class="org.apache.cloudstack.storage.cache.manager.StorageCacheReplacementAlgorithmLRU" />
3636

37-
37+
3838
</beans>

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
under the License.
1818
-->
1919
<beans xmlns="http://www.springframework.org/schema/beans"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xmlns:context="http://www.springframework.org/schema/context"
22-
xmlns:tx="http://www.springframework.org/schema/tx"
22+
xmlns:tx="http://www.springframework.org/schema/tx"
2323
xmlns:aop="http://www.springframework.org/schema/aop"
2424
xsi:schemaLocation="http://www.springframework.org/schema/beans
2525
http://www.springframework.org/schema/beans/spring-beans.xsd
26-
http://www.springframework.org/schema/tx
26+
http://www.springframework.org/schema/tx
2727
http://www.springframework.org/schema/tx/spring-tx.xsd
2828
http://www.springframework.org/schema/aop
2929
http://www.springframework.org/schema/aop/spring-aop.xsd
@@ -35,10 +35,10 @@
3535
Compose a CloudStack deployment with selected components here
3636
-->
3737
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
38-
38+
3939
<bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" />
4040
<bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" />
41-
41+
4242
<bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
4343
<bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" />
4444
<bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" />
@@ -47,15 +47,15 @@
4747
<bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" />
4848
<bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" />
4949
<bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" />
50-
51-
50+
51+
5252
<!--
5353
Adapters
5454
-->
5555
<bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator">
5656
<property name="name" value="FirstFitRouting"/>
5757
</bean>
58-
58+
5959
<!--
6060
Storage pool allocators
6161
-->
@@ -74,7 +74,7 @@
7474
<property name="name" value="Balance"/>
7575
</bean>
7676

77-
77+
7878
<bean id="ExternalIpAddressAllocator" class="com.cloud.network.ExternalIpAddressAllocator">
7979
<property name="name" value="Basic"/>
8080
</bean>
@@ -89,7 +89,7 @@
8989
<bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator">
9090
<property name="name" value="XenServerInvestigator"/>
9191
</bean>
92-
92+
9393
<bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator">
9494
<property name="name" value="PingInvestigator"/>
9595
</bean>
@@ -138,8 +138,8 @@
138138
<bean id="BareMetalPlanner" class="com.cloud.deploy.BareMetalPlanner">
139139
<property name="name" value="BareMetal Fit"/>
140140
</bean>
141-
142-
141+
142+
143143
<!--
144144
Network Gurus
145145
-->
@@ -179,11 +179,11 @@
179179
<bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru">
180180
<property name="name" value="XenServerGuru"/>
181181
</bean>
182-
182+
183183
<bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru">
184184
<property name="name" value="KVMGuru"/>
185185
</bean>
186-
186+
187187
<bean id="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru">
188188
<property name="name" value="BareMetalGuru"/>
189189
</bean>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
<parameter name="devcloud-local-storage-uuid" value="cd10cac1-4772-92e5-5da6-c2bc16b1ce1b"/>
2929
<parameter name="devcloud-host-uuid" value="759ee4c9-a15a-297b-67c6-ac267d8aa429"/>
3030
<parameter name="devcloud-secondary-storage" value="nfs://192.168.56.10/opt/storage/secondary"/>
31-
31+
3232
<parameter name="s3-accesskey" value="OYAZXCAFUC1DAFOXNJWI"/>
3333
<parameter name="s3-secretkey" value="YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ=="/>
3434
<parameter name="s3-endpoint" value="10.223.89.7:8080" />
3535
<parameter name="s3-template-bucket" value="s3://cstemplates"/>
3636
<parameter name="s3-usehttps" value="false" />
37-
37+
3838
<listeners>
3939
<listener class-name="org.apache.cloudstack.storage.test.TestNGAop" />
4040
</listeners>
41-
41+
4242
<test name="integration-tests">
4343
<packages>
4444
<package name="org.apache.cloudstack.storage.test"/>

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
3-
license agreements. See the NOTICE file distributed with this work for additional
4-
information regarding copyright ownership. The ASF licenses this file to
5-
you under the Apache License, Version 2.0 (the "License"); you may not use
6-
this file except in compliance with the License. You may obtain a copy of
7-
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
8-
by applicable law or agreed to in writing, software distributed under the
9-
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
10-
OF ANY KIND, either express or implied. See the License for the specific
2+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
3+
license agreements. See the NOTICE file distributed with this work for additional
4+
information regarding copyright ownership. The ASF licenses this file to
5+
you under the Apache License, Version 2.0 (the "License"); you may not use
6+
this file except in compliance with the License. You may obtain a copy of
7+
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
8+
by applicable law or agreed to in writing, software distributed under the
9+
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
10+
OF ANY KIND, either express or implied. See the License for the specific
1111
language governing permissions and limitations under the License. -->
1212
<beans xmlns="http://www.springframework.org/schema/beans"
1313
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
1414
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
1515
xsi:schemaLocation="http://www.springframework.org/schema/beans
1616
http://www.springframework.org/schema/beans/spring-beans.xsd
17-
http://www.springframework.org/schema/tx
17+
http://www.springframework.org/schema/tx
1818
http://www.springframework.org/schema/tx/spring-tx.xsd
1919
http://www.springframework.org/schema/aop
2020
http://www.springframework.org/schema/aop/spring-aop.xsd
2121
http://www.springframework.org/schema/context
2222
http://www.springframework.org/schema/context/spring-context.xsd">
2323
<context:annotation-config />
24-
24+
2525
<bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
2626
<bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
2727
<bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
@@ -36,10 +36,10 @@
3636
</bean>
3737

3838
<bean id="imageStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDaoImpl" />
39-
<bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDaoImpl" />
40-
<bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" />
41-
<bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
42-
<bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />
39+
<bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDaoImpl" />
40+
<bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDaoImpl" />
41+
<bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
42+
<bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />
4343
<bean id="objectInDataStoreDaoImpl" class="org.apache.cloudstack.storage.db.ObjectInDataStoreDaoImpl" />
4444
<bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
4545
<bean id="primaryDataStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.volume.db.PrimaryDataStoreDetailsDaoImpl" />
@@ -56,7 +56,7 @@
5656
<bean id="dataObjectManagerImpl" class="org.apache.cloudstack.storage.datastore.DataObjectManagerImpl" />
5757
<bean id="dataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.DataStoreManagerImpl" />
5858
<bean id="primaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" />
59-
<bean id="imageStoreProviderManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" />
59+
<bean id="imageStoreProviderManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" />
6060
<bean id="iSCSI" class="org.apache.cloudstack.storage.datastore.type.ISCSI" />
6161
<bean id="ISO" class="org.apache.cloudstack.storage.image.format.ISO" />
6262
<bean id="templateDataFactoryImpl" class="org.apache.cloudstack.storage.image.TemplateDataFactoryImpl" />

0 commit comments

Comments
 (0)