From 8435e722955b7ca1901f4e23636e7da7bc59ef3c Mon Sep 17 00:00:00 2001
From: Chip Childers <chip.childers@gmail.com>
Date: Tue, 25 Sep 2012 15:01:08 -0400
Subject: [PATCH] Corrected RAT mvn plugin to appropriate exclude things at the
 top level, and to also include subprojects.

---
 patches/pom.xml | 39 ---------------------------------------
 pom.xml         | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/patches/pom.xml b/patches/pom.xml
index db24f87febe..d62fc860185 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -87,45 +87,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.8</version>
-          <configuration>
-            <numUnapprovedLicenses>0</numUnapprovedLicenses>
-            <excludeSubProjects>true</excludeSubProjects>
-            <excludes>
-              <exclude>systemvm/debian/systemvm.vmx</exclude>
-              <exclude>systemvm/debian/config/root/.ssh/authorized_keys</exclude>
-              <exclude>systemvm/debian/config/etc/apache2/httpd.conf</exclude>
-              <exclude>systemvm/debian/config/etc/apache2/ports.conf</exclude>
-              <exclude>systemvm/debian/config/etc/apache2/sites-available/default</exclude>
-              <exclude>systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
-              <exclude>systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
-              <exclude>systemvm/debian/config/etc/dnsmasq.conf</exclude>
-              <exclude>systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
-              <exclude>systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 -->
-              <exclude>systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 -->
-              <exclude>systemvm/debian/config/etc/logrotate.conf</exclude>
-              <exclude>systemvm/debian/config/etc/logrotate.d/*</exclude>
-              <exclude>systemvm/debian/config/etc/sysctl.conf</exclude>
-              <exclude>systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
-              <exclude>systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
-              <exclude>systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 -->
-              <exclude>systemvm/debian/vpn/etc/ipsec.conf</exclude>
-              <exclude>systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
-              <exclude>systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
-              <exclude>systemvm/debian/vpn/etc/ipsec.secrets</exclude>
-              <exclude>systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
-              <exclude>systemvm/debian/config/etc/cloud-nic.rules</exclude>
-              <exclude>systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
-              <exclude>systemvm/debian/config/etc/rc.local</exclude>
-              <exclude>systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
-              <exclude>systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
-              <exclude>systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
-            </excludes>
-          </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 607a461fb06..93621dd0994 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
           <version>0.8</version>
           <configuration>
             <numUnapprovedLicenses>0</numUnapprovedLicenses>
-            <excludeSubProjects>true</excludeSubProjects>
+            <excludeSubProjects>false</excludeSubProjects>
             <excludes>
               <exclude>.git/**</exclude>
               <exclude>.gitignore</exclude>
@@ -235,6 +235,35 @@
               <exclude>ui/lib/qunit/qunit.js</exclude>
               <exclude>ui/lib/reset.css</exclude>
               <exclude>waf</exclude>
+              <exclude>patches/systemvm/debian/systemvm.vmx</exclude>
+              <exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 -->
+              <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 -->
+              <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
+              <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 -->
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
+              <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
+              <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
+              <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
+              <exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
+              <exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
+              <exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
+
             </excludes>
           </configuration>
         </plugin>