Skip to content

Commit 594b51c

Browse files
spark404spark404
committed
Fixup the license headers in the utils project. All files now use the same license header and this is enforced by the maven-license-check plugin.
1 parent 860b020 commit 594b51c

159 files changed

Lines changed: 1091 additions & 679 deletions

File tree

Some content is hidden

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

‎pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -610,15 +610,6 @@
610610
</execution>
611611
</executions>
612612
</plugin>
613-
<plugin>
614-
<groupId>org.apache.maven.plugins</groupId>
615-
<artifactId>maven-site-plugin</artifactId>
616-
<version>3.3</version>
617-
<configuration>
618-
<port>9000</port>
619-
<tempWebappDirectory>${basedir}/target/site/tempdir</tempWebappDirectory>
620-
</configuration>
621-
</plugin>
622613
<!--This plugin's configuration is used to store Eclipse m2e settings only.
623614
It has no influence on the Maven build itself. -->
624615
<plugin>

‎utils/conf/db.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
#
12
# Licensed to the Apache Software Foundation (ASF) under one
23
# or more contributor license agreements. See the NOTICE file
34
# distributed with this work for additional information
45
# regarding copyright ownership. The ASF licenses this file
56
# to you under the Apache License, Version 2.0 (the
67
# "License"); you may not use this file except in compliance
78
# with the License. You may obtain a copy of the License at
8-
#
9+
#
910
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11+
#
1112
# Unless required by applicable law or agreed to in writing,
1213
# software distributed under the License is distributed on an
1314
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1415
# KIND, either express or implied. See the License for the
1516
# specific language governing permissions and limitations
1617
# under the License.
18+
#
1719

1820

1921
# management server clustering parameters, change cluster.node.IP to the machine IP address

‎utils/conf/log4j-vmops.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one
4-
or more contributor license agreements. See the NOTICE file
5-
distributed with this work for additional information
6-
regarding copyright ownership. The ASF licenses this file
7-
to you under the Apache License, Version 2.0 (the
8-
"License"); you may not use this file except in compliance
9-
with the License. You may obtain a copy of the License at
10-
11-
http://www.apache.org/licenses/LICENSE-2.0
12-
13-
Unless required by applicable law or agreed to in writing,
14-
software distributed under the License is distributed on an
15-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
KIND, either express or implied. See the License for the
17-
specific language governing permissions and limitations
18-
under the License.
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
1921
-->
2022
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
2123

‎utils/pom.xml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<!--
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
92
10-
http://www.apache.org/licenses/LICENSE-2.0
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
1119
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.
1820
-->
1921
<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">
2022
<modelVersion>4.0.0</modelVersion>
@@ -170,6 +172,19 @@
170172
</excludes>
171173
</configuration>
172174
</plugin>
175+
<plugin>
176+
<groupId>com.mycila</groupId>
177+
<artifactId>license-maven-plugin</artifactId>
178+
<executions>
179+
<execution>
180+
<id>cloudstack-checklicence</id>
181+
<phase>process-classes</phase>
182+
<goals>
183+
<goal>check</goal>
184+
</goals>
185+
</execution>
186+
</executions>
187+
</plugin>
173188
</plugins>
174189
<resources>
175190
<resource>

‎utils/src/com/cloud/maint/Version.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
@@ -14,6 +15,8 @@
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
19+
1720
package com.cloud.maint;
1821

1922
public class Version {

‎utils/src/com/cloud/utils/ActionDelegate.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
45
// regarding copyright ownership. The ASF licenses this file
56
// to you under the Apache License, Version 2.0 (the
67
// "License"); you may not use this file except in compliance
7-
// the License. You may obtain a copy of the License at
8+
// with the License. You may obtain a copy of the License at
89
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10+
// http://www.apache.org/licenses/LICENSE-2.0
1011
//
1112
// Unless required by applicable law or agreed to in writing,
1213
// software distributed under the License is distributed on an
1314
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
19+
1720
package com.cloud.utils;
1821

1922
public interface ActionDelegate<T> {

‎utils/src/com/cloud/utils/CloudResourceBundle.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
45
// regarding copyright ownership. The ASF licenses this file
56
// to you under the Apache License, Version 2.0 (the
67
// "License"); you may not use this file except in compliance
7-
// the License. You may obtain a copy of the License at
8+
// with the License. You may obtain a copy of the License at
89
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10+
// http://www.apache.org/licenses/LICENSE-2.0
1011
//
1112
// Unless required by applicable law or agreed to in writing,
1213
// software distributed under the License is distributed on an
1314
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
19+
1720
package com.cloud.utils;
1821

1922
import java.util.Locale;

‎utils/src/com/cloud/utils/DateUtil.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
45
// regarding copyright ownership. The ASF licenses this file
56
// to you under the Apache License, Version 2.0 (the
67
// "License"); you may not use this file except in compliance
7-
// the License. You may obtain a copy of the License at
8+
// with the License. You may obtain a copy of the License at
89
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10+
// http://www.apache.org/licenses/LICENSE-2.0
1011
//
1112
// Unless required by applicable law or agreed to in writing,
1213
// software distributed under the License is distributed on an
1314
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
19+
1720
package com.cloud.utils;
1821

1922
import java.text.DateFormat;

‎utils/src/com/cloud/utils/EnumUtils.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
45
// regarding copyright ownership. The ASF licenses this file
56
// to you under the Apache License, Version 2.0 (the
67
// "License"); you may not use this file except in compliance
7-
// the License. You may obtain a copy of the License at
8+
// with the License. You may obtain a copy of the License at
89
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10+
// http://www.apache.org/licenses/LICENSE-2.0
1011
//
1112
// Unless required by applicable law or agreed to in writing,
1213
// software distributed under the License is distributed on an
1314
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
19+
1720
package com.cloud.utils;
1821

1922
public class EnumUtils {

‎utils/src/com/cloud/utils/ExecutionResult.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//
12
// Licensed to the Apache Software Foundation (ASF) under one
23
// or more contributor license agreements. See the NOTICE file
34
// distributed with this work for additional information
@@ -14,6 +15,7 @@
1415
// KIND, either express or implied. See the License for the
1516
// specific language governing permissions and limitations
1617
// under the License.
18+
//
1719

1820
package com.cloud.utils;
1921

0 commit comments

Comments
 (0)