You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/21 02:21:44 UTC
git commit: updated refs/heads/master to c2baed6
Updated Branches:
refs/heads/master 6b62a04ea -> c2baed665
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2baed66
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2baed66
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2baed66
Branch: refs/heads/master
Commit: c2baed665bcf1c10dcf5d85715b199e1ab3a85c6
Parents: 6b62a04
Author: Alex Huang <al...@citrix.com>
Authored: Fri Dec 20 17:21:24 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Dec 20 17:21:34 2013 -0800
----------------------------------------------------------------------
agent/pom.xml | 33 ------------
awsapi/pom.xml | 2 +
build/checkstyle/pom.xml | 21 --------
.../src/main/resources/tooling/checkstyle.xml | 55 --------------------
deps/XenServerJava/pom.xml | 31 -----------
engine/storage/integration-test/pom.xml | 33 ------------
.../test/FakePrimaryDataStoreDriver.java | 7 +++
plugins/user-authenticators/ldap/pom.xml | 2 -
pom.xml | 50 ++++++------------
server/pom.xml | 45 ----------------
tools/checkstyle/cloud-style.xml | 55 ++++++++++++++++++++
usage/pom.xml | 34 ------------
12 files changed, 80 insertions(+), 288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 4e5caae..2036ae0 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -115,38 +115,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 3d269ed..55a1632 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -408,6 +408,7 @@
</executions>
</plugin>
</plugins>
+ <!--
<pluginManagement>
<plugins>
<plugin>
@@ -449,6 +450,7 @@
</plugin>
</plugins>
</pluginManagement>
+ -->
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/build/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle/pom.xml b/build/checkstyle/pom.xml
deleted file mode 100644
index 5984802..0000000
--- a/build/checkstyle/pom.xml
+++ /dev/null
@@ -1,21 +0,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. -->
-<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>
- <artifactId>build-checkstyle</artifactId>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-maven-standard</artifactId>
- <version>4.4.0-SNAPSHOT</version>
- <relativePath>../../maven-standard/pom.xml</relativePath>
- </parent>
-</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/build/checkstyle/src/main/resources/tooling/checkstyle.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle/src/main/resources/tooling/checkstyle.xml b/build/checkstyle/src/main/resources/tooling/checkstyle.xml
deleted file mode 100644
index 47ea1fb..0000000
--- a/build/checkstyle/src/main/resources/tooling/checkstyle.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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">
-
-<module name="Checker">
- <module name="FileTabCharacter">
- <property name="eachLine" value="true" />
- </module>
-
- <module name="TreeWalker">
- <module name="LineLength">
- <property name="max" value="1024" />
- </module>
-
- <module name="RedundantImport" />
- <module name="UnusedImports" />
- <module name="MemberName">
- <property name="format" value="^_?[a-zA-Z0-9]*$" />
- </module>
- <module name="LocalFinalVariableName">
- <property name="format" value="^[a-zA-Z][a-zA-Z0-9_]*$" />
- </module>
- <module name="StaticVariableName">
- <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="ConstantName">
- <property name="format" value="^[a-zA-Z][a-zA-Z0-9_]*$"/>
- </module>
-
- <module name="PackageName" />
- <module name="ParameterName" />
- <module name="TypeName" />
- <module name="AvoidStarImport" />
- </module>
- <module name="RegexpSingleline">
- <!-- \s matches whitespace character, $ matches end of line. -->
- <property name="format" value="\s+$" />
- <property name="message" value="Line has trailing spaces." />
- </module>
-
- <!-- some modules that we should soon add <module name="MagicNumber"/> -->
-
- <!-- some modules that we should soon add -->
-
-</module>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/deps/XenServerJava/pom.xml
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index 6633e06..cdc1e30 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -35,35 +35,4 @@
<version>${cs.xmlrpc.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>build-checkstyle</artifactId>
- <version>${parent.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <failsOnError>true</failsOnError>
- <configLocation>tooling/checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <excludes>**\/*</excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 7de60fc..e002ab3 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -185,38 +185,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
index 7fb9e81..54dbb65 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
@@ -18,6 +18,7 @@
*/
package org.apache.cloudstack.storage.test;
+import java.util.Map;
import java.util.UUID;
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
@@ -106,4 +107,10 @@ public class FakePrimaryDataStoreDriver implements PrimaryDataStoreDriver {
public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
//To change body of implemented methods use File | Settings | File Templates.
}
+
+ @Override
+ public Map<String, String> getCapabilities() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 4d1b7fa..dc4e172 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -92,7 +92,6 @@
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -125,7 +124,6 @@
</plugins>
</pluginManagement>
</build>
-
<dependencies>
<!-- Mandatory dependencies for using Spock -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f975bb0..4a4719e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,6 @@
</organization>
<modules>
- <module>build/checkstyle</module>
<module>api</module>
<module>agent</module>
<module>core</module>
@@ -448,27 +447,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <!--
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>build-checkstyle</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- -->
- <inherited>false</inherited>
+ <inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
- </execution>
+ </execution>
</executions>
<configuration>
<failsOnError>true</failsOnError>
- <configLocation>${project.basedir}/build/checkstyle/src/main/resources/tooling/checkstyle.xml</configLocation>
+ <configLocation>${project.basedir}/tools/checkstyle/cloud-style.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
@@ -549,6 +539,19 @@
<ignore />
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@@ -653,7 +656,6 @@
<exclude>ui/lib/qunit/qunit.js</exclude>
<exclude>ui/lib/reset.css</exclude>
<exclude>ui/lib/require.js</exclude>
- <exclude>waf</exclude>
<exclude>systemvm/conf/agent.properties</exclude>
<exclude>systemvm/conf/environment.properties</exclude>
<exclude>systemvm/js/jquery.js</exclude>
@@ -753,25 +755,6 @@
</plugins>
</pluginManagement>
</build>
- <!--
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <failsOnError>true</failsOnError>
- <configLocation>tooling/checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <includes>**\/*.java</includes>
- <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/awsapi\/,**\/XenServerJava\/,**\/apidoc\/</excludes>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- -->
<profiles>
<profile>
<id>awsapi</id>
@@ -813,7 +796,6 @@
</properties>
<modules>
<module>developer</module>
- <!--module>tools/devcloud</module -->
</modules>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 7929cdf..82a6888 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -50,13 +50,6 @@
<artifactId>cloud-framework-jobs</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-orchestration</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -137,11 +130,6 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>test/resources</directory>
@@ -228,38 +216,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/tools/checkstyle/cloud-style.xml
----------------------------------------------------------------------
diff --git a/tools/checkstyle/cloud-style.xml b/tools/checkstyle/cloud-style.xml
new file mode 100644
index 0000000..47ea1fb
--- /dev/null
+++ b/tools/checkstyle/cloud-style.xml
@@ -0,0 +1,55 @@
+<?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">
+
+<module name="Checker">
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true" />
+ </module>
+
+ <module name="TreeWalker">
+ <module name="LineLength">
+ <property name="max" value="1024" />
+ </module>
+
+ <module name="RedundantImport" />
+ <module name="UnusedImports" />
+ <module name="MemberName">
+ <property name="format" value="^_?[a-zA-Z0-9]*$" />
+ </module>
+ <module name="LocalFinalVariableName">
+ <property name="format" value="^[a-zA-Z][a-zA-Z0-9_]*$" />
+ </module>
+ <module name="StaticVariableName">
+ <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="ConstantName">
+ <property name="format" value="^[a-zA-Z][a-zA-Z0-9_]*$"/>
+ </module>
+
+ <module name="PackageName" />
+ <module name="ParameterName" />
+ <module name="TypeName" />
+ <module name="AvoidStarImport" />
+ </module>
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$" />
+ <property name="message" value="Line has trailing spaces." />
+ </module>
+
+ <!-- some modules that we should soon add <module name="MagicNumber"/> -->
+
+ <!-- some modules that we should soon add -->
+
+</module>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2baed66/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index ecd765e..70575d4 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -44,7 +44,6 @@
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
</dependency>
-
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
@@ -126,39 +125,6 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<profiles>
<profile>