You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/26 00:16:50 UTC
[8/19] git commit: Adding patches module config for RAT.
Adding patches module config for RAT.
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/853db618
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/853db618
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/853db618
Branch: refs/heads/4.0
Commit: 853db618ba1b59dc319fc7f0c4ac4dabaa7e74de
Parents: f6bc25f
Author: Edison Su <su...@gmail.com>
Authored: Tue Sep 25 15:13:21 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Sep 25 15:13:21 2012 -0700
----------------------------------------------------------------------
patches/pom.xml | 39 +++++++++++++++++++++++++++++++++++++++
pom.xml | 46 ----------------------------------------------
2 files changed, 39 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/853db618/patches/pom.xml
----------------------------------------------------------------------
diff --git a/patches/pom.xml b/patches/pom.xml
index d62fc86..db24f87 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -87,6 +87,45 @@
</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>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/853db618/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3e535a..ff5e6c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,52 +208,6 @@
<exclude>deps/XenServerJava/Makefile</exclude>
<exclude>dist/console-proxy/js/jquery.js</exclude>
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
- <exclude>patches/systemvm/debian/xe/xen-vcpu-hotplug.rules</exclude>
- <exclude>patches/systemvm/debian/xe/xe-linux-distribution.init</exclude>
- <exclude>patches/systemvm/debian/systemvm.vmx</exclude>
- <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/haproxy</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/dnsmasq</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/apache2</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/ppp</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.d/rsyslog</exclude>
- <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/httpd/conf/httpd.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
- <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</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/rsyslog.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
- <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/init.d/postinit</exclude>
- <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
- <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
- <exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/backup.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/fault.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/master.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
- <exclude>patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ</exclude>
- <exclude>patches/systemvm/debian/config/var/lib/misc/dnsmasq.leases</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.conf.orig</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets.orig</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.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/xl2tpd/xl2tpd.conf.orig</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
<exclude>tools/devcloud/devcloud.cfg</exclude>
<exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>