cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: jetty:run should use ${project.build.directory}/${project.build.finalName} directory
Date Thu, 11 Oct 2012 19:08:53 GMT
Updated Branches:
  refs/heads/master 6dd5c3fd4 -> 2c2afda06


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/2c2afda0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2c2afda0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2c2afda0

Branch: refs/heads/master
Commit: 2c2afda062619b5d8cd977e2ff0bb132a6d0bde0
Parents: 6dd5c3f
Author: Edison Su <sudison@gmail.com>
Authored: Thu Oct 11 12:08:28 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Oct 11 12:08:28 2012 -0700

----------------------------------------------------------------------
 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/2c2afda0/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/2c2afda0/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">


Mime
View raw message