cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject git commit: it's 1.9.0 not 1.9....duh
Date Mon, 08 Oct 2012 08:52:19 GMT
Updated Branches:
  refs/heads/master 135f5dcfe -> 13d771e57


it's 1.9.0 not 1.9....duh


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/13d771e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/13d771e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/13d771e5

Branch: refs/heads/master
Commit: 13d771e57e451e07237489b224846b2b74fc44f7
Parents: 135f5dc
Author: Alex Huang <alex.huang@citrix.com>
Authored: Mon Oct 8 01:51:30 2012 -0700
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Mon Oct 8 01:52:02 2012 -0700

----------------------------------------------------------------------
 build/build-aws-api.xml                |    6 +++---
 setup/bindir/cloud-setup-databases.in  |    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/13d771e5/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 006c83f..d260deb 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.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">

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d771e5/setup/bindir/cloud-setup-databases.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index b2842ef..040be5b 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -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')

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d771e5/setup/bindir/cloud-setup-encryption.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 5f0d35e..19ad721 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:@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'
 


Mime
View raw message