jetty:run should use ${project.build.directory}/${project.build.finalName} directory

This commit is contained in:
Edison Su 2012-10-11 12:08:28 -07:00
parent 6dd5c3fd42
commit 2c2afda062
2 changed files with 5 additions and 2 deletions

View File

@ -122,7 +122,7 @@
</connectors> </connectors>
<contextPath>/client</contextPath> <contextPath>/client</contextPath>
<webXml>${basedir}/WEB-INF/web.xml</webXml> <webXml>${basedir}/WEB-INF/web.xml</webXml>
<webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory> <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -130,7 +130,7 @@
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<configuration> <configuration>
<tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml> <tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml>
<warSourceDirectory>./target/generated-webapp</warSourceDirectory> <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -82,6 +82,9 @@ under the License.
<dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/> <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
<dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/> <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
<dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/> <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
<dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
<param name="premium">true</param>
</dao>
</management-server> </management-server>
<configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server"> <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server">
<dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">