Skip to content

Commit 5bae118

Browse files
jbamptonjbampton
authored
pre-commit fix mixed line endings in XML files (#10148)
https://github.com/pre-commit/pre-commit-hooks?tab=readme-ov-file#mixed-line-ending
1 parent 0f3ea8c commit 5bae118

File tree

82 files changed

+57573
-57573
lines changed

Some content is hidden

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

82 files changed

+57573
-57573
lines changed

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ repos:
5757
- id: fix-byte-order-marker
5858
- id: forbid-submodules
5959
- id: mixed-line-ending
60-
exclude: \.(cs|xml)$
60+
exclude: \.cs$
6161
- id: trailing-whitespace
6262
files: \.(bat|cfg|cs|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
6363
args: [--markdown-linebreak-ext=md]

‎engine/service/src/main/webapp/WEB-INF/beans.xml

+53-53
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,56 @@
1616
KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
19-
-->
20-
<beans xmlns="http://www.springframework.org/schema/beans"
21-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs"
22-
xmlns:context="http://www.springframework.org/schema/context"
23-
xsi:schemaLocation="
24-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
25-
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
26-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
27-
28-
<import resource="classpath:META-INF/cxf/cxf.xml" />
29-
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
30-
31-
<context:component-scan base-package="org.apache.cloudstack" />
32-
33-
<jaxrs:server id="EngineService" address="/">
34-
<jaxrs:serviceBeans>
35-
<ref bean="ZoneRestService" />
36-
<ref bean="PodRestService" />
37-
<ref bean="ClusterRestService" />
38-
<ref bean="VirtualMachineRestService" />
39-
<ref bean="VolumeRestService" />
40-
</jaxrs:serviceBeans>
41-
<jaxrs:providers>
42-
<bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider" />
43-
</jaxrs:providers>
44-
</jaxrs:server>
45-
46-
<bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
47-
init-method="scan" >
48-
<property name="packages">
49-
<list>
50-
<value>org.apache.cloudstack.framework</value>
51-
</list>
52-
</property>
53-
</bean>
54-
55-
<bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
56-
<property name="onwireClassRegistry" ref="onwireRegistry" />
57-
</bean>
58-
59-
<bean id="transportProvider" class="org.apache.cloudstack.framework.server.ServerTransportProvider" init-method="initialize">
60-
<property name="workerPoolSize" value="5" />
61-
<property name="nodeId" value="Node1" />
62-
<property name="messageSerializer" ref="messageSerializer" />
63-
</bean>
64-
65-
<bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
66-
<constructor-arg ref="transportProvider" />
67-
<property name="messageSerializer" ref="messageSerializer" />
68-
</bean>
69-
70-
<bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
71-
</beans>
19+
-->
20+
<beans xmlns="http://www.springframework.org/schema/beans"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs"
22+
xmlns:context="http://www.springframework.org/schema/context"
23+
xsi:schemaLocation="
24+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
25+
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
26+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
27+
28+
<import resource="classpath:META-INF/cxf/cxf.xml" />
29+
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
30+
31+
<context:component-scan base-package="org.apache.cloudstack" />
32+
33+
<jaxrs:server id="EngineService" address="/">
34+
<jaxrs:serviceBeans>
35+
<ref bean="ZoneRestService" />
36+
<ref bean="PodRestService" />
37+
<ref bean="ClusterRestService" />
38+
<ref bean="VirtualMachineRestService" />
39+
<ref bean="VolumeRestService" />
40+
</jaxrs:serviceBeans>
41+
<jaxrs:providers>
42+
<bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider" />
43+
</jaxrs:providers>
44+
</jaxrs:server>
45+
46+
<bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry"
47+
init-method="scan" >
48+
<property name="packages">
49+
<list>
50+
<value>org.apache.cloudstack.framework</value>
51+
</list>
52+
</property>
53+
</bean>
54+
55+
<bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer">
56+
<property name="onwireClassRegistry" ref="onwireRegistry" />
57+
</bean>
58+
59+
<bean id="transportProvider" class="org.apache.cloudstack.framework.server.ServerTransportProvider" init-method="initialize">
60+
<property name="workerPoolSize" value="5" />
61+
<property name="nodeId" value="Node1" />
62+
<property name="messageSerializer" ref="messageSerializer" />
63+
</bean>
64+
65+
<bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize">
66+
<constructor-arg ref="transportProvider" />
67+
<property name="messageSerializer" ref="messageSerializer" />
68+
</bean>
69+
70+
<bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
71+
</beans>

‎engine/service/src/main/webapp/WEB-INF/web.xml

+27-27
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
19-
-->
20-
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
21-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
23-
metadata-complete="true"
24-
version="3.0">
25-
<context-param>
26-
<param-name>contextConfigLocation</param-name>
27-
<param-value>WEB-INF/beans.xml</param-value>
28-
</context-param>
29-
<listener>
30-
<listener-class>
31-
org.springframework.web.context.ContextLoaderListener
32-
</listener-class>
33-
</listener>
34-
<servlet>
19+
-->
20+
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
23+
metadata-complete="true"
24+
version="3.0">
25+
<context-param>
26+
<param-name>contextConfigLocation</param-name>
27+
<param-value>WEB-INF/beans.xml</param-value>
28+
</context-param>
29+
<listener>
30+
<listener-class>
31+
org.springframework.web.context.ContextLoaderListener
32+
</listener-class>
33+
</listener>
34+
<servlet>
3535
<display-name>CXF Servlet</display-name>
36-
<servlet-name>CXFServlet</servlet-name>
37-
<servlet-class>
38-
org.apache.cxf.transport.servlet.CXFServlet
39-
</servlet-class>
40-
<load-on-startup>1</load-on-startup>
41-
</servlet>
42-
<servlet-mapping>
43-
<servlet-name>CXFServlet</servlet-name>
44-
<url-pattern>/rest/*</url-pattern>
45-
</servlet-mapping>
46-
</web-app>
36+
<servlet-name>CXFServlet</servlet-name>
37+
<servlet-class>
38+
org.apache.cxf.transport.servlet.CXFServlet
39+
</servlet-class>
40+
<load-on-startup>1</load-on-startup>
41+
</servlet>
42+
<servlet-mapping>
43+
<servlet-name>CXFServlet</servlet-name>
44+
<url-pattern>/rest/*</url-pattern>
45+
</servlet-mapping>
46+
</web-app>

‎plugins/hypervisors/baremetal/pom.xml

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
22-
<parent>
23-
<groupId>org.apache.cloudstack</groupId>
24-
<artifactId>cloudstack-plugins</artifactId>
25-
<version>4.21.0.0-SNAPSHOT</version>
26-
<relativePath>../../pom.xml</relativePath>
27-
</parent>
28-
<artifactId>cloud-plugin-hypervisor-baremetal</artifactId>
29-
<name>Apache CloudStack Plugin - Hypervisor Baremetal</name>
30-
<dependencies>
31-
<dependency>
32-
<groupId>commons-lang</groupId>
33-
<artifactId>commons-lang</artifactId>
34-
</dependency>
35-
<dependency>
36-
<groupId>javax.xml.bind</groupId>
37-
<artifactId>jaxb-api</artifactId>
38-
<version>${cs.jaxb.version}</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>com.sun.xml.bind</groupId>
42-
<artifactId>jaxb-core</artifactId>
43-
<version>${cs.jaxb.version}</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>com.sun.xml.bind</groupId>
47-
<artifactId>jaxb-impl</artifactId>
48-
<version>${cs.jaxb.impl.version}</version>
49-
</dependency>
50-
</dependencies>
51-
</project>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.apache.cloudstack</groupId>
24+
<artifactId>cloudstack-plugins</artifactId>
25+
<version>4.21.0.0-SNAPSHOT</version>
26+
<relativePath>../../pom.xml</relativePath>
27+
</parent>
28+
<artifactId>cloud-plugin-hypervisor-baremetal</artifactId>
29+
<name>Apache CloudStack Plugin - Hypervisor Baremetal</name>
30+
<dependencies>
31+
<dependency>
32+
<groupId>commons-lang</groupId>
33+
<artifactId>commons-lang</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>javax.xml.bind</groupId>
37+
<artifactId>jaxb-api</artifactId>
38+
<version>${cs.jaxb.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.sun.xml.bind</groupId>
42+
<artifactId>jaxb-core</artifactId>
43+
<version>${cs.jaxb.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.sun.xml.bind</groupId>
47+
<artifactId>jaxb-impl</artifactId>
48+
<version>${cs.jaxb.impl.version}</version>
49+
</dependency>
50+
</dependencies>
51+
</project>

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

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<configConfMos
20-
cookie="%cookie%"
21-
inHierarchical="false">
22-
23-
<inConfigs>
24-
<pair key="%aclpolicyrefdn%">
25-
<policyPolicyNameRef
26-
dn="%aclpolicyrefdn%"
27-
order="%order%"
28-
policyName="%aclpolicyname%"
29-
status="created"/>
30-
</pair>
31-
32-
</inConfigs>
33-
</configConfMos>
34-
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<configConfMos
20+
cookie="%cookie%"
21+
inHierarchical="false">
22+
23+
<inConfigs>
24+
<pair key="%aclpolicyrefdn%">
25+
<policyPolicyNameRef
26+
dn="%aclpolicyrefdn%"
27+
order="%order%"
28+
policyName="%aclpolicyname%"
29+
status="created"/>
30+
</pair>
31+
32+
</inConfigs>
33+
</configConfMos>
34+
3535
<!--
3636
aclpolicyrefdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-Ingress-ACL-Policy-Set-vlan-123/polref-aaa"
3737
aclpolicyname="aaa"

0 commit comments

Comments
 (0)