mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
it's 1.9.0 not 1.9....duh
This commit is contained in:
parent
135f5dcfe9
commit
13d771e57e
@ -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.9.jar" />
|
||||
<include name="jasypt-1.9.0.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.9.jar" />
|
||||
<include name="jasypt-1.9.0.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.9.jar" />
|
||||
<include name="jasypt-1.9.0.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${rpm.tomcat.dir}/lib">
|
||||
|
||||
@ -68,7 +68,7 @@ class DBDeployer(object):
|
||||
dbDotProperties = {}
|
||||
dbDotPropertiesIndex = 0
|
||||
encryptionKeyFile = '@MSCONF@/key'
|
||||
encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.9.jar'
|
||||
encryptionJarPath = '@JAVADIR@/jasypt-1.9.0.jar'
|
||||
success = False
|
||||
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
|
||||
tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql')
|
||||
|
||||
@ -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:@JAVADIR@/jasypt-1.9.jar'
|
||||
encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.jar'
|
||||
success = False
|
||||
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user