Updated Branches: refs/heads/4.0 52e70e60c -> fbdaa4527
Fixed more problems with aws Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fbdaa452 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fbdaa452 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fbdaa452 Branch: refs/heads/4.0 Commit: fbdaa45276f470744ee4cb8e536a4a747b03ffe8 Parents: 52e70e6 Author: Alex Huang <[email protected]> Authored: Mon Oct 8 00:57:12 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Mon Oct 8 00:57:12 2012 -0700 ---------------------------------------------------------------------- build/build-aws-api.xml | 6 +++--- cloud.spec | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fbdaa452/build/build-aws-api.xml ---------------------------------------------------------------------- diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml index d5bf729..006c83f 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"> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fbdaa452/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index a65113b..405db86 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` http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fbdaa452/setup/bindir/cloud-setup-encryption.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in index 19ad721..5f0d35e 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:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.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'
