Skip to content

Commit

Permalink
JariBakken: Rename Java -> JavaGen in the rakefiles, to avoid clash w…
Browse files Browse the repository at this point in the history
…ith JRuby's Java module.

This makes it possible to run our rake tasks on the bundled JRuby jar:

java -jar third_party/jruby/jruby-complete-1.4.0RC1.jar -S rake «target(s)»

r7845
  • Loading branch information
jarib committed Dec 10, 2009
1 parent bc80c1c commit c414a64
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions rake-tasks/java.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Used to map a name to a set of dependencies

class Java < BaseGenerator
class JavaGen < BaseGenerator
def build_classpath_(dep_name)
t = Rake::Task[dep_name.to_sym]
if t.nil?
Expand Down Expand Up @@ -296,19 +296,19 @@ def walk_war_deps_(dep, dest)
end

def java_jar(args)
Java.new().jar(args)
JavaGen.new().jar(args)
end

def java_test(args)
Java.new().test(args)
JavaGen.new().test(args)
end

def java_uberjar(args)
Java.new().uberjar(args)
JavaGen.new().uberjar(args)
end

def java_war(args)
Java.new().war(args)
JavaGen.new().war(args)
end

def jruby(args)
Expand Down
2 changes: 1 addition & 1 deletion rake-tasks/selenium.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class Selenium < BaseGenerator
def selenium_test(args)
create_deps_(args[:name], args)

classpath = Java.new().build_classpath_(args[:name]).collect do |c|
classpath = JavaGen.new().build_classpath_(args[:name]).collect do |c|
c.to_s =~ /\.jar/ ? c : nil
end
classpath.uniq!
Expand Down

0 comments on commit c414a64

Please sign in to comment.