You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/10/08 19:39:13 UTC
[2/8] git commit: CLOUDSTACK-257: Add jasypt and axiom
CLOUDSTACK-257: Add jasypt and axiom
Define rule for ant to copy jasypt and axiom to deploy-rpm target.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5f1ef3b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5f1ef3b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5f1ef3b4
Branch: refs/heads/master
Commit: 5f1ef3b434c0c146c65a36267da16a78cc57900d
Parents: c5e5f73
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Oct 8 18:56:55 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Oct 8 23:06:57 2012 +0530
----------------------------------------------------------------------
build/build-aws-api.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5f1ef3b4/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index ba0ae14..d405700 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -371,10 +371,13 @@
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
<include name="*.jar" />
- </fileset>
+ </fileset>
+ <fileset dir="${base.dir}/deps">
+ <include name="axiom-*.jar"/>
+ <include name="jasypt-1.9.0.jar"/>
+ </fileset>
<fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" />
- <include name="jasypt-1.9.0.jar" />
</fileset>
</copy>
<copy todir="${rpm.tomcat.dir}/lib">