Merge pull request #65 from Alfresco/TAA-657

Taa 657
AlfrescoLabs · May 23, 2016 · bb085c0 · bb085c0
2 parents 2a88359 + bed0fcb
commit bb085c0
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -93,7 +93,7 @@
 default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u91-b14/jdk-8u91-linux-x64.tar.gz'
 default['java']['jdk']['8']['x86_64']['checksum'] = '3f3d7d0cd70bfe0feab382ed4b0e45c0'
 #3rd-party defaults
-default['alfresco']['imagemagick_version'] = "6.9.4-3"
+default['alfresco']['imagemagick_version'] = "6.9.4-4"
 default['alfresco']['use_imagemagick_os_repo'] = true
 
 default['alfresco']['imagemagick_libs_name'] = "ImageMagick-libs-#{node['alfresco']['imagemagick_version']}.x86_64.rpm"

diff --git a/recipes/_tomcat-attributes.rb b/recipes/_tomcat-attributes.rb
@@ -6,6 +6,8 @@
 node.default['artifacts']['catalina-jmx']['destination'] = "#{node['alfresco']['home']}/lib"
 node.default['artifacts']['catalina-jmx']['owner'] = node['alfresco']['user']
 
+
+
 node.default['artifacts']['memcached-session-manager']['groupId'] = "de.javakaffee.msm"
 node.default['artifacts']['memcached-session-manager']['artifactId'] = "memcached-session-manager"
 node.default['artifacts']['memcached-session-manager']['version'] = "1.9.2"
@@ -27,6 +29,48 @@
 node.default['artifacts']['spymemcached']['destination'] = "#{node['alfresco']['home']}/lib"
 node.default['artifacts']['spymemcached']['owner'] = node['alfresco']['user']
 
+node.default['artifacts']['msm-kryo-serializer']['groupId'] = "de.javakaffee.msm"
+node.default['artifacts']['msm-kryo-serializer']['artifactId'] = "msm-kryo-serializer"
+node.default['artifacts']['msm-kryo-serializer']['version'] = "1.9.2"
+node.default['artifacts']['msm-kryo-serializer']['type'] = 'jar'
+node.default['artifacts']['msm-kryo-serializer']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['msm-kryo-serializer']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['kryo-serializers']['groupId'] = "de.javakaffee"
+node.default['artifacts']['kryo-serializers']['artifactId'] = "kryo-serializers"
+node.default['artifacts']['kryo-serializers']['version'] = "0.34"
+node.default['artifacts']['kryo-serializers']['type'] = 'jar'
+node.default['artifacts']['kryo-serializers']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['kryo-serializers']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['kryo']['groupId'] = "com.esotericsoftware"
+node.default['artifacts']['kryo']['artifactId'] = "kryo"
+node.default['artifacts']['kryo']['version'] = "3.0.3"
+node.default['artifacts']['kryo']['type'] = 'jar'
+node.default['artifacts']['kryo']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['kryo']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['minlog']['groupId'] = "com.esotericsoftware"
+node.default['artifacts']['minlog']['artifactId'] = "minlog"
+node.default['artifacts']['minlog']['version'] = "1.3.0"
+node.default['artifacts']['minlog']['type'] = 'jar'
+node.default['artifacts']['minlog']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['minlog']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['reflectasm']['groupId'] = "com.esotericsoftware"
+node.default['artifacts']['reflectasm']['artifactId'] = "reflectasm"
+node.default['artifacts']['reflectasm']['version'] = "1.11.3"
+node.default['artifacts']['reflectasm']['type'] = 'jar'
+node.default['artifacts']['reflectasm']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['reflectasm']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['asm']['groupId'] = "org.ow2.asm"
+node.default['artifacts']['asm']['artifactId'] = "asm"
+node.default['artifacts']['asm']['version'] = "5.1"
+node.default['artifacts']['asm']['type'] = 'jar'
+node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib"
+node.default['artifacts']['asm']['owner'] = node['alfresco']['user']
+
 node.default['tomcat']['jvm_route'] = "alfresco-#{node['alfresco']['public_hostname']}"
 
 node.default['tomcat']['global_templates'] = [{

diff --git a/recipes/tomcat.rb b/recipes/tomcat.rb
@@ -6,9 +6,10 @@
 node.default['artifacts']['catalina-jmx']['enabled'] = true
 
 if node['alfresco']['components'].include?("share") && !node["tomcat"]["memcached_nodes"].empty?
-  node.default['artifacts']['memcached-session-manager']['enabled'] = true
-  node.default['artifacts']['memcached-session-manager-tc7']['enabled'] = true
-  node.default['artifacts']['spymemcached']['enabled'] = true
+  libraries = ['memcached-session-manager','memcached-session-manager-tc7', 'spymemcached','msm-kryo-serializer','kryo','minlog','reflectasm','asm']
+  libraries.each do |lib|
+    node.default['artifacts'][lib]['enabled'] = true
+  end
 end
 
 context_template_cookbook = node['tomcat']['context_template_cookbook']
@@ -67,7 +68,8 @@
   source 'tomcat/share.xml.erb'
   owner node['alfresco']['user']
   owner node['tomcat']['group']
-  only_if node['alfresco']['components'].include?("share") && !node["tomcat"]["memcached_nodes"].empty?
+  only_if { node['alfresco']['components'].include?("share") }
+  only_if { !node["tomcat"]["memcached_nodes"].empty? }
 end