cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: CLOUDSTACK-257: Add jasypt and axiom
Date Mon, 08 Oct 2012 13:28:25 GMT
Updated Branches:
  refs/heads/4.0 a286f6872 -> 444804203


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

Branch: refs/heads/4.0
Commit: 4448042037a35dca62950aaf36426b802a00afdd
Parents: a286f68
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Mon Oct 8 18:56:55 2012 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Mon Oct 8 18:56:55 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/44480420/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">


Mime
View raw message