buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From as...@apache.org
Subject svn commit: r643227 - in /incubator/buildr/trunk: ./ addon/ addon/buildr/ bin/ doc/pages/ lib/ lib/buildr/ lib/buildr/core/ lib/buildr/ide/ lib/buildr/java/ lib/buildr/tasks/ lib/core/ lib/ide/ lib/java/ lib/tasks/ rakelib/ spec/
Date Tue, 01 Apr 2008 00:20:32 GMT
Author: assaf
Date: Mon Mar 31 17:20:19 2008
New Revision: 643227

URL: http://svn.apache.org/viewvc?rev=643227&view=rev
Log:
The Big Move!
Long story short, to get around namespace collisions with required files (which will happen
more frequently once we start using gems), all the core buildr files are not under lib/buildr/
instead of just lib/, so instead of require 'foo' it's now require 'buildr/foo'.
Everything that was under lib/buildr is now relocated to addon/buildr, but still required
the same way.  Possible that these will be spun into their own Gem (buildr-extra or some such)
in the future.

Added:
    incubator/buildr/trunk/addon/
    incubator/buildr/trunk/addon/buildr/
      - copied from r643200, incubator/buildr/trunk/lib/buildr/
    incubator/buildr/trunk/lib/buildr/
    incubator/buildr/trunk/lib/buildr/core/
      - copied from r643200, incubator/buildr/trunk/lib/core/
    incubator/buildr/trunk/lib/buildr/core.rb
      - copied, changed from r643200, incubator/buildr/trunk/lib/core.rb
    incubator/buildr/trunk/lib/buildr/ide/
      - copied from r643200, incubator/buildr/trunk/lib/ide/
    incubator/buildr/trunk/lib/buildr/ide.rb
      - copied, changed from r643200, incubator/buildr/trunk/lib/ide.rb
    incubator/buildr/trunk/lib/buildr/java/
      - copied from r643200, incubator/buildr/trunk/lib/java/
    incubator/buildr/trunk/lib/buildr/java.rb
      - copied, changed from r643200, incubator/buildr/trunk/lib/java.rb
    incubator/buildr/trunk/lib/buildr/tasks/
      - copied from r643200, incubator/buildr/trunk/lib/tasks/
    incubator/buildr/trunk/lib/buildr/tasks.rb
      - copied, changed from r643200, incubator/buildr/trunk/lib/tasks.rb
Removed:
    incubator/buildr/trunk/lib/core/
    incubator/buildr/trunk/lib/core.rb
    incubator/buildr/trunk/lib/ide/
    incubator/buildr/trunk/lib/ide.rb
    incubator/buildr/trunk/lib/java/
    incubator/buildr/trunk/lib/java.rb
    incubator/buildr/trunk/lib/tasks/
    incubator/buildr/trunk/lib/tasks.rb
Modified:
    incubator/buildr/trunk/Rakefile
    incubator/buildr/trunk/addon/buildr/antlr.rb
    incubator/buildr/trunk/addon/buildr/cobertura.rb
    incubator/buildr/trunk/addon/buildr/hibernate.rb
    incubator/buildr/trunk/addon/buildr/javacc.rb
    incubator/buildr/trunk/addon/buildr/jdepend.rb
    incubator/buildr/trunk/addon/buildr/jetty.rb
    incubator/buildr/trunk/addon/buildr/openjpa.rb
    incubator/buildr/trunk/addon/buildr/xmlbeans.rb
    incubator/buildr/trunk/bin/buildr
    incubator/buildr/trunk/buildfile
    incubator/buildr/trunk/doc/pages/building.textile
    incubator/buildr/trunk/lib/buildr.rb
    incubator/buildr/trunk/lib/buildr/core/addon.rb
    incubator/buildr/trunk/lib/buildr/core/application.rb
    incubator/buildr/trunk/lib/buildr/core/application_cli.rb
    incubator/buildr/trunk/lib/buildr/core/build.rb
    incubator/buildr/trunk/lib/buildr/core/checks.rb
    incubator/buildr/trunk/lib/buildr/core/common.rb
    incubator/buildr/trunk/lib/buildr/core/compile.rb
    incubator/buildr/trunk/lib/buildr/core/generate.rb
    incubator/buildr/trunk/lib/buildr/core/help.rb
    incubator/buildr/trunk/lib/buildr/core/package.rb
    incubator/buildr/trunk/lib/buildr/core/progressbar.rb
    incubator/buildr/trunk/lib/buildr/core/project.rb
    incubator/buildr/trunk/lib/buildr/core/test.rb
    incubator/buildr/trunk/lib/buildr/core/transports.rb
    incubator/buildr/trunk/lib/buildr/ide/eclipse.rb
    incubator/buildr/trunk/lib/buildr/ide/idea.rb
    incubator/buildr/trunk/lib/buildr/ide/idea7x.rb
    incubator/buildr/trunk/lib/buildr/java/ant.rb
    incubator/buildr/trunk/lib/buildr/java/artifact.rb
    incubator/buildr/trunk/lib/buildr/java/artifact_namespace.rb
    incubator/buildr/trunk/lib/buildr/java/artifact_search.rb
    incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb
    incubator/buildr/trunk/lib/buildr/java/compilers.rb
    incubator/buildr/trunk/lib/buildr/java/groovyc.rb
    incubator/buildr/trunk/lib/buildr/java/jruby.rb
    incubator/buildr/trunk/lib/buildr/java/nailgun.rb
    incubator/buildr/trunk/lib/buildr/java/packaging.rb
    incubator/buildr/trunk/lib/buildr/java/pom.rb
    incubator/buildr/trunk/lib/buildr/java/rjb.rb
    incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb
    incubator/buildr/trunk/lib/buildr/java/version_requirement.rb
    incubator/buildr/trunk/lib/buildr/tasks/tar.rb
    incubator/buildr/trunk/rakelib/package.rake
    incubator/buildr/trunk/spec/artifact_namespace_spec.rb
    incubator/buildr/trunk/spec/spec_helpers.rb

Modified: incubator/buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Mon Mar 31 17:20:19 2008
@@ -17,26 +17,27 @@
 # We need two specifications, for Ruby and Java, and one for the platform we run on.
 $specs = ['ruby', 'java'].inject({}) { |hash, platform|
   spec = Gem::Specification.new do |spec|
-    spec.name         = 'buildr'
-    spec.version      = File.read(__FILE__.pathmap('%d/lib/buildr.rb')).scan(/VERSION\s*=\s*(['"])(.*)\1/)[0][1]
-    spec.author       = 'Apache Buildr'
-    spec.email        = 'buildr-user@incubator.apache.org'
-    spec.homepage     = "http://incubator.apache.org/#{spec.name}/"
-    spec.summary      = 'A build system that doesn\'t suck'
-    spec.files        = FileList['lib/**/*', 'README', 'CHANGELOG', 'LICENSE', 'NOTICE',
'DISCLAIMER', 'KEYS',
-                                 'Rakefile', 'rakelib/**/*', 'spec/**/*', 'doc/**/*'].to_ary
-    spec.require_path = 'lib'
-    spec.has_rdoc     = true
-    spec.extra_rdoc_files = ['README', 'CHANGELOG', 'LICENSE', 'NOTICE', 'DISCLAIMER']
-    spec.rdoc_options << '--title' << "Buildr -- #{spec.summary}" <<
-                         '--main' << 'README' << '--line-numbers' << '--inline-source'
<< '-p' <<
-                         '--webcvs' << 'http://svn.apache.org/repos/asf/incubator/buildr/trunk/'
-    spec.rubyforge_project = 'buildr'
-    spec.platform = platform
-
-    spec.bindir = 'bin'                               # Use these for applications.
-    spec.executables = ['buildr']
+    spec.name           = 'buildr'
+    spec.version        = File.read(__FILE__.pathmap('%d/lib/buildr.rb')).scan(/VERSION\s*=\s*(['"])(.*)\1/)[0][1]
+    spec.author         = 'Apache Buildr'
+    spec.email          = 'buildr-user@incubator.apache.org'
+    spec.homepage       = "http://incubator.apache.org/#{spec.name}/"
+    spec.summary        = 'A build system that doesn\'t suck'
+
+    spec.files          = FileList['lib/**/*', 'addon/**/*', 'README', 'CHANGELOG', 'LICENSE',
'NOTICE', 'DISCLAIMER', 'KEYS',
+                                   'Rakefile', 'rakelib/**/*', 'spec/**/*', 'doc/**/*'].to_ary
+    spec.require_paths  = ['lib', 'addon']
+    spec.bindir         = 'bin'                               # Use these for applications.
+    spec.executable     = 'buildr'
+
+    spec.has_rdoc           = true
+    spec.extra_rdoc_files   = ['README', 'CHANGELOG', 'LICENSE', 'NOTICE', 'DISCLAIMER']
+    spec.rdoc_options       << '--title' << "Buildr -- #{spec.summary}" <<
+                               '--main' << 'README' << '--line-numbers' <<
'--inline-source' << '-p' <<
+                               '--webcvs' << 'http://svn.apache.org/repos/asf/incubator/buildr/trunk/'
+    spec.rubyforge_project  = 'buildr'
 
+    spec.platform  = platform
     # Tested against these dependencies.
     spec.add_dependency 'rake',                 '~> 0.8'
     spec.add_dependency 'builder',              '~> 2.1'
@@ -94,8 +95,9 @@
 desc "If you're building from sources, run this task one to setup the necessary dependencies."
 task 'setup' do
   installed = Gem::SourceIndex.from_installed_gems
-  required = $spec.dependencies.select { |dep| installed.search(dep.name, dep.version_requirements).empty?
}
-  required.each do |dep|
+  dependencies = $spec.dependencies
+  dependencies << Gem::Dependency.new('win32console', nil) if Gem.win_platform? # Colors
for RSpec.
+  dependencies.select { |dep| installed.search(dep.name, dep.version_requirements).empty?
}.each do |dep|
     puts "Installing #{dep} ..."
     ruby 'install', dep.name, '-v', dep.version_requirements.to_s, :command=>'gem', :sudo=>true
   end

Modified: incubator/buildr/trunk/addon/buildr/antlr.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/antlr.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/antlr.rb (original)
+++ incubator/buildr/trunk/addon/buildr/antlr.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require "java/java"
+require 'buildr/java'
+
 
 module Buildr
   # Provides ANTLR grammar generation tasks. Require explicitly using <code>require
"buildr/antlr"</code>.

Modified: incubator/buildr/trunk/addon/buildr/cobertura.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/cobertura.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/cobertura.rb (original)
+++ incubator/buildr/trunk/addon/buildr/cobertura.rb Mon Mar 31 17:20:19 2008
@@ -14,6 +14,9 @@
 # the License.
 
 
+require 'buildr/java'
+
+
 module Buildr
 
   # Provides the <code>cobertura:html</code> and <code>cobertura:xml</code>
tasks.

Modified: incubator/buildr/trunk/addon/buildr/hibernate.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/hibernate.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/hibernate.rb (original)
+++ incubator/buildr/trunk/addon/buildr/hibernate.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,8 @@
 # the License.
 
 
-require "java/java"
-require "java/ant"
+require 'buildr/java'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/addon/buildr/javacc.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/javacc.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/javacc.rb (original)
+++ incubator/buildr/trunk/addon/buildr/javacc.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require "java/java"
+require 'buildr/java'
+
 
 module Buildr
   # Provides JavaCC compile tasks. Require explicitly using <code>require "buildr/javacc"</code>.

Modified: incubator/buildr/trunk/addon/buildr/jdepend.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/jdepend.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/jdepend.rb (original)
+++ incubator/buildr/trunk/addon/buildr/jdepend.rb Mon Mar 31 17:20:19 2008
@@ -13,6 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
+require 'buildr/java'
+
+
 module Buildr
 
   # Addes the <code>jdepend:swing</code>, <code>jdepend:text</code>
and <code>jdepend:xml</code> tasks.

Modified: incubator/buildr/trunk/addon/buildr/jetty.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/jetty.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/jetty.rb (original)
+++ incubator/buildr/trunk/addon/buildr/jetty.rb Mon Mar 31 17:20:19 2008
@@ -14,12 +14,13 @@
 # the License.
 
 
-require "uri"
-require "net/http"
-require "core/project"
-require "java/artifact"
-require "java/java"
-require "thread"
+require 'uri'
+require 'net/http'
+require 'buildr/core/project'
+require 'buildr/java'
+require 'buildr/java/artifact'
+require 'thread'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/addon/buildr/openjpa.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/openjpa.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/openjpa.rb (original)
+++ incubator/buildr/trunk/addon/buildr/openjpa.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require "java/java"
+require 'buildr/java'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/addon/buildr/xmlbeans.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/xmlbeans.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/xmlbeans.rb (original)
+++ incubator/buildr/trunk/addon/buildr/xmlbeans.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,9 @@
 # the License.
 
 
-require "java/java"
-require "java/ant"
+require 'buildr/java'
+require 'buildr/java/ant'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/bin/buildr
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/bin/buildr?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/bin/buildr (original)
+++ incubator/buildr/trunk/bin/buildr Mon Mar 31 17:20:19 2008
@@ -13,11 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
 # License for the specific language governing permissions and limitations under
 # the License.
+
+
 require 'rubygems'
-begin
-  require 'buildr'
-rescue LoadError
-  require 'rubygems'
-  require 'buildr'
-end
+require 'buildr'
+
 Rake.application.run

Modified: incubator/buildr/trunk/buildfile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/buildfile?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/buildfile (original)
+++ incubator/buildr/trunk/buildfile Mon Mar 31 17:20:19 2008
@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/jetty'
 $LOADED_FEATURES << 'jruby' unless RUBY_PLATFORM =~ /java/ # Pretend to have JRuby,
keeps Nailgun happy.
-require 'java/nailgun'
+require 'buildr/jetty'
+require 'buildr/java/nailgun'
 repositories.remote << 'http://repo1.maven.org/maven2'
 
 
@@ -23,15 +23,15 @@
   compile.using :source=>'1.4', :target=>'1.4', :debug=>false
 
   define 'java' do
-    compile.using(:javac).from(FileList['lib/java/**/*.java']).into('lib/java').with(Buildr::Nailgun.artifact)
+    compile.using(:javac).from(FileList['lib/buildr/java/**/*.java']).into('lib/buildr/java').with(Buildr::Nailgun.artifact)
   end
 
   desc 'Buildr extra packages (Antlr, Cobertura, Hibernate, Javacc, JDepend, Jetty, OpenJPA,
XmlBeans)'
   define 'extra', :version=>'1.0' do
-    compile.using(:javac).from(FileList['lib/buildr/**/*.java']).into('lib/buildr').with(Buildr::Jetty::REQUIRES)
+    compile.using(:javac).from(FileList['addon/buildr/**/*.java']).into('addon/buildr').with(Buildr::Jetty::REQUIRES)
     # Legals included in source code and show in RDoc.
     legal = 'LICENSE', 'DISCLAIMER', 'NOTICE'
-    package(:gem).include(legal).path('lib').include('lib/buildr')
+    package(:gem).include(legal).path('lib').include('addon/buildr')
     package(:gem).spec do |spec|
       spec.author             = 'Apache Buildr'
       spec.email              = 'buildr-user@incubator.apache.org'

Modified: incubator/buildr/trunk/doc/pages/building.textile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/building.textile?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/building.textile (original)
+++ incubator/buildr/trunk/doc/pages/building.textile Mon Mar 31 17:20:19 2008
@@ -265,7 +265,7 @@
 Before using the Groovy compiler, you must first require it on your buildfile:
 
 {{{!ruby
-   require 'java/groovyc'
+   require 'buildr/java/groovyc'
 }}}
 
 Once loaded, the groovyc compiler will be automatically selected if any .groovy

Modified: incubator/buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Mon Mar 31 17:20:19 2008
@@ -29,10 +29,10 @@
   VERSION = '1.3.0'.freeze # unless const_defined?(:VERSION)
 end
 
-require File.join(File.dirname(__FILE__), 'core')
-require File.join(File.dirname(__FILE__), 'tasks')
-require File.join(File.dirname(__FILE__), 'java')
-require File.join(File.dirname(__FILE__), 'ide')
+require 'buildr/core'
+require 'buildr/tasks'
+require 'buildr/java'
+require 'buildr/ide'
 
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)

Copied: incubator/buildr/trunk/lib/buildr/core.rb (from r643200, incubator/buildr/trunk/lib/core.rb)
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core.rb?p2=incubator/buildr/trunk/lib/buildr/core.rb&p1=incubator/buildr/trunk/lib/core.rb&r1=643200&r2=643227&rev=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/core.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core.rb Mon Mar 31 17:20:19 2008
@@ -14,15 +14,15 @@
 # the License.
 
 
-require 'core/application'
-require 'core/project'
-require 'core/environment'
-require 'core/help'
-require 'core/build'
-require 'core/package'
-require 'core/filter'
-require 'core/compile'
-require 'core/test'
-require 'core/checks'
-require 'core/generate'
-require 'core/addon'
+require 'buildr/core/application'
+require 'buildr/core/project'
+require 'buildr/core/environment'
+require 'buildr/core/help'
+require 'buildr/core/build'
+require 'buildr/core/package'
+require 'buildr/core/filter'
+require 'buildr/core/compile'
+require 'buildr/core/test'
+require 'buildr/core/checks'
+require 'buildr/core/generate'
+require 'buildr/core/addon'

Modified: incubator/buildr/trunk/lib/buildr/core/addon.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/addon.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/addon.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/addon.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,8 @@
 # the License.
 
 
-require 'core/package'
-require 'tasks/zip'
+require 'buildr/core/package'
+require 'buildr/tasks/zip'
 $LOADED_FEATURES << 'rubygems/open-uri.rb' # We already have open-uri, RubyGems loads
a different one
 require 'rubygems/source_info_cache'
 require 'rubygems/doc_manager'

Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Mon Mar 31 17:20:19 2008
@@ -56,7 +56,7 @@
 
       DEFAULT_BUILDFILES = ['buildfile', 'Buildfile'] + DEFAULT_RAKEFILES
       
-      require 'core/application_cli'
+      require 'buildr/core/application_cli'
       include CommandLineInterface
 
       attr_reader :rakefiles, :requires

Modified: incubator/buildr/trunk/lib/buildr/core/application_cli.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application_cli.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application_cli.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application_cli.rb Mon Mar 31 17:20:19 2008
@@ -34,10 +34,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
+require 'getoptlong'
+
+
 module Buildr
   module CommandLineInterface
     
-    require 'getoptlong'
     OPTIONS = [     # :nodoc:
         ['--help',     '-h', GetoptLong::NO_ARGUMENT,
           'Display this help message.'],

Modified: incubator/buildr/trunk/lib/buildr/core/build.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/build.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/build.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/build.rb Mon Mar 31 17:20:19 2008
@@ -14,10 +14,11 @@
 # the License.
 
 
-require 'core/project'
-require 'core/common'
-require 'core/checks'
-require 'core/environment'
+require 'buildr/core/project'
+require 'buildr/core/common'
+require 'buildr/core/checks'
+require 'buildr/core/environment'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/core/checks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/checks.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/checks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/checks.rb Mon Mar 31 17:20:19 2008
@@ -14,11 +14,12 @@
 # the License.
 
 
-require 'core/project'
-require 'tasks/zip'
+require 'buildr/core/project'
+require 'buildr/tasks/zip'
 require 'test/unit'
 require 'spec/matchers'
 require 'spec/expectations'
+
 
 module Buildr
   # Methods added to Project to allow checking the build.

Modified: incubator/buildr/trunk/lib/buildr/core/common.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/common.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/common.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/common.rb Mon Mar 31 17:20:19 2008
@@ -16,7 +16,7 @@
 
 require 'tempfile'
 require 'pathname'
-require 'core/transports'
+require 'buildr/core/transports'
 require 'open-uri'
 require 'uri/open-sftp'
 require 'rbconfig'

Modified: incubator/buildr/trunk/lib/buildr/core/compile.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/compile.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/compile.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/compile.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require 'core/common'
+require 'buildr/core/common'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/core/generate.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/generate.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/generate.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/generate.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require 'java/pom'
+require 'buildr/java/pom'
+
 
 module Buildr
   module Generate #:nodoc:

Modified: incubator/buildr/trunk/lib/buildr/core/help.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/help.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/help.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/help.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,9 @@
 # the License.
 
 
-require 'core/common'
-require 'core/project'
+require 'buildr/core/common'
+require 'buildr/core/project'
+
 
 module Buildr
 
@@ -63,7 +64,7 @@
       puts 'Top-level projects (buildr help:projects for full list):'
       width = [top_level.map(&:name).map(&:size), 20].flatten.max
       top_level.each do |project|
-        puts project.comment.to_s.blank? ? project.name : ("  %-#{width}s  # %s" % [project.name,
project.comment])
+        puts project.comment.to_s.empty? ? project.name : ("  %-#{width}s  # %s" % [project.name,
project.comment])
       end
       puts
     end
@@ -99,7 +100,7 @@
   task 'projects' do
     width = projects.map(&:name).map(&:size).max
     projects.each do |project|
-      puts project.comment.to_s.blank? ? "  #{project.name}" : ("  %-#{width}s  # %s" % [project.name,
project.comment])
+      puts project.comment.to_s.empty? ? "  #{project.name}" : ("  %-#{width}s  # %s" % [project.name,
project.comment])
     end
   end
 

Modified: incubator/buildr/trunk/lib/buildr/core/package.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/package.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/package.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/package.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require 'core/project'
-require 'core/compile'
-require 'java/artifact'
+require 'buildr/core/project'
+require 'buildr/core/compile'
+require 'buildr/java/artifact'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/core/progressbar.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/progressbar.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/progressbar.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/progressbar.rb Mon Mar 31 17:20:19 2008
@@ -38,6 +38,7 @@
   def start
     @start = @last_time = Time.now
     @count = 0
+    @finished = false
     render
     if block_given?
       result = yield(self) if block_given?

Modified: incubator/buildr/trunk/lib/buildr/core/project.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/project.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/project.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/project.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require 'core/common'
+require 'buildr/core/common'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/test.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/test.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/test.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require 'core/project'
-require 'core/build'
-require 'core/compile'
+require 'buildr/core/project'
+require 'buildr/core/build'
+require 'buildr/core/compile'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/core/transports.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/transports.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/transports.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/transports.rb Mon Mar 31 17:20:19 2008
@@ -23,8 +23,8 @@
 require 'uri/sftp'
 require 'digest/md5'
 require 'digest/sha1'
-require 'core/progressbar'
 require 'tempfile'
+require 'buildr/core/progressbar'
 
 
 # Monkeypatching: SFTP never defines the mkdir method on its session or the underlying

Copied: incubator/buildr/trunk/lib/buildr/ide.rb (from r643200, incubator/buildr/trunk/lib/ide.rb)
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/ide.rb?p2=incubator/buildr/trunk/lib/buildr/ide.rb&p1=incubator/buildr/trunk/lib/ide.rb&r1=643200&r2=643227&rev=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/ide.rb (original)
+++ incubator/buildr/trunk/lib/buildr/ide.rb Mon Mar 31 17:20:19 2008
@@ -14,6 +14,6 @@
 # the License.
 
 
-require 'ide/eclipse'
-require 'ide/idea'
-require 'ide/idea7x'
+require 'buildr/ide/eclipse'
+require 'buildr/ide/idea'
+require 'buildr/ide/idea7x'

Modified: incubator/buildr/trunk/lib/buildr/ide/eclipse.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/ide/eclipse.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/ide/eclipse.rb (original)
+++ incubator/buildr/trunk/lib/buildr/ide/eclipse.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require "pathname"
-require "core/project"
-require "java/artifact"
+require 'pathname'
+require 'buildr/core/project'
+require 'buildr/java/artifact'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/ide/idea.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/ide/idea.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ incubator/buildr/trunk/lib/buildr/ide/idea.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require "pathname"
-require "core/project"
-require "java/artifact"
+require 'pathname'
+require 'buildr/core/project'
+require 'buildr/java/artifact'
 require 'stringio'
 require 'rexml/document'
 

Modified: incubator/buildr/trunk/lib/buildr/ide/idea7x.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/ide/idea7x.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/ide/idea7x.rb (original)
+++ incubator/buildr/trunk/lib/buildr/ide/idea7x.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require "pathname"
-require "core/project"
-require "java/artifact"
+require 'pathname'
+require 'buildr/core/project'
+require 'buildr/java/artifact'
 require 'stringio'
 require 'rexml/document'
 

Copied: incubator/buildr/trunk/lib/buildr/java.rb (from r643200, incubator/buildr/trunk/lib/java.rb)
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java.rb?p2=incubator/buildr/trunk/lib/buildr/java.rb&p1=incubator/buildr/trunk/lib/java.rb&r1=643200&r2=643227&rev=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/java.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,13 @@
 # the License.
 
 
-require 'java/compilers'
-require 'java/test_frameworks'
-require 'java/bdd_frameworks'
-require 'java/packaging'
+ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os']
=~ /darwin/i
+require PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+
+
+require 'buildr/java/compilers'
+require 'buildr/java/test_frameworks'
+require 'buildr/java/bdd_frameworks'
+require 'buildr/java/packaging'
+require 'buildr/java/commands'
+require 'buildr/java/deprecated'

Modified: incubator/buildr/trunk/lib/buildr/java/ant.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/ant.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/ant.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/ant.rb Mon Mar 31 17:20:19 2008
@@ -14,10 +14,9 @@
 # the License.
 
 
-require 'core/project'
-require 'java/java'
 require 'antwrap'
-require 'core/help'
+require 'buildr/core/project'
+require 'buildr/core/help'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/java/artifact.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/artifact.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/artifact.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/artifact.rb Mon Mar 31 17:20:19 2008
@@ -14,10 +14,11 @@
 # the License.
 
 
-require 'core/project'
-require 'core/transports'
 require 'builder'
-require 'java/artifact_namespace'
+require 'buildr/core/project'
+require 'buildr/core/transports'
+require 'buildr/java/artifact_namespace'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/java/artifact_namespace.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/artifact_namespace.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/artifact_namespace.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/artifact_namespace.rb Mon Mar 31 17:20:19 2008
@@ -13,7 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'java/version_requirement'
+
+require 'buildr/java/version_requirement'
+
 
 module Buildr
   

Modified: incubator/buildr/trunk/lib/buildr/java/artifact_search.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/artifact_search.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/artifact_search.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/artifact_search.rb Mon Mar 31 17:20:19 2008
@@ -13,17 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-begin
-  require 'hpricot'
-rescue LoadError
-  cmd = "gem install hpricot"
-  cmd = "jruby -S " + cmd + " --source http://caldersphere.net" if PLATFORM[/java/]
-  puts <<-NOTICE
-      Your system is missing the hpricot gem, install it with:
-        #{cmd}
-      NOTICE
-  raise
-end
+
+require 'hpricot'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/bdd_frameworks.rb Mon Mar 31 17:20:19 2008
@@ -14,7 +14,8 @@
 # the License.
 
 
-require 'java/test_frameworks'
+require 'buildr/java/test_frameworks'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/lib/buildr/java/compilers.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/compilers.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/compilers.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/compilers.rb Mon Mar 31 17:20:19 2008
@@ -14,11 +14,11 @@
 # the License.
 
 
-require 'core/project'
-require 'core/common'
-require 'core/compile'
-require 'java/artifact'
-require 'java/java'
+require 'buildr/core/project'
+require 'buildr/core/common'
+require 'buildr/core/compile'
+require 'buildr/java/artifact'
+
 
 module Buildr
   module Compiler

Modified: incubator/buildr/trunk/lib/buildr/java/groovyc.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/groovyc.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/groovyc.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/groovyc.rb Mon Mar 31 17:20:19 2008
@@ -19,7 +19,7 @@
     # Groovyc compiler:
     #  compile.using(:groovyc)
     #
-    # You need to require 'java/groovyc' if you need to use this compiler.
+    # You need to require 'buildr/java/groovyc' if you need to use this compiler.
     #
     # Used by default if .groovy files are found in the src/main/groovy directory (or src/test/groovy)
     # and sets the target directory to target/classes (or target/test/classes).

Modified: incubator/buildr/trunk/lib/buildr/java/jruby.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/jruby.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/jruby.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/jruby.rb Mon Mar 31 17:20:19 2008
@@ -96,11 +96,4 @@
 
   end
 
-  [:start, :help, :tasks].each do |n|
-    task "ng:#{n}" do |t|
-      require 'java/nailgun'
-      Rake.application.invoke_task("nailgun:#{n}")
-    end
-  end
-  
 end

Modified: incubator/buildr/trunk/lib/buildr/java/nailgun.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/nailgun.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/nailgun.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/nailgun.rb Mon Mar 31 17:20:19 2008
@@ -13,14 +13,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 require 'rbconfig'
 require 'ostruct'
-require 'core/application_cli'
+require 'buildr/core/application_cli'
 require 'jruby'
 require 'thread'
 require 'monitor'
 require 'benchmark'
 
+
 module Buildr
 
   #  See the nailgun_help method for documentation.
@@ -112,7 +114,7 @@
           also specify the nailgun_home on your buildfile with the following
           code:
               
-              require 'java/nailgun'
+              require 'buildr/java/nailgun'
               Buildr::Nailgun.home = File.expand_path('~/.jruby/tool/nailgun')
 
           Buildr will also check that the nailgun client binary (ng.exe for 
@@ -124,7 +126,7 @@
           The buildr server binds itself to localhost, port 2113. You can 
           override this on your buildfile, by placing the following code:
 
-              require 'java/nailgun'
+              require 'buildr/java/nailgun'
               Buildr::Nailgun.server = '127.0.0.1'
               Buildr::Nailgun.port = 2233
 
@@ -143,7 +145,7 @@
           buildr runtimes begin life, to be later added on the buildr queue.
           By default both queues are of size 3, you can customize this with:
 
-              require 'java/nailgun'
+              require 'buildr/java/nailgun'
               Buildr::Nailgun.jruby_queue_size = 4 # JRuby creation is fast!
               Buildr::Nailgun.buildr_queue_size = 5 # loading buildr takes longer
 
@@ -679,7 +681,7 @@
             load_service = runtime.getLoadService
             load_service.getLoadPath.
               unshift File.normalize_path('..', File.dirname(__FILE__))
-            load_service.require 'java/nailgun'
+            load_service.require 'buildr/java/nailgun'
             header.replace ["Created runtime[#{creator}]", runtime]
             runtime
           end
@@ -876,5 +878,11 @@
     end # namespace :nailgun
     
   end # module Nailgun
+  
+  [:start, :help, :tasks].each do |n|
+    task "ng:#{n}" do |t|
+      Rake.application.invoke_task("nailgun:#{n}")
+    end
+  end
   
 end

Modified: incubator/buildr/trunk/lib/buildr/java/packaging.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/packaging.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/packaging.rb Mon Mar 31 17:20:19 2008
@@ -14,10 +14,9 @@
 # the License.
 
 
-require 'core/package'
-require 'java/java'
-require 'tasks/zip'
-require 'tasks/tar'
+require 'buildr/core/package'
+require 'buildr/tasks/zip'
+require 'buildr/tasks/tar'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/java/pom.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/pom.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/pom.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/pom.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,8 @@
 # the License.
 
 
-require "xmlsimple"
-require "java/artifact"
+require 'xmlsimple'
+require 'buildr/java/artifact'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/java/rjb.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/rjb.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/rjb.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/rjb.rb Mon Mar 31 17:20:19 2008
@@ -16,6 +16,7 @@
 
 require 'rjb'
 
+
 # Equivalent to Java system properties.  For example:
 #   ENV_JAVA['java.version']
 #   ENV_JAVA['java.class.version']

Modified: incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb Mon Mar 31 17:20:19 2008
@@ -14,9 +14,9 @@
 # the License.
 
 
-require 'core/build'
-require 'core/compile'
-require 'java/ant'
+require 'buildr/core/build'
+require 'buildr/core/compile'
+require 'buildr/java/ant'
 
 
 module Buildr

Modified: incubator/buildr/trunk/lib/buildr/java/version_requirement.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/version_requirement.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/version_requirement.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/version_requirement.rb Mon Mar 31 17:20:19 2008
@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 module Buildr
   
   #

Copied: incubator/buildr/trunk/lib/buildr/tasks.rb (from r643200, incubator/buildr/trunk/lib/tasks.rb)
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/tasks.rb?p2=incubator/buildr/trunk/lib/buildr/tasks.rb&p1=incubator/buildr/trunk/lib/tasks.rb&r1=643200&r2=643227&rev=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/tasks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/tasks.rb Mon Mar 31 17:20:19 2008
@@ -14,6 +14,6 @@
 # the License.
 
 
-require 'tasks/concat.rb'
-require 'tasks/zip.rb'
-require 'tasks/tar.rb'
+require 'buildr/tasks/concat.rb'
+require 'buildr/tasks/zip.rb'
+require 'buildr/tasks/tar.rb'

Modified: incubator/buildr/trunk/lib/buildr/tasks/tar.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/tasks/tar.rb?rev=643227&r1=643200&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/tasks/tar.rb (original)
+++ incubator/buildr/trunk/lib/buildr/tasks/tar.rb Mon Mar 31 17:20:19 2008
@@ -14,8 +14,9 @@
 # the License.
 
 
-require 'tasks/zip'
+require 'buildr/tasks/zip'
 require 'archive/tar/minitar'
+
 
 module Buildr
 

Modified: incubator/buildr/trunk/rakelib/package.rake
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/package.rake?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/package.rake (original)
+++ incubator/buildr/trunk/rakelib/package.rake Mon Mar 31 17:20:19 2008
@@ -23,7 +23,7 @@
 desc 'Compile Java libraries used by Buildr'
 task 'compile' do
   say 'Compiling Java libraries ... '
-  ruby '-Ilib', 'bin/buildr', 'compile'
+  ruby '-Ilib', '-Iaddon', 'bin/buildr', 'compile'
   say 'OK'
 end
 

Modified: incubator/buildr/trunk/spec/artifact_namespace_spec.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/artifact_namespace_spec.rb?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/artifact_namespace_spec.rb (original)
+++ incubator/buildr/trunk/spec/artifact_namespace_spec.rb Mon Mar 31 17:20:19 2008
@@ -16,7 +16,7 @@
 
 require File.join(File.dirname(__FILE__), 'spec_helpers')
 
-require 'java/artifact_namespace'
+require 'buildr/java/artifact_namespace'
 
 describe Buildr::ArtifactNamespace do
 

Modified: incubator/buildr/trunk/spec/spec_helpers.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/spec_helpers.rb?rev=643227&r1=643226&r2=643227&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/spec_helpers.rb (original)
+++ incubator/buildr/trunk/spec/spec_helpers.rb Mon Mar 31 17:20:19 2008
@@ -24,7 +24,7 @@
 
   # Load additional files for optional specs
   if rspec_options.argv.any? { |s| s =~ /groovy_compilers_spec/ }
-    require 'java/groovyc'
+    require 'buildr/java/groovyc'
   end
 
   require File.expand_path('sandbox', File.dirname(__FILE__))



Mime
View raw message