svn commit: r612537 - in /incubator/buildr/trunk/lib/java: java.rb rjb.rb

[as...@apache.org]

Author: assaf
Date: Wed Jan 16 10:27:46 2008
New Revision: 612537

URL: http://svn.apache.org/viewvc?rev=612537&view=rev
Log:
Java.java now returns the package, or runs the command

Modified:
    incubator/buildr/trunk/lib/java/java.rb
    incubator/buildr/trunk/lib/java/rjb.rb

Modified: incubator/buildr/trunk/lib/java/java.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/java/java.rb?rev=612537&r1=612536&r2=612537&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/java/java.rb (original)
+++ incubator/buildr/trunk/lib/java/java.rb Wed Jan 16 10:27:46 2008
@@ -1,5 +1,5 @@
 require 'core/project'
-#ENV['JAVA_HOME'] = '...' if RUBY_PLATFORM =~ /darwin/i
+ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home' if RUBY_PLATFORM =~ /darwin/i
 if PLATFORM == 'java'
   require File.join(File.dirname(__FILE__), 'jruby')
 else
@@ -245,6 +245,7 @@
 
     # *Deprecated*: Use Java::Commands.java instead.
     def java(*args, &block)
+      return send(:method_missing, :java) if args.empty?
       warn_deprecated 'Use Java::Commands.java instead'
       Commands.java(*args, &block)
     end

Modified: incubator/buildr/trunk/lib/java/rjb.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/java/rjb.rb?rev=612537&r1=612536&r2=612537&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/java/rjb.rb (original)
+++ incubator/buildr/trunk/lib/java/rjb.rb Wed Jan 16 10:27:46 2008
@@ -50,7 +50,7 @@
       raise ArgumentError, 'No arguments expected' unless args.empty?
       name = "#{@name}.#{sym}"
       return ::Rjb.import(name) if sym.to_s =~ /^[[:upper:]]/
-      Java.send :__package__, name
+      ::Java.send :__package__, name
     end
 
   end
@@ -104,11 +104,11 @@
 
     def __package__(name) #:nodoc:
       const = name.split('.').map { |part| part.gsub(/^./) { |char| char.upcase } }.join
-      return Java.const_get(const) if Java.const_defined?(const)
+      return const_get(const) if const_defined?(const)
       package = Module.new
       package.extend Package
       package.instance_variable_set :@name, name
-      Java.const_set(const, package)
+      const_set(const, package)
     end
 
   end