buildr 1.3.2-java → 1.3.3-java

data/bin/buildr

@@ -14,8 +14,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
+start = Time.now
 require 'rubygems'
 require 'buildr'
-
 Buildr.application.run
+if verbose
+  elapsed = Time.now - start
+  real = []
+  real << ("%ih" % (elapsed / 3600)) if elapsed >= 3600
+  real << ("%im" % ((elapsed / 60) % 60)) if elapsed >= 60
+  real << ("%.3fs" % (elapsed % 60))
+  puts $terminal.color("Completed in #{real.join}", :green)
+end

data/buildr.buildfile

@@ -0,0 +1,53 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+$LOADED_FEATURES << 'jruby' unless RUBY_PLATFORM =~ /java/ # Pretend to have JRuby, keeps Nailgun happy.
+require 'buildr/jetty'
+require 'buildr/nailgun'
+repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'http://scala-tools.org/repo-releases/'
+
+
+define 'buildr' do
+  compile.using :source=>'1.4', :target=>'1.4', :debug=>false
+
+  define 'java' do  
+    compile.using(:javac).from(FileList['lib/buildr/java/**/*.java']).into('lib/buildr/java')
+  end
+
+  desc 'Buildr extra packages (Antlr, Cobertura, Hibernate, Javacc, JDepend, Jetty, OpenJPA, XmlBeans)'
+  define 'extra', :version=>'1.0' do
+    compile.using(:javac).from(FileList['addon/buildr/**/*.java']).into('addon/buildr').with(Buildr::Jetty::REQUIRES, Buildr::Nailgun::ARTIFACT_SPEC)
+    # Legals included in source code and show in RDoc.
+    legal = 'LICENSE', 'DISCLAIMER', 'NOTICE'
+    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'
+      spec.homepage           = "http://incubator.apache.org/buildr"
+      spec.rubyforge_project  = 'buildr'
+      spec.extra_rdoc_files   = legal
+      spec.rdoc_options << '--webcvs' << 'http://svn.apache.org/repos/asf/incubator/buildr/trunk/'
+      spec.add_dependency 'buildr', '~> 1.3'
+    end
+
+    install do
+      addon package(:gem)
+    end
+
+    upload do
+    end
+  end
+end

data/buildr.gemspec

@@ -16,36 +16,43 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
-  spec.version        = '1.3.2'
+  spec.version        = '1.3.3'
   spec.author         = 'Apache Buildr'
-  spec.email          = "#{spec.name}-user@incubator.apache.org"
-  spec.homepage       = "http://incubator.apache.org/#{spec.name}/"
+  spec.email          = "buildr-user@incubator.apache.org"
+  spec.homepage       = "http://incubator.apache.org/buildr"
   spec.summary        = 'A build system that doesn\'t suck'
+  spec.rubyforge_project  = 'buildr'
 
-  spec.files          = FileList['lib/**/*', 'addon/**/*', 'README', 'CHANGELOG', 'LICENSE', 'NOTICE', 'DISCLAIMER', 'KEYS',
-                         '*.gemspec', 'Rakefile', 'rakelib/**/*', 'spec/**/*', 'doc/**/*']
+  # Rakefile needs to create spec for both platforms (ruby and java), using the
+  # $platform global variable.  In all other cases, we figure it out from RUBY_PLATFORM.
+  spec.platform       = $platform || RUBY_PLATFORM[/java/] || 'ruby'
+  
+  spec.files          = Dir['lib/**/*', 'bin/**/*', 'addon/**/*', 'doc/**/*', 'spec/**/*',
+                            'README.rdoc', 'LICENSE', 'NOTICE', 'DISCLAIMER', 'CHANGELOG',
+                            'buildr.*', 'Rakefile', 'rakelib/**/*', '_buildr', 'etc/**/*']
   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/#{spec.name}/trunk/'
-  spec.rubyforge_project  = 'buildr'
+  spec.has_rdoc         = true
+  spec.extra_rdoc_files = ['README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE', 'DISCLAIMER']
+  spec.rdoc_options     << '--title' << "Buildr" << '--main' << 'README.rdoc' <<
+                           '--line-numbers' << '--inline-source' << '-p' <<
+                           '--webcvs' << 'http://svn.apache.org/repos/asf/incubator/buildr/trunk/'
 
   # Tested against these dependencies.
   spec.add_dependency 'rake',                 '0.8.1'
   spec.add_dependency 'builder',              '2.1.2'
-  spec.add_dependency 'net-ssh',              '2.0.3'
+  spec.add_dependency 'net-ssh',              '2.0.4'
   spec.add_dependency 'net-sftp',             '2.0.1'
   spec.add_dependency 'rubyzip',              '0.9.1'
   spec.add_dependency 'highline',             '1.4.0'
   spec.add_dependency 'rubyforge',            '1.0.0'
-  spec.add_dependency 'hoe',                  '1.6.0'
+  spec.add_dependency 'hoe',                  '1.7.0'
+  spec.add_dependency 'rjb',                  '1.1.6' if spec.platform.to_s == 'ruby' 
   spec.add_dependency 'Antwrap',              '0.7.0'
-  spec.add_dependency 'rspec',                '1.1.4'
+  spec.add_dependency 'rspec',                '1.1.5'
   spec.add_dependency 'xml-simple',           '1.0.11'
   spec.add_dependency 'archive-tar-minitar',  '0.5.2'
+  spec.add_dependency 'jruby-openssl',        '0.2'   if spec.platform.to_s == 'java'
 end

data/doc/css/default.css

@@ -20,7 +20,8 @@ body {
   color: #000;
   font-family: "DejaVu Sans", Verdana, Helvetica;
   text-align: center;
-	line-height: 1.5em;
+  line-height: 150%;
+  font-size: 12pt;
 }
 
 a:link, a:visited{
@@ -36,42 +37,48 @@ img {
   border: none;
 }
 
-pre, code { font-family: "DejaVu Sans Mono", "Courier New", "Courier"; }
-pre { padding: 1em; }
-pre.wrapped {
+pre, code {
+  font-family: "DejaVu Sans Mono", "Courier New", "Courier";
+  font-size: 11pt;
+}
+pre {
+  margin: 0.3em 0 0.3em 0.9em;
+  padding: 0;
+  line-height: 135%;
   white-space: pre-wrap;       /* css-3 */
   white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
 }
 
 h1, h2, h3 {
-  padding: 0.3em;
-  margin: 2.5em 0 0.5em -0.3em;
+  padding: 0;
+  margin: 1.6em 0 0.6em -0.9em;
   line-height: 1.25em;
   letter-spacing: 0.03em;
 }
 
 h1 {
-  border-bottom: 1px solid #808080;
   font-size: 2em;
   margin-top: 0;
+  padding-bottom: 0.3em;
+  border-bottom: 1px solid #808080;
 }
 
 h2 {
-  border-bottom: 1px solid #a0a0a0;
   font-size: 1.3em;
+  padding-bottom: 0.3em;
+  border-bottom: 1px solid #a0a0a0;
 }
 
 h3 {
-  border-bottom: 1px solid #c0c0c0;
   font-size: 1.1em;
 }
 
 blockquote {
-	padding-left: 2em;
-	padding-right: 2em;
-	margin-left: 0.3em;
+  padding-left: 2em;
+  padding-right: 2em;
+  margin-left: 0.3em;
   margin-right: 0;
-	border-left: 1px solid #3c78b5;
+  border-left: 1px solid #3c78b5;
 }
 
 ul { 
@@ -84,7 +91,9 @@ ul ul {
 }
 
 table {
-  border-spacing: 0.2em 0;
+  border-spacing: 0;
+  width: 100%;
+  margin: 0.3em 0 0.3em 0;
 }
 
 th, td {
@@ -96,7 +105,8 @@ th, td {
 
 th, thead td {
   border-bottom: none;
-  background-color: #E5E5E5;
+  background-color: #669966;
+  color: #ffffff;
   text-align: left;
 }
 
@@ -104,16 +114,12 @@ th, thead td {
 #wrap{
   margin: 1em auto 2em auto;
   text-align: left;
-  width: 60em;
+  width: 65em;
 }
 
 
 #header {
-  margin: 0;
-}
-
-#header img {
-  margin: 0 0 1em 0em;
+  margin: 0 0 3em 18em;
 }
 
 #header .tagline {
@@ -131,29 +137,32 @@ th, thead td {
   float: left;
   text-align: left;
   margin-right: 2em;
+  font-family: "DejaVu Sans", Verdana, Helvetica;
+  font-size: 11pt;
+  text-align: right;
+  border-right: 1px solid #ccc;
+  padding-right: 2em;
 }
-
 #pages ol {
   list-style: none;
-  font-weight: bold;
   padding: 0;
+  margin: 0;
 }
-
 #pages ol li {
-  border-top: 1px solid #E9E9E9;
-  padding: 0.3em 0 0.5em 0.5em;
+  padding: 0.3em 0 0.6em 0em;
+  color: #669966;
+  font-weight: bold; 
 }
-
-#pages ol li a:link,  #pages ol li a:visited  {
-  color: #606060;
-  text-decoration: none;
+#pages ol li ol {
+  margin-top: 0.3em;
+  padding: 0.3em 0 0.9em 0.9em;
 }
-
-#pages ol li a:hover {
-  color: #222;
-  text-decoration: none;
+#pages ol li ol li {
+  padding: 0.3em 0 0.3em 0em;
+}
+#pages ol li a  {
+  font-weight: normal;
 }
-
 #pages form {
   margin-top: 2em;
   padding: 0.3em 0 0.5em 0.5em;
@@ -171,22 +180,15 @@ th, thead td {
 ol.toc {
   list-style: none;
   padding: 0;
-  margin-bottom: 2em !important;
+  margin: 0 0 2em 0;
 }
-
 ol.toc li {
-  padding: 0.3em 0 0.3em 0 !important;
+  padding: 0.3em 0 0.3em 0;
   margin: 0;
 }
-
-ol.toc ol.toc {
-  list-style: none;
-  margin: 0.3em 0 0 0 !important;
-  padding: 0;
-}
-
-ol.toc ol.toc li {
-  padding-left: 0.5em !important;
+ol.toc li ol.toc {
+  margin: 0;
+  padding-left: 0.9em;
 }
 
 
@@ -217,7 +219,8 @@ ol.toc ol.toc li {
 
 
 #footer {
-  border-top: 1px solid #444;
+  color: #888;
+  border-top: 1px solid #ccc;
   font-size: 0.9em;
   padding: 0.3em;
   margin: 2em 0 3em 0em;

data/doc/css/print.css

@@ -15,9 +15,12 @@
  */
 
 
-@page { margin: 1in 0.75in 1in 0.75in; }
-@page {
-  font-family: "DejaVu Sans", Verdana, Helvetica;
+@page { 
+  margin: 1in 0.75in 1in 0.75in;
+  @top-left, @top-right {
+    font-family: "Gill Sans", "DejaVu Sans", Verdana, Helvetica;
+    font-weight: normal;
+  }
 }
 @page:left {
   @top-left { content: counter(page); }
@@ -32,64 +35,66 @@
   @top-right { content: normal }
 }
 
-title {
-  string-set: doctitle content();
-}
+@media print {
+  title { string-set: doctitle content(); }
 
-body {
-  font-size: 12pt;
-  margin: 0;
-  color: black;
-  background: white;
-}
+  body {
+    font-family: "Palatino", "DejaVu Serif", Helvetica;
+    font-size: 12pt;
+    margin: 0;
+    color: black;
+    background: white;
+  }
 
-h1 {
-  string-set: pagetitle content();
-  page-break-before: always;
-}
-h1:first-child { page-break-before: avoid; }
-pre, p, blockquote { page-break-inside: avoid; }
-pre {
-  line-height: 1.3em;
-  white-space: pre-wrap; /* css-3 */
-  padding: 0.3em 0 0.9em 0.6em;
-  margin: 0;
-}
-a:link, a:visited {
-  background: transparent;
-  text-decoration: none;
-}
+  h1 {
+    string-set: pagetitle content();
+    page-break-before: always;
+  }
+  h1:first-child { page-break-before: avoid; }
+  h1, h2, h3, ol.toc {
+    font-family: "Gill Sans", "Courier", "DejaVu Sans", Verdana, Helvetica;
+  }
+  pre, p, blockquote { page-break-inside: avoid; }
+  pre, code {
+    font-family: "Monaco", "DejaVu Sans Mono", "Courier New", "Courier";
+    font-size: 10pt;
+  }
+  a:link, a:visited {
+    background: transparent;
+    text-decoration: none;
+  }
+  #wrap, #content, #footer {
+    float: none !important;
+    color: black;
+    background: transparent;
+    width: auto !important;
+    margin: 0;
+    padding: 0;
+    border: 0;
+  }
 
+  #header {
+    margin-bottom: 5%;
+    font-size: 120%;
+  }
+  #header img { width: 4in; }
+  #header .tagline {
+    float: none !important;
+    position: static !important;
+    font-size: 1.2em;
+    text-align: center;
+  }
 
-#wrap, #content, #footer {
-  float: none !important;
-  color: black;
-  background: transparent;
-  width: auto !important;
-  margin: 0;
-  padding: 0;
-  border: 0;
-}
-
-#header {
-  margin-bottom: 5%;
-  font-size: 120%;
-}
-#header img { width: 4in; }
-#header .tagline {
-  float: none !important;
-  position: static !important;
-  font-size: 1.2em;
-  text-align: center;
-}
+  #pages, .noprint { display: none; }
 
-#pages, .noprint { display: none; }
+  ol.toc a:link, ol.toc a:visited { text-decoration: none; }
+  ol.toc a:after { content: leader('.') target-counter(attr(href), page); }
 
-ol.toc a:link, ol.toc a:visited { text-decoration: none; }
-ol.toc a:after { content: leader('.') target-counter(attr(href), page); }
+  #footer { margin-top: 5%; }
 
-#footer { margin-top: 5%; }
+  #license {
+    page-break-before: always;
+    padding-top: 1in;
+  }
 
-#license {
-  padding-top: 1in;
 }