buildr 1.2.10 → 1.3.0

data/{lib → addon}/buildr/openjpa.rb

@@ -1,13 +1,30 @@
-require "java/java"
+# 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.
+
+
+require 'buildr/java'
+
 
 module Buildr
 
   # Provides OpenJPA bytecode enhancement and Mapping tool task. Require explicitly using <code>require "buildr/openjpa"</code>.
   module OpenJPA
 
-    VERSION = "0.9.7-incubating"
+    VERSION = "1.0.1"
 
-    REQUIRES = [ "org.apache.openjpa:openjpa-all:jar:#{VERSION}",
+    REQUIRES = [ "org.apache.openjpa:openjpa:jar:#{VERSION}",
       "commons-collections:commons-collections:jar:3.1",
       "commons-dbcp:commons-dbcp:jar:1.2.1", 
       "commons-lang:commons-lang:jar:2.1",
@@ -17,7 +34,7 @@ module Buildr
       "org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0",
       "net.sourceforge.serp:serp:jar:1.11.0" ]
 
-    Java.wrapper.classpath << REQUIRES
+    Java.classpath << REQUIRES
 
     class << self
 
@@ -60,8 +77,8 @@ module Buildr
     end
 
     def open_jpa_enhance(options = nil)
-      jpa_options = { :output=>compile.target, :classpath=>compile.classpath,
-                      :properties=>path_to("src/main/resources/META-INF/persistence.xml") }
+      jpa_options = { :output=>compile.target, :classpath=>compile.dependencies,
+                      :properties=>path_to(:source, :main, :resources, 'META-INF/persistence.xml') }
       OpenJPA.enhance jpa_options.merge(options || {})
     end
 

data/{lib/buildr/jetty → addon/buildr/org/apache/buildr}/JettyWrapper.java

@@ -1,3 +1,22 @@
+/* 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.
+ */
+
+
+package org.apache.buildr;
+ 
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.Handler;

data/{lib → addon}/buildr/xmlbeans.rb

@@ -1,15 +1,43 @@
-require "java/java"
-require "java/ant"
+# 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.
+
+
+require 'buildr/java'
+require 'buildr/java/ant'
+
 
 module Buildr
 
   # Provides XMLBeans schema compiler. Require explicitly using <code>require "buildr/xmlbeans"</code>.
+  #
+  #   require 'buildr/xmlbeans'
+  #   define 'some_proj' do 
+  #      compile_xml_beans _(:source, :main, :xsd) # the directory with *.xsd
+  #   end
   module XMLBeans
 
-    STAX = "stax:stax-api:jar:1.0"
-    XMLBEANS = "org.apache.xmlbeans:xmlbeans:jar:2.3.0"
-    REQUIRES = [ STAX, XMLBEANS ]
-
+    # You can use ArtifactNamespace to customize the versions of 
+    # <code>:xmlbeans</code> or <code>:stax</code> used by this module:
+    #
+    #   require 'buildr/xmlbeans'
+    #   Buildr::XMLBeans::REQUIRES.xmlbeans = '2.2.0'
+    REQUIRES = ArtifactNamespace.for(self) do |ns|
+      ns.xmlbeans! 'org.apache.xmlbeans:xmlbeans:jar:2.3.0', '>2'
+      ns.stax_api! 'stax:stax-api:jar:>=1.0.1'
+    end
+    
     class << self
 
       def compile(*args)
@@ -29,12 +57,9 @@ module Buildr
         touch options[:output].to_s, :verbose=>false
       end
 
-    private
-
       def requires()
-        @requires ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
+        @requires ||= REQUIRES.artifacts.each(&:invoke).map(&:to_s)
       end
-    
     end
 
     def compile_xml_beans(*args)
@@ -42,18 +67,18 @@ module Buildr
       # (the last FileList is there to deal with things like *.xsdconfig).
       files = args.flatten.map { |file| File.directory?(file) ? FileList["#{file}/*.xsd"] : FileList[file] }.flatten
       # Generate sources and add them to the compile task.
-      generated = file(path_to(:target, "generated/xmlbeans")=>files) do |task|
+      generated = file(path_to(:target, :generated, :xmlbeans)=>files) do |task|
         XMLBeans.compile args.flatten, :output=>task.name,
           :javasource=>compile.options.source, :xsb=>compile.target
       end
-      compile.from(generated).with(STAX, XMLBEANS)
+      compile.using(:javac).from(generated).with(*XMLBeans.requires)
       # Once compiled, we need to copy the generated XSB/XSD and one (magical?) class file
       # into the target directory, or the rest is useless.
       compile do |task|
         verbose(false) do
-          base = Pathname.new(generated.to_s)
+          base = generated.to_s
           FileList["#{base}/**/*.{class,xsb,xsd}"].each do |file|
-            target = File.join(compile.target.to_s, Pathname.new(file).relative_path_from(base))
+            target = File.join(compile.target.to_s, Util.relative_path(base, file))
             mkpath File.dirname(target) ; cp file, target
           end
         end

data/bin/buildr

@@ -1,7 +1,21 @@
-begin
-  require "buildr"
-rescue LoadError
-  require "rubygems"
-  require "buildr"
-end
-Rake.application.run
+#!/usr/bin/env ruby
+# 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.
+
+
+require 'rubygems'
+require 'buildr'
+
+Buildr.application.run

data/buildr.gemspec

@@ -0,0 +1,50 @@
+# 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.
+
+
+Gem::Specification.new do |spec|
+  spec.name           = 'buildr'
+  spec.version        = '1.3.0'
+  spec.author         = 'Apache Buildr'
+  spec.email          = "#{spec.name}-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',
+                                 '*.gemspec', '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/#{spec.name}/trunk/'
+  spec.rubyforge_project  = 'buildr'
+
+  # Tested against these dependencies.
+  spec.add_dependency 'rake',                 '~> 0.8'
+  spec.add_dependency 'builder',              '~> 2.1'
+  spec.add_dependency 'net-ssh',              '~> 1.1'
+  spec.add_dependency 'net-sftp',             '~> 1.1'
+  spec.add_dependency 'rubyzip',              '~> 0.9'
+  spec.add_dependency 'highline',             '~> 1.4'
+  spec.add_dependency 'Antwrap',              '~> 0.7'
+  spec.add_dependency 'rspec',                '~> 1.1'
+  spec.add_dependency 'xml-simple',           '~> 1.0'
+  spec.add_dependency 'archive-tar-minitar',  '~> 0.5'
+  spec.add_dependency 'rubyforge',            '~> 0.4'
+end

data/doc/css/default.css

@@ -0,0 +1,225 @@
+/* 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.
+ */
+
+
+body {
+  background-color: #fff;
+  color: #000;
+  font-family: "DejaVu Sans", Verdana, Helvetica;
+  text-align: center;
+	line-height: 1.5em;
+}
+
+a:link, a:visited{
+  color: #0044b3;
+  text-decoration: none;
+}
+
+a:hover{
+  text-decoration: underline;
+}
+
+img {
+  border: none;
+}
+
+pre, code { font-family: "DejaVu Sans Mono", "Courier New", "Courier"; }
+pre { padding: 1em; }
+pre.wrapped {
+  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;
+  line-height: 1.25em;
+  letter-spacing: 0.03em;
+}
+
+h1 {
+  border-bottom: 1px solid #808080;
+  font-size: 2em;
+  margin-top: 0;
+}
+
+h2 {
+  border-bottom: 1px solid #a0a0a0;
+  font-size: 1.3em;
+}
+
+h3 {
+  border-bottom: 1px solid #c0c0c0;
+  font-size: 1.1em;
+}
+
+blockquote {
+	padding-left: 2em;
+	padding-right: 2em;
+	margin-left: 0.3em;
+  margin-right: 0;
+	border-left: 1px solid #3c78b5;
+}
+
+ul { 
+  list-style-type: disc;
+}
+
+ul ul {
+  list-style-type: disc;
+  padding-left: 1em;
+}
+
+table {
+  border-spacing: 0.2em 0;
+}
+
+th, td {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  border-bottom: 1px solid #D8D8D8;
+  vertical-align: top;
+  background-color: #FFFFFF;
+}
+
+th {
+  border-bottom: none;
+  background-color: #E5E5E5;
+  text-align: left;
+}
+
+
+#wrap{
+  margin: 1em auto 2em auto;
+  text-align: left;
+  width: 60em;
+}
+
+
+#header {
+  margin: 0;
+}
+
+#header img {
+  margin: 0 0 1em 0em;
+}
+
+#header .tagline {
+  float: right;
+  font-size: 1.5em;
+  font-weight: bold;
+  position: relative;
+  bottom: 4.5em;
+}
+
+
+#pages { /* Parent Wrapper for inside boxes */
+/*  display: inline; */ /* IE Hack */
+  width: 12em;
+  float: left;
+  text-align: left;
+  margin-right: 2em;
+}
+
+#pages ol {
+  list-style: none;
+  font-weight: bold;
+  padding: 0;
+}
+
+#pages ol li {
+  border-top: 1px solid #E9E9E9;
+  padding: 0.3em 0 0.5em 0.5em;
+}
+
+#pages ol li a:link,  #pages ol li a:visited  {
+  color: #606060;
+  text-decoration: none;
+}
+
+#pages ol li a:hover {
+  color: #222;
+  text-decoration: none;
+}
+
+#pages form {
+  margin-top: 2em;
+  padding: 0.3em 0 0.5em 0.5em;
+}
+
+
+#content { /* Parent Wrapper for inside boxes */
+/*  display: inline; *//* IE Hack */
+  float: right;
+  width: 44em;
+  margin-left: 0.3em;
+  margin-bottom: 5em;
+}
+
+ol.toc {
+  list-style: none;
+  padding: 0;
+  margin-bottom: 2em !important;
+}
+
+ol.toc li {
+  padding: 0.3em 0 0.3em 0 !important;
+  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;
+}
+
+
+#content p.tip, #content p.note {
+  margin: 0.9em 0 0 0;
+  padding: 0 0 2em 4em;
+}
+#content p.tip { background: url("../images/tip.png") 0 0 no-repeat; }
+#content p.note { background: url("../images/note.png") 0 0 no-repeat; }
+ 
+#content .footnote {
+  margin-top: 2.5em;
+}
+#content .footnote {
+  padding-top: 1.5em;
+  border-top: 1px solid #ccc;
+}
+#content .footnote + .footnote {
+  margin-top: 0.5em;
+  padding-top: 0;
+  border: none;
+}
+#content .footnote sup { font-weight: bold; }
+
+#content .footnote-links dt { font-weight: bold; }
+#content .footnote-links dt:after { content: ": " }
+#content .footnote-links dd { }
+
+
+#footer {
+  border-top: 1px solid #444;
+  font-size: 0.9em;
+  padding: 0.3em;
+  margin: 2em 0 3em 0em;
+  clear: both;
+}