packaging: move jasypt jar to cloudstack-common Continuation of the work done in a35f7c7bd179a33e833d3d93f61f94ee7124c3f1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89d3808a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89d3808a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89d3808a Branch: refs/heads/cisco-vnmc-api-integration Commit: 89d3808a182c422e59eacb89585d32704df6b606 Parents: 085846a Author: Hugo Trippaers <[email protected]> Authored: Fri Apr 5 16:08:11 2013 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Fri Apr 5 16:12:27 2013 +0200 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 5 +---- setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89d3808a/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 1a68d9c..d08a1ae 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -248,8 +248,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}%{_javadir}/jasypt-1.9.0.jar -install -D client/target/pythonlibs/jasypt-1.8.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.8.jar +install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/jasypt-1.9.0.jar install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management @@ -485,8 +484,6 @@ fi %{_datadir}/%{name}-management/setup/db/*.sql %{_datadir}/%{name}-management/setup/*.sh %{_datadir}/%{name}-management/setup/server-setup.xml -%{_javadir}/jasypt-1.9.0.jar -%{_javadir}/jasypt-1.8.jar %attr(0755,root,root) %{_bindir}/%{name}-external-ipallocator.py %attr(0755,root,root) %{_initrddir}/%{name}-ipallocator %dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89d3808a/setup/bindir/cloud-setup-databases.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index 0b5cbac..b58dc24 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 = '@JAVADIR@/jasypt-1.9.0.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/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/cloudstack/blob/89d3808a/setup/bindir/cloud-setup-encryption.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in index 19ad721..cf27b37 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' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
