You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/09/30 11:01:54 UTC
[3/5] git commit: updated refs/heads/statscollector-graphite to
38cb7f5
cloudmanagementserver.keystore is corrupted by ant.filters.ReplaceTokens,
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/055fdd50
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/055fdd50
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/055fdd50
Branch: refs/heads/statscollector-graphite
Commit: 055fdd5048cea691e82aa2cb0b33d2d2656afe9b
Parents: 1d01ee3
Author: Anthony Xu <an...@citrix.com>
Authored: Mon Sep 29 11:24:10 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Mon Sep 29 11:26:37 2014 -0700
----------------------------------------------------------------------
client/pom.xml | 8 +-------
client/tomcatconf/cloudmanagementserver.keystore | Bin 0 -> 1316 bytes
client/tomcatconf/cloudmanagementserver.keystore.in | Bin 1316 -> 0 bytes
3 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/055fdd50/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index dccf18d..a0fe596 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -485,14 +485,8 @@
</copy>
<copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
<fileset dir="${basedir}/tomcatconf">
- <include name="*.in"/>
+ <exclude 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">
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/055fdd50/client/tomcatconf/cloudmanagementserver.keystore
----------------------------------------------------------------------
diff --git a/client/tomcatconf/cloudmanagementserver.keystore b/client/tomcatconf/cloudmanagementserver.keystore
new file mode 100644
index 0000000..3ee4d13
Binary files /dev/null and b/client/tomcatconf/cloudmanagementserver.keystore differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/055fdd50/client/tomcatconf/cloudmanagementserver.keystore.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/cloudmanagementserver.keystore.in b/client/tomcatconf/cloudmanagementserver.keystore.in
deleted file mode 100644
index 3ee4d13..0000000
Binary files a/client/tomcatconf/cloudmanagementserver.keystore.in and /dev/null differ