apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more problems with aws

Browse Source 
Conflicts:

	setup/bindir/cloud-setup-encryption.in
This commit is contained in:
Alex Huang 2012-10-08 00:57:12 -07:00
parent 0ec3422122
commit 135f5dcfe9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/build-aws-api.xml
View File

@ -225,7 +225,7 @@
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib"> <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
<fileset dir="${jar.dir}"> <fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" /> <include name="cloud-awsapi.jar" />
<include name="cloud-jasypt-1.8.jar" /> <include name="cloud-jasypt-1.9.jar" />
<include name="cloud-utils.jar" /> <include name="cloud-utils.jar" />
</fileset> </fileset>
</copy> </copy>
@ -299,7 +299,7 @@
</fileset> </fileset>
<fileset dir="${jar.dir}"> <fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" /> <include name="cloud-awsapi.jar" />
<include name="cloud-jasypt-1.8.jar" /> <include name="cloud-jasypt-1.9.jar" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${debian.tomcat.dir}/lib"> <copy todir="${debian.tomcat.dir}/lib">
@ -374,7 +374,7 @@
</fileset> --> </fileset> -->
<fileset dir="${jar.dir}"> <fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" /> <include name="cloud-awsapi.jar" />
<include name="cloud-jasypt-1.8.jar" /> <include name="cloud-jasypt-1.9.jar" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${rpm.tomcat.dir}/lib"> <copy todir="${rpm.tomcat.dir}/lib">

2
cloud.spec
View File

@ -401,7 +401,7 @@ fi
mkdir -p $target/webapps7080 mkdir -p $target/webapps7080
if [ ! -e $target/webapps7080/awsapi ]; then if [ ! -e $target/webapps7080/awsapi ]; then
ln -s $root/webapps7080/awsapi $target/webapps7080/awsapi ln -s $root/webapps/awsapi $target/webapps7080/awsapi
fi fi
jars=`ls $root/lib` jars=`ls $root/lib`

2
setup/bindir/cloud-setup-encryption.in
View File

@ -63,7 +63,7 @@ class DBDeployer(object):
dbDotProperties = {} dbDotProperties = {}
dbDotPropertiesIndex = 0 dbDotPropertiesIndex = 0
encryptionKeyFile = '@MSCONF@/key' 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 success = False
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate' magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'