fixed m2eclipse error

This commit is contained in:
Anthony Xu 2013-10-29 15:19:15 -07:00
parent 4f8781f681
commit 5bcd8280fd
4 changed files with 237 additions and 230 deletions

View File

@ -46,74 +46,75 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<artifactId>maven-antrun-plugin</artifactId> <plugin>
<executions> <artifactId>maven-antrun-plugin</artifactId>
<execution> <executions>
<id>generate-resource</id> <execution>
<phase>generate-resources</phase> <id>generate-resource</id>
<goals> <phase>generate-resources</phase>
<goal>run</goal> <goals>
</goals> <goal>run</goal>
<configuration> </goals>
<target> <configuration>
<copy <target>
todir="${basedir}/target/transformed"> <copy todir="${basedir}/target/transformed">
<fileset dir="${basedir}/conf"> <fileset dir="${basedir}/conf">
<include name="agent.properties" /> <include name="agent.properties" />
</fileset> </fileset>
</copy> </copy>
<copy overwrite="true" <copy overwrite="true"
todir="${basedir}/target/transformed"> todir="${basedir}/target/transformed">
<fileset dir="${basedir}/conf"> <fileset dir="${basedir}/conf">
<include name="*.in" /> <include name="*.in" />
</fileset> </fileset>
<globmapper from="*.in" to="*" /> <globmapper from="*.in" to="*" />
<filterchain> <filterchain>
<filterreader <filterreader
classname="org.apache.tools.ant.filters.ReplaceTokens"> classname="org.apache.tools.ant.filters.ReplaceTokens">
<param type="propertiesfile" <param type="propertiesfile"
value="${cs.replace.properties}" /> value="${cs.replace.properties}" />
</filterreader> </filterreader>
</filterchain> </filterchain>
</copy> </copy>
<copy overwrite="true" <copy overwrite="true"
todir="${basedir}/target/transformed"> todir="${basedir}/target/transformed">
<fileset dir="${basedir}/bindir"> <fileset dir="${basedir}/bindir">
<include name="*.in" /> <include name="*.in" />
</fileset> </fileset>
<globmapper from="*.in" to="*" /> <globmapper from="*.in" to="*" />
<filterchain> <filterchain>
<filterreader <filterreader
classname="org.apache.tools.ant.filters.ReplaceTokens"> classname="org.apache.tools.ant.filters.ReplaceTokens">
<param type="propertiesfile" <param type="propertiesfile"
value="${cs.replace.properties}" /> value="${cs.replace.properties}" />
</filterreader> </filterreader>
</filterchain> </filterchain>
</copy> </copy>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/dependencies</outputDirectory> <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
<includeScope>runtime</includeScope> <includeScope>runtime</includeScope>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement>
</build> </build>
</project> </project>

View File

@ -58,35 +58,37 @@
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory> <testSourceDirectory>test</testSourceDirectory>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.5.1</version> <artifactId>maven-dependency-plugin</artifactId>
<executions> <version>2.5.1</version>
<execution> <executions>
<id>copy-dependencies</id> <execution>
<phase>package</phase> <id>copy-dependencies</id>
<goals> <phase>package</phase>
<goal>copy-dependencies</goal> <goals>
</goals> <goal>copy-dependencies</goal>
<configuration> </goals>
<outputDirectory>${project.build.directory}/dependencies</outputDirectory> <configuration>
<includeScope>runtime</includeScope> <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
</configuration> <includeScope>runtime</includeScope>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
<plugin> </plugin>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.14</version> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <version>2.14</version>
<excludes> <configuration>
<exclude>**/Qemu*.java</exclude> <excludes>
</excludes> <exclude>**/Qemu*.java</exclude>
</configuration> </excludes>
</plugin> </configuration>
</plugins> </plugin>
</plugins>
</pluginManagement>
</build> </build>
</project> </project>

View File

@ -20,76 +20,78 @@
</parent> </parent>
<build> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.codehaus.gmaven</groupId> <plugin>
<artifactId>gmaven-plugin</artifactId> <groupId>org.codehaus.gmaven</groupId>
<version>1.3</version> <artifactId>gmaven-plugin</artifactId>
<configuration> <version>1.3</version>
<providerSelection>1.7</providerSelection> <configuration>
</configuration> <providerSelection>1.7</providerSelection>
<executions> </configuration>
<execution> <executions>
<goals> <execution>
<goal>compile</goal> <goals>
<goal>testCompile</goal> <goal>compile</goal>
</goals> <goal>testCompile</goal>
<configuration> </goals>
<sources> <configuration>
<fileset> <sources>
<directory>test/groovy</directory> <fileset>
<includes> <directory>test/groovy</directory>
<include>**/*.groovy</include> <includes>
</includes> <include>**/*.groovy</include>
</fileset> </includes>
</sources> </fileset>
</configuration> </sources>
</execution> </configuration>
</executions> </execution>
<dependencies> </executions>
<dependency> <dependencies>
<groupId>org.codehaus.gmaven.runtime</groupId> <dependency>
<artifactId>gmaven-runtime-1.7</artifactId> <groupId>org.codehaus.gmaven.runtime</groupId>
<version>1.3</version> <artifactId>gmaven-runtime-1.7</artifactId>
<exclusions> <version>1.3</version>
<exclusion> <exclusions>
<groupId>org.codehaus.groovy</groupId> <exclusion>
<artifactId>groovy-all</artifactId> <groupId>org.codehaus.groovy</groupId>
</exclusion> <artifactId>groovy-all</artifactId>
</exclusions> </exclusion>
</dependency> </exclusions>
<dependency> </dependency>
<groupId>org.codehaus.groovy</groupId> <dependency>
<artifactId>groovy-all</artifactId> <groupId>org.codehaus.groovy</groupId>
<version>2.0.5</version> <artifactId>groovy-all</artifactId>
</dependency> <version>2.0.5</version>
</dependencies> </dependency>
</plugin> </dependencies>
<plugin> </plugin>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<configuration> <artifactId>maven-surefire-plugin</artifactId>
<includes> <configuration>
<include>**/*Spec*</include> <includes>
</includes> <include>**/*Spec*</include>
</configuration> </includes>
</plugin> </configuration>
</plugin>
<plugin> <plugin>
<groupId>com.btmatthews.maven.plugins</groupId> <groupId>com.btmatthews.maven.plugins</groupId>
<artifactId>ldap-maven-plugin</artifactId> <artifactId>ldap-maven-plugin</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<configuration> <configuration>
<monitorPort>11389</monitorPort> <monitorPort>11389</monitorPort>
<monitorKey>ldap</monitorKey> <monitorKey>ldap</monitorKey>
<daemon>false</daemon> <daemon>false</daemon>
<rootDn>dc=cloudstack,dc=org</rootDn> <rootDn>dc=cloudstack,dc=org</rootDn>
<ldapPort>10389</ldapPort> <ldapPort>10389</ldapPort>
<ldifFile>test/resources/cloudstack.org.ldif</ldifFile> <ldifFile>test/resources/cloudstack.org.ldif</ldifFile>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement>
</build> </build>
<dependencies> <dependencies>

View File

@ -51,74 +51,76 @@
<directory>resources</directory> <directory>resources</directory>
</resource> </resource>
</resources> </resources>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<configuration> <artifactId>maven-surefire-plugin</artifactId>
<excludes> <configuration>
<exclude>com/cloud/usage/UsageManagerTest.java</exclude> <excludes>
</excludes> <exclude>com/cloud/usage/UsageManagerTest.java</exclude>
</configuration> </excludes>
</plugin> </configuration>
<plugin> </plugin>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<executions> <artifactId>maven-dependency-plugin</artifactId>
<execution> <executions>
<id>copy-dependencies</id> <execution>
<phase>package</phase> <id>copy-dependencies</id>
<goals> <phase>package</phase>
<goal>copy-dependencies</goal> <goals>
</goals> <goal>copy-dependencies</goal>
<configuration> </goals>
<outputDirectory>${project.build.directory}/dependencies</outputDirectory> <configuration>
<includeScope>runtime</includeScope> <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
</configuration> <includeScope>runtime</includeScope>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
<plugin> </plugin>
<artifactId>maven-antrun-plugin</artifactId> <plugin>
<executions> <artifactId>maven-antrun-plugin</artifactId>
<execution> <executions>
<id>generate-resource</id> <execution>
<phase>generate-resources</phase> <id>generate-resource</id>
<goals> <phase>generate-resources</phase>
<goal>run</goal> <goals>
</goals> <goal>run</goal>
<configuration> </goals>
<target> <configuration>
<copy overwrite="true" todir="${basedir}/target/transformed"> <target>
<fileset dir="${basedir}/../client/tomcatconf"> <copy overwrite="true" todir="${basedir}/target/transformed">
<include name="**/db.properties.in" /> <fileset dir="${basedir}/../client/tomcatconf">
</fileset> <include name="**/db.properties.in" />
<globmapper from="*.in" to="*" /> </fileset>
<filterchain> <globmapper from="*.in" to="*" />
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> <filterchain>
<param type="propertiesfile" value="${cs.replace.properties}" /> <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
</filterreader> <param type="propertiesfile" value="${cs.replace.properties}" />
</filterchain> </filterreader>
</copy> </filterchain>
</target> </copy>
<target> </target>
<copy overwrite="true" todir="${basedir}/target/transformed"> <target>
<fileset dir="${basedir}/conf"> <copy overwrite="true" todir="${basedir}/target/transformed">
<include name="*.in" /> <fileset dir="${basedir}/conf">
</fileset> <include name="*.in" />
<globmapper from="*.in" to="*" /> </fileset>
<filterchain> <globmapper from="*.in" to="*" />
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> <filterchain>
<param type="propertiesfile" value="${cs.replace.properties}" /> <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
</filterreader> <param type="propertiesfile" value="${cs.replace.properties}" />
</filterchain> </filterreader>
</copy> </filterchain>
</target> </copy>
</configuration> </target>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
</plugins> </plugin>
</plugins>
</pluginManagement>
</build> </build>
<profiles> <profiles>
<profile> <profile>