You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/10/15 22:29:47 UTC
[36/50] [abbrv] git commit: jetty:run should use
${project.build.directory}/${project.build.finalName} directory
jetty:run should use ${project.build.directory}/${project.build.finalName} directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/88a777f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/88a777f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/88a777f6
Branch: refs/heads/junit-tests
Commit: 88a777f65044c29a620f45a7125ea081f51413ad
Parents: 61f205d
Author: Edison Su <su...@gmail.com>
Authored: Thu Oct 11 12:08:28 2012 -0700
Committer: Chip Childers <ch...@gmail.com>
Committed: Mon Oct 15 16:19:15 2012 -0400
----------------------------------------------------------------------
client/pom.xml | 4 ++--
client/tomcatconf/components-nonoss.xml.in | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/88a777f6/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index e98257a..fb259ff 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -122,7 +122,7 @@
</connectors>
<contextPath>/client</contextPath>
<webXml>${basedir}/WEB-INF/web.xml</webXml>
- <webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory>
+ <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
</configuration>
</plugin>
<plugin>
@@ -130,7 +130,7 @@
<artifactId>tomcat7-maven-plugin</artifactId>
<configuration>
<tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml>
- <warSourceDirectory>./target/generated-webapp</warSourceDirectory>
+ <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/88a777f6/client/tomcatconf/components-nonoss.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/components-nonoss.xml.in b/client/tomcatconf/components-nonoss.xml.in
index e31506d..fbfc5cc 100755
--- a/client/tomcatconf/components-nonoss.xml.in
+++ b/client/tomcatconf/components-nonoss.xml.in
@@ -82,6 +82,9 @@ under the License.
<dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" 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="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
+ <param name="premium">true</param>
+ </dao>
</management-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">