Fix several rat issues introduced by recent commits
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/479f404a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/479f404a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/479f404a Branch: refs/heads/rbac Commit: 479f404aeafb4874cd660f113c0281e10db02114 Parents: 9e5e9fd Author: Hugo Trippaers <[email protected]> Authored: Mon Nov 4 20:14:46 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Nov 4 20:14:46 2013 +0100 ---------------------------------------------------------------------- parents/checkstyle/pom.xml | 10 ++++++++ .../src/main/resources/tooling/checkstyle.xml | 18 +++++++++++++ .../debian/config/etc/logrotate.d/cloud | 11 -------- .../management/ProviderTestConfiguration.java | 26 ++++++++++++++++--- .../PublicNetworkTestConfiguration.java | 26 ++++++++++++++++--- .../test/resources/providerContext.xml | 18 +++++++++++++ .../test/resources/publicNetworkContext.xml | 10 ++++++++ pom.xml | 1 + .../patches/debian/config/etc/logrotate.d/cloud | 27 ++++++++++++++++++++ 9 files changed, 128 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/parents/checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml index de60100..b1b7b21 100644 --- a/parents/checkstyle/pom.xml +++ b/parents/checkstyle/pom.xml @@ -1,3 +1,13 @@ +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> <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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <name>Apache CloudStack Checkstyle Configuration</name> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml ---------------------------------------------------------------------- diff --git a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml index 8465383..83493d6 100644 --- a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml +++ b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml @@ -1,4 +1,22 @@ <?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/patches/systemvm/debian/config/etc/logrotate.d/cloud ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/etc/logrotate.d/cloud b/patches/systemvm/debian/config/etc/logrotate.d/cloud deleted file mode 100644 index 40c4203..0000000 --- a/patches/systemvm/debian/config/etc/logrotate.d/cloud +++ /dev/null @@ -1,11 +0,0 @@ -/var/log/cloud.log { - rotate 4 - daily - missingok - notifempty - compress - delaycompress - postrotate - pkill socat > /dev/null - endscript -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java index 818d6a0..3c21590 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.cloudstack.network.contrail.management; import org.springframework.context.annotation.Bean; @@ -5,8 +23,8 @@ import org.springframework.context.annotation.Configuration; @Configuration public class ProviderTestConfiguration { - @Bean - ServerDBSync getServerDBSync() { - return new ServerDBSyncImpl(); - } + @Bean + ServerDBSync getServerDBSync() { + return new ServerDBSyncImpl(); + } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java index a184b14..b41e282 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.cloudstack.network.contrail.management; import org.mockito.Mockito; @@ -6,8 +24,8 @@ import org.springframework.context.annotation.Configuration; @Configuration public class PublicNetworkTestConfiguration { - @Bean - ServerDBSync getServerDBSync() { - return Mockito.mock(ServerDBSync.class); - } + @Bean + ServerDBSync getServerDBSync() { + return Mockito.mock(ServerDBSync.class); + } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml b/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml index f412bc0..62a9f62 100644 --- a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml +++ b/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml b/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml index 3b67b51..db978e7 100644 --- a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml +++ b/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml @@ -1,4 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b8b2a37..6ea62c2 100644 --- a/pom.xml +++ b/pom.xml @@ -651,6 +651,7 @@ <exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude> <exclude>tools/ngui/static/bootstrap/*</exclude> <exclude>tools/ngui/static/js/lib/*</exclude> + <exclude>**/.checkstyle</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/systemvm/patches/debian/config/etc/logrotate.d/cloud ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud new file mode 100644 index 0000000..37440ac --- /dev/null +++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +/var/log/cloud.log { + rotate 4 + daily + missingok + notifempty + compress + delaycompress + postrotate + pkill socat > /dev/null + endscript +}
