You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by vb...@apache.org on 2008/10/21 20:10:38 UTC

svn commit: r706700 - /incubator/buildr/trunk/addon/buildr/nailgun.rb

Author: vborja
Date: Tue Oct 21 11:10:37 2008
New Revision: 706700

URL: http://svn.apache.org/viewvc?rev=706700&view=rev
Log:
nailgun server setup is now an internal task.

Modified:
    incubator/buildr/trunk/addon/buildr/nailgun.rb

Modified: incubator/buildr/trunk/addon/buildr/nailgun.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/nailgun.rb?rev=706700&r1=706699&r2=706700&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/nailgun.rb (original)
+++ incubator/buildr/trunk/addon/buildr/nailgun.rb Tue Oct 21 11:10:37 2008
@@ -153,24 +153,6 @@
       end
     end # Server
 
-    server_setup = lambda do 
-      module Util
-        include Buildr::Util
-      end
-
-      Util.add_to_sysloader artifact.to_s
-      Util.add_to_sysloader ADDON_BIN
-      
-      class NGClient
-        include org.apache.buildr.BuildrNail
-        include Client
-      end
-
-      class NGServer < com.martiansoftware.nailgun.NGServer
-        include Server
-      end      
-    end
-
     namespace(:nailgun) do
 
       dist_zip = Buildr.download(tmp_path(NAME + '.zip') => URL)
@@ -210,12 +192,29 @@
       task('drb' => ['drb-notice', 'start'])
 
       desc 'Start the nailgun server'
-      task('start' => [installed_bin, artifact]) do |task|
-        server_setup.call
+      task('start' => [installed_bin, 'setup']) do |task|
         server = NGServer.new(nil, PORT)
         server.start
       end
 
+      task('setup' => artifact) do 
+        module Util
+          include Buildr::Util
+        end
+        
+        Util.add_to_sysloader artifact.to_s
+        Util.add_to_sysloader ADDON_BIN
+        
+        class NGClient
+          include org.apache.buildr.BuildrNail
+          include Client
+        end
+        
+        class NGServer < com.martiansoftware.nailgun.NGServer
+          include Server
+        end      
+      end
+      
     end # ng_tasks
       
   end # module Nailgun