Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF37A10A0E for ; Wed, 3 Dec 2014 22:34:03 +0000 (UTC) Received: (qmail 46604 invoked by uid 500); 3 Dec 2014 22:34:03 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 46568 invoked by uid 500); 3 Dec 2014 22:34:03 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 46559 invoked by uid 99); 3 Dec 2014 22:34:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2014 22:34:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5241C9BDBAC; Wed, 3 Dec 2014 22:34:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <64a61109e29d42c6a3a9f752c57069f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.5 to 43f39a1 Date: Wed, 3 Dec 2014 22:34:03 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.5 482815d08 -> 43f39a1ec packaging: updated hardcoded jasypt version to 1.9.2 Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43f39a1e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43f39a1e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43f39a1e Branch: refs/heads/4.5 Commit: 43f39a1ec37de08e5b8e97dfd74a853c0aae76c7 Parents: 482815d Author: Rohit Yadav Authored: Thu Dec 4 04:02:46 2014 +0530 Committer: Rohit Yadav Committed: Thu Dec 4 04:02:46 2014 +0530 ---------------------------------------------------------------------- debian/rules | 2 +- packaging/centos63/cloud.spec | 4 ++-- scripts/installer/windows/acs.wxs | 6 +++--- scripts/installer/windows/client.wxs | 2 +- scripts/storage/secondary/cloud-install-sys-tmplt | 2 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 197e243..08fca4c 100755 --- a/debian/rules +++ b/debian/rules @@ -135,7 +135,7 @@ install: install -D client/target/utilities/bin/cloud-sysvmadm $(DESTDIR)/usr/bin/cloudstack-sysvmadm install -D systemvm/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso # We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place - install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib + install -D agent/target/dependencies/jasypt-1.9.2.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib # cloudstack-python mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 072a0b9..32eee62 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -312,7 +312,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classe ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py -install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar +install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_managementstartscriptpath}/%{name}-management @@ -664,7 +664,7 @@ fi %attr(0644,root,root) %{python_sitearch}/cloud_utils.py %attr(0644,root,root) %{python_sitearch}/cloud_utils.pyc %attr(0644,root,root) %{python_sitearch}/cloudutils/* -%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar +%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar %{_defaultdocdir}/%{name}-common-%{version}/LICENSE %{_defaultdocdir}/%{name}-common-%{version}/NOTICE http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/scripts/installer/windows/acs.wxs ---------------------------------------------------------------------- diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs index bf09afc..fa8ff41 100644 --- a/scripts/installer/windows/acs.wxs +++ b/scripts/installer/windows/acs.wxs @@ -260,10 +260,10 @@ Execute="deferred" Return="check" /> @@ -307,4 +307,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/scripts/installer/windows/client.wxs ---------------------------------------------------------------------- diff --git a/scripts/installer/windows/client.wxs b/scripts/installer/windows/client.wxs index 6cca15d..3c9121d 100644 --- a/scripts/installer/windows/client.wxs +++ b/scripts/installer/windows/client.wxs @@ -1645,7 +1645,7 @@ - + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/scripts/storage/secondary/cloud-install-sys-tmplt ---------------------------------------------------------------------- diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt index 96b11de..d31377a 100755 --- a/scripts/storage/secondary/cloud-install-sys-tmplt +++ b/scripts/storage/secondary/cloud-install-sys-tmplt @@ -40,7 +40,7 @@ DISKSPACE=5120000 #free disk space required in kilobytes dbHost= dbUser= dbPassword= -jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.0.jar' +jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.2.jar' while getopts 'm:h:f:u:Ft:e:s:o:r:d:' OPTION do case $OPTION in http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f39a1e/setup/bindir/cloud-setup-databases.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index be54ff7..c751dde 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -67,7 +67,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.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/cloudstack/blob/43f39a1e/setup/bindir/cloud-setup-encryption.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in index 35a1737..a617d49 100755 --- a/setup/bindir/cloud-setup-encryption.in +++ b/setup/bindir/cloud-setup-encryption.in @@ -64,7 +64,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'