From ed12f4c99c2d8889723861c6d20ce49d395b9761 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Wed, 15 Jan 2014 11:43:39 +0100
Subject: [PATCH] Rename initial config files from *.xml.conf to *.xml

Change-Id: Iee53225718aef26932a9ff2655b3de49dc96d6a7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 opendaylight/distribution/opendaylight/pom.xml         | 10 ++++++++++
 .../initial/{00-netty.xml.conf => 00-netty.xml}        |  0
 .../initial/{01-md-sal.xml.conf => 01-md-sal.xml}      |  0
 3 files changed, 10 insertions(+)
 rename opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/{00-netty.xml.conf => 00-netty.xml} (100%)
 rename opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/{01-md-sal.xml.conf => 01-md-sal.xml} (100%)

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 5acdec834d..a8dd607f44 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1462,6 +1462,16 @@
           </execution>
         </executions>
       </plugin>
+
+        <!--Make checkstyle ignore initial xml configuration files by overriding its configuration from parent-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+        <configuration>
+            <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/</excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml.conf
rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml
diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml.conf
rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
-- 
2.36.6