Fixed missing actions, added path

nukemberg · nukemberg · commit 33fe25175a6b · 2012-07-21T10:17:49.000+03:00
diff --git a/libraries/provider_java_remote_file.rb b/libraries/provider_java_remote_file.rb
@@ -28,6 +28,13 @@ def load_current_resource
         super
       end
 
+      def action_deploy
+        action_create_if_missing
+      end
+
+      def action_force_deploy
+        action_create
+      end
     end
   end
 end
diff --git a/libraries/resource_java_remote_file.rb b/libraries/resource_java_remote_file.rb
@@ -22,7 +22,6 @@
 class Chef
   class Resource
     class JavaRemoteFile < Chef::Resource::RemoteFile
-
       alias :user :owner
       alias :revision :checksum
       alias :repository :source
@@ -32,6 +31,7 @@ def initialize(name, run_context=nil)
         @resource_name = :java_remote_file
         @provider = Chef::Provider::JavaRemoteFile
         @deploy_to = nil
+        @allowed_actions.push(:deploy, :force_deploy)
       end
 
       def provider
diff --git a/providers/tomcat.rb b/providers/tomcat.rb
@@ -37,10 +37,12 @@
 
   # remove ROOT application
   # TODO create a LWRP to enable/disable tomcat apps
-  directory "#{node['tomcat']['webapp_dir']}/ROOT" do
-    recursive true
-    action :delete
-    not_if "test -L #{node['tomcat']['context_dir']}/ROOT.xml"
+  if new_resource.path == "/" or new_resource == "ROOT"
+    directory "#{node['tomcat']['webapp_dir']}/ROOT" do
+      recursive true
+      action :delete
+      not_if "test -L #{node['tomcat']['context_dir']}/ROOT.xml"
+    end
   end
 
 end
@@ -50,7 +52,9 @@
 
 action :before_symlink do
 
-  link "#{node['tomcat']['context_dir']}/ROOT.xml" do
+  path = new_resource.path == "/" ? "ROOT" : new_resource.pathnew_resource.path
+
+  link "#{node['tomcat']['context_dir']}/#{path}.xml" do
     to "#{new_resource.application.path}/shared/#{new_resource.application.name}.xml"
     notifies :restart, resources(:service => "tomcat")
   end
diff --git a/resources/tomcat.rb b/resources/tomcat.rb
@@ -18,3 +18,4 @@
 #
 
 include Chef::Resource::ApplicationBase
+attribute :path, :default => "ROOT"
diff --git a/templates/default/context.xml.erb b/templates/default/context.xml.erb
@@ -1,4 +1,4 @@
-<Context docBase="<%= @war %>" path="/"
+<Context docBase="<%= @war %>" 
         debug="5" reloadable="true" crossContext="true" allowLinking="true">
   <Environment name="appEnvironment" value="<%= node.chef_environment %>"
           type="java.lang.String" override="false"/>

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,4 @@`
`18`	`18`	`#`
`19`	`19`
`20`	`20`	`include Chef::Resource::ApplicationBase`
	`21`	`+attribute :path, :default => "ROOT"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Context docBase="<%= @war %>" path="/"`
	`1`	`+<Context docBase="<%= @war %>"`
`2`	`2`	`debug="5" reloadable="true" crossContext="true" allowLinking="true">`
`3`	`3`	`<Environment name="appEnvironment" value="<%= node.chef_environment %>"`
`4`	`4`	`type="java.lang.String" override="false"/>`