cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/master to 49c9fbf
Date Wed, 07 Aug 2013 08:05:15 GMT
Updated Branches:
  refs/heads/master 31fe99ef9 -> 49c9fbfb7


CLOUDSTACK-3650: CloudStack scripts fail when running on Jetty because the executable flag
is not set on their permissions.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/49c9fbfb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49c9fbfb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49c9fbfb

Branch: refs/heads/master
Commit: 49c9fbfb70413f86642956423c4bbba2e43d8aec
Parents: 31fe99e
Author: Donal Lafferty <donal.lafferty@citrix.com>
Authored: Wed Aug 7 13:22:05 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Wed Aug 7 13:37:33 2013 +0530

----------------------------------------------------------------------
 client/pom.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49c9fbfb/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 39299dd..bebf86a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -336,8 +336,8 @@
               <maxIdleTime>60000</maxIdleTime>
             </connector>
           </connectors>
-          <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
-          <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+          <webXml>${project.build.directory}/generated-webapp/WEB-INF/web.xml</webXml>
+          <webAppSourceDirectory>${project.build.directory}/generated-webapp</webAppSourceDirectory>
           <webAppConfig>
             <contextPath>/client</contextPath>
             <extraClasspath>${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
@@ -389,10 +389,7 @@
                   <fileset dir="${basedir}/../scripts" />
                 </copy>
                 <!-- CLOUDSTACK-1304 -->
-                <chmod perm="755">
-                  <fileset
-                    dir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts" />
-                </chmod>
+                <chmod perm="755" file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**"
type="both" />
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/">
                   <fileset dir="${basedir}/WEB-INF/">
                     <include name="web.xml" />


Mime
View raw message