You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/10/12 04:25:49 UTC
[5/50] git commit: Fixed more problems with aws
Fixed more problems with aws
Conflicts:
setup/bindir/cloud-setup-encryption.in
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/135f5dcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/135f5dcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/135f5dcf
Branch: refs/heads/javelin
Commit: 135f5dcfe904ab16f09014344a33cc65810c4350
Parents: 0ec3422
Author: Alex Huang <al...@citrix.com>
Authored: Mon Oct 8 00:57:12 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Mon Oct 8 00:59:47 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/135f5dcf/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/135f5dcf/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/135f5dcf/setup/bindir/cloud-setup-encryption.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 35584b3..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'
+ 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'