split standalone_jdbc into separate component recipes

tradier · Apr 26, 2012 · bbb4b3b · bbb4b3b
1 parent b6b1d05
commit bbb4b3b
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 40 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -28,10 +28,7 @@
 default['jboss']['jdbc']['driver']['module'] = 'com.h2database.h2'
 default['jboss']['jdbc']['driver']['version'] = ''
 default['jboss']['jdbc']['driver']['class'] = 'org.h2.jdbcx.JdbcDataSource'
-default['jboss']['datasources'] = [] 
-default['jboss']['datasource_drivers'] = {
-  :postgresql => {
-    :module => 'org.postgresql',
-    :xa_datasource_class => 'org.postgresql.xa.PGXADataSource'
-  }
-}
+default['jboss']['datasources'] = []
+default['jboss']['queues'] = []
+default['jboss']['drivers'] = []
+default['jboss']['extra_modules'] = []
diff --git a/recipes/ark.rb b/recipes/ark.rb
@@ -0,0 +1,8 @@
+
+ark 'jboss' do
+  url  node['jboss']['url']
+  checksum node['jboss']['checksum']
+  home_dir node['jboss']['home']
+  version node['jboss']['version']
+  owner node['jboss']['user']
+end
diff --git a/recipes/manage_config_file.rb b/recipes/manage_config_file.rb
@@ -0,0 +1,11 @@
+# only do it for standalone right now, not for standalone-full
+if node['jboss']['manage_config_file']
+  template node['jboss']['config_file'] do
+    source "#{node['jboss']['config']}.xml.erb"
+    variables( :datasources => node['jboss']['datasources'],
+               :drivers => node['jboss']['drivers'],
+               :queues => node['jboss']['queues']
+              )
+    owner node['jboss']['user']
+  end
+end
diff --git a/recipes/sdmx.rb b/recipes/sdmx.rb
@@ -0,0 +1,32 @@
+#
+# Cookbook Name:: jboss
+# Recipe:: sdmx
+# Author:: Bryan W. Berry (<bryan.berry@gmail.com>)
+# Copyright 2012, Food and Agriculture Organization of the United Nations
+#
+# license Apache v2.0
+#
+
+include_recipe "maven"
+
+node['jboss']['java_opts'] = update_java_opts_from_env( node['jboss']['java_opts'] )
+node['jboss']['config_file'] = "#{node['jboss']['home']}/standalone/configuration/#{node['jboss']['config']}.xml"
+
+# create user
+user node['jboss']['user']
+
+include_recipe "jboss::ark"
+include_recipe "jboss::standalone_service_sysv"
+include_recipe "jboss::extra_modules"
+include_recipe "jboss::manage_config_file"
+
+# this is so the ciserver user has rw access to make deployments
+directory "#{node['jboss']['home']}/standalone/deployments" do
+  mode "0775"
+end
+
+# start service
+service node['jboss']['user'] do
+  subscribes :restart, resources( :template => node['jboss']['config_file']), :immediately if node['jboss']['manage_config_file']
+  action [ :enable, :start ]
+end
diff --git a/recipes/standalone_jdbc.rb b/recipes/standalone_jdbc.rb
@@ -7,47 +7,27 @@
 # license Apache v2.0
 #
 
-jboss_home = node['jboss']['home']
-jboss_user = node['jboss']['user']
-
 include_recipe "maven"
 
 node['jboss']['datasources'] = populate_datasources_from_env( node['jboss']['datasources'] )
 node['jboss']['java_opts'] = update_java_opts_from_env( node['jboss']['java_opts'] )
-jboss_config_file = "#{node['jboss']['home']}/standalone/configuration/#{node['jboss']['config']}.xml"
+node['jboss']['config_file'] = "#{node['jboss']['home']}/standalone/configuration/#{node['jboss']['config']}.xml"
 
 # create user
 user node['jboss']['user']
 
-ark 'jboss' do
-  url  node['jboss']['url']
-  checksum node['jboss']['checksum']
-  home_dir node['jboss']['home']
-  version node['jboss']['version']
-  owner node['jboss']['user']
-end
-
+include_recipe "jboss::ark"
 include_recipe "jboss::standalone_service_sysv"
 include_recipe "jboss::extra_modules"
-
-# only do it for standalone right now, not for standalone-full
-if node['jboss']['manage_config_file']
-  template jboss_config_file do
-    source "#{node['jboss']['config']}.xml.erb"
-    variables( :datasources => node['jboss']['datasources'],
-               :drivers => node['jboss']['drivers']
-              )
-    owner node['jboss']['user']
-  end
-end
+include_recipe "jboss::manage_config_file"
 
 # this is so the ciserver user has rw access to make deployments
 directory "#{node['jboss']['home']}/standalone/deployments" do
-  mode "0755"
+  mode "0775"
 end
 
 # start service
-service jboss_user do
-  subscribes :restart, resources( :template => jboss_config_file), :immediately if node['jboss']['manage_config_file']
+service node['jboss']['user'] do
+  subscribes :restart, resources( :template => node['jboss']['config_file'] ), :immediately if node['jboss']['manage_config_file']
   action [ :enable, :start ]
 end
diff --git a/templates/default/standalone-full.xml.erb b/templates/default/standalone-full.xml.erb
@@ -289,14 +289,12 @@
                     </pooled-connection-factory>
                 </jms-connection-factories>
                 <jms-destinations>
-                    <jms-queue name="testQueue">
-                        <entry name="queue/test"/>
-                        <entry name="java:jboss/exported/jms/queue/test"/>
+                  <% @queues.each do |queue| -%>
+                    <jms-queue name="<%= queue %>">
+                        <entry name="queue/<%= queue %>"/>
+                        <entry name="java:jboss/exported/jms/queue/<%= queue %>"/>
                     </jms-queue>
-                    <jms-topic name="testTopic">
-                        <entry name="topic/test"/>
-                        <entry name="java:jboss/exported/jms/topic/test"/>
-                    </jms-topic>
+                    <% end -%>
                 </jms-destinations>
             </hornetq-server>
         </subsystem>