From 135f5dcfe904ab16f09014344a33cc65810c4350 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@citrix.com>
Date: Mon, 8 Oct 2012 00:57:12 -0700
Subject: [PATCH] Fixed more problems with aws

Conflicts:

	setup/bindir/cloud-setup-encryption.in
---
 build/build-aws-api.xml                | 6 +++---
 cloud.spec                             | 2 +-
 setup/bindir/cloud-setup-encryption.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index d5bf729a9c6..006c83f75ab 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -225,7 +225,7 @@
 		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.8.jar" />
+				<include name="cloud-jasypt-1.9.jar" />
                                 <include name="cloud-utils.jar" />
 			</fileset>
 		</copy>
@@ -299,7 +299,7 @@
 			</fileset>
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.8.jar" />
+				<include name="cloud-jasypt-1.9.jar" />
 			</fileset>
 		</copy>
 		<copy todir="${debian.tomcat.dir}/lib">
@@ -374,7 +374,7 @@
 			</fileset> -->
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.8.jar" />
+				<include name="cloud-jasypt-1.9.jar" />
 			</fileset>
 		</copy>
 		<copy todir="${rpm.tomcat.dir}/lib">
diff --git a/cloud.spec b/cloud.spec
index a65113b7a6f..405db861a5d 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -401,7 +401,7 @@ fi
 
     mkdir -p $target/webapps7080
     if [ ! -e $target/webapps7080/awsapi ]; then
-        ln -s $root/webapps7080/awsapi $target/webapps7080/awsapi
+        ln -s $root/webapps/awsapi $target/webapps7080/awsapi
     fi
 
     jars=`ls $root/lib`
diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 35584b30147..5f0d35e5bb7 100755
--- a/setup/bindir/cloud-setup-encryption.in
+++ b/setup/bindir/cloud-setup-encryption.in
@@ -63,7 +63,7 @@ class DBDeployer(object):
     dbDotProperties = {}
     dbDotPropertiesIndex = 0
     encryptionKeyFile = '@MSCONF@/key'
-    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar'
+    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.jar:@JAVADIR@/jasypt-1.9.jar'
     success = False
     magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'