configuring tomcat maven plugin too

This commit is contained in:
olivier lamy 2012-08-28 23:58:06 +02:00
parent 7999dd06ac
commit f6f1be62b9
2 changed files with 18 additions and 3 deletions

View File

@ -114,6 +114,12 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-kvm</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@ -155,8 +161,17 @@
</connector>
</connectors>
<contextPath>/client</contextPath>
<webXml>./WEB-INF/web.xml</webXml>
<webAppSourceDirectory>./target/generated-webapp</webAppSourceDirectory>
<webXml>${basedir}/WEB-INF/web.xml</webXml>
<webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0-beta-1</version>
<configuration>
<tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml>
<warSourceDirectory>./target/generated-webapp</warSourceDirectory>
</configuration>
</plugin>
<plugin>

View File

@ -35,7 +35,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<version>${cs.servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>