cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/affinity_groups to ca1a794
Date Fri, 05 Apr 2013 21:03:36 GMT
Revert "maven: Do not copy the management server configuration to the webapp"

This reverts commit a773ab16d6af5cd98245ddb14f0e065acfee48bd.

See devlist for reasoning


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

Branch: refs/heads/affinity_groups
Commit: dbf4cb7e92d07e1d0adfdc84a21c6b3b66083397
Parents: a773ab1
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Thu Apr 4 11:13:13 2013 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Thu Apr 4 11:13:13 2013 +0200

----------------------------------------------------------------------
 client/pom.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbf4cb7e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 06d80d2..9323d0f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -329,6 +329,31 @@
                 <copy todir="${basedir}/target/generated-webapp">
                   <fileset dir="${basedir}/../ui" />
                 </copy>
+                <copy overwrite="true"
+                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                  <fileset dir="${basedir}/tomcatconf">
+                    <include name="*.in" />
+                  </fileset>
+                  <globmapper from="*.in" to="*" />
+                  <filterchain>
+                    <filterreader
+                      classname="org.apache.tools.ant.filters.ReplaceTokens">
+                      <param type="propertiesfile"
+                        value="${cs.replace.properties}" />
+                    </filterreader>
+                  </filterchain>
+                </copy>
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                  <fileset dir="${basedir}/tomcatconf">
+                    <include name="*.in" />
+                  </fileset>
+                  <globmapper from="*.in" to="*" />
+                  <filterchain>
+                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                    </filterreader>
+                  </filterchain>
+                </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/../setup/bindir">
                     <include name="*.in" />


Mime
View raw message