You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2014/08/26 11:26:54 UTC
svn commit: r1620542 [1/2] - in /buildr/site: ./ rdoc/ rdoc/Buildr/
rdoc/Buildr/Compiler/ rdoc/Buildr/IntellijIdea/ rdoc/Gem/ rdoc/js/
Author: donaldp
Date: Tue Aug 26 09:26:54 2014
New Revision: 1620542
URL: http://svn.apache.org/r1620542
Log:
Publish latest site
Modified:
buildr/site/CHANGELOG
buildr/site/download.html
buildr/site/index.html
buildr/site/rdoc/Buildr/Apt.html
buildr/site/rdoc/Buildr/Compiler/Javac.html
buildr/site/rdoc/Buildr/IntellijIdea/IdeaModule.html
buildr/site/rdoc/Buildr/IntellijIdea/IdeaProject.html
buildr/site/rdoc/Buildr/IntellijIdea/ProjectExtension.html
buildr/site/rdoc/Buildr/JMock.html
buildr/site/rdoc/Buildr/JUnit.html
buildr/site/rdoc/Buildr/MultiTest.html
buildr/site/rdoc/Buildr/TestNG.html
buildr/site/rdoc/Buildr/VersionRequirement.html
buildr/site/rdoc/CHANGELOG.html
buildr/site/rdoc/Gem/Version.html
buildr/site/rdoc/created.rid
buildr/site/rdoc/js/search_index.js
buildr/site/rdoc/table_of_contents.html
Modified: buildr/site/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/site/CHANGELOG?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/CHANGELOG (original)
+++ buildr/site/CHANGELOG Tue Aug 26 09:26:54 2014
@@ -1,3 +1,25 @@
+1.4.20 (2014-08-23)
+* Fixed : BUILDR-688 - Disregard package-info.java files when determining if
+ the Javac compiler should be run or not. Submitted by Pepijn Van
+ Eeckhoudt.
+* Fixed : Work around bug/feature of jruby 1.7.13 that caches Gem::Version
+ objects based on constructor parameters that causes issues with
+ Buildr as we mutate the version objects through monkey patching.
+* Change: Upgrade rjb dependency to 1.4.9.
+* Change: BUILDR-701 - Update to JUnit 4.11. Submitted by Jean-Philippe Caruana.
+* Added: Support the 'report_level' property on findbugs addon.
+* Change: Update the findbugs addon to use the 3.0.0 version of Findbugs.
+* Change: Update the findbugs addon to use the built-in findbugs stylesheet
+ to generate the html report.
+* Fixed: Ensure that the 'source_paths' and 'extra_dependencies' properties
+ in the findbugs addon does not contain arrays or nils.
+* Fixed: Ensure that the 'single_intermediate_layout' addon removes the top
+ level target and reports directories during 'clean' phase.
+* Added: Enhance idea project generation of ejb facet by looking for ejb
+ descriptors in location compatible with ejb-jars.
+* Fixed: Ensure that the 'source_paths' property in the pmd addon does not
+ contain arrays or nils.
+
1.4.19 (2014-07-06)
* Fixed: BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
download(artifact('group:artifact:jar:1-SNAPSHOT') =>
Modified: buildr/site/download.html
URL: http://svn.apache.org/viewvc/buildr/site/download.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/download.html (original)
+++ buildr/site/download.html Tue Aug 26 09:26:54 2014
@@ -87,6 +87,40 @@
<p>The official Apache distribution consists of the digitally signed binaries (gems) and source packages <a href="#dist">available below</a>. To install these binaries, you must first download them to disk and then install them using the <code>gem install</code> command (or <code>rake install</code> for a source distribution).</p>
<p>The source code is included in both source and binary distribution, the Gem distribution expands the source code into your local Gem repository. That’s in addition to getting the source code directly. Learn more about working with source code and <a href="contributing.html#edge">living on the edge</a>.</p>
<h2 id="dist">Binaries and Source Code</h2>
+<h3>buildr 1.4.20 (2014-08-23)</h3>
+<table>
+ <tr>
+ <th>Package </th>
+ <th>MD5 Checksum </th>
+ <th><span class="caps">PGP</span> </th>
+ </tr>
+ <tr>
+ <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20-java.gem">buildr-1.4.20-java.gem</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-java.gem.md5">5c556432d31d1b6a8b7f6dc4d40adfd7</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-java.gem.asc">Sig</a> </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem">buildr-1.4.20-x86-mswin32.gem</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem.md5">4db296ff90d82306d80b47c763f771ae</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20-x86-mswin32.gem.asc">Sig</a> </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.gem">buildr-1.4.20.gem</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.gem.md5">78987c8048d9c30c96f07b485df7077c</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.gem.asc">Sig</a> </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.tgz">buildr-1.4.20.tgz</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.tgz.md5">682d1574dbc9c17db841df6a9632497e</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.tgz.asc">Sig</a> </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.20/buildr-1.4.20.zip">buildr-1.4.20.zip</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.zip.md5">ad04e82d76268ec91a6bc33afcb77490</a> </td>
+ <td> <a href="http://www.apache.org/dist/buildr/1.4.20/buildr-1.4.20.zip.asc">Sig</a> </td>
+ </tr>
+</table>
+<p style="text-align:right;">(<a href="http://www.apache.org/dist/buildr/1.4.20/KEYS">Release signing keys</a>)</p>
<h3>buildr 1.4.19 (2014-07-06)</h3>
<table>
<tr>
@@ -95,32 +129,32 @@
<th><span class="caps">PGP</span> </th>
</tr>
<tr>
- <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-java.gem">buildr-1.4.19-java.gem</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.md5">bdf35f947eab94766ec4a4ca4b82e73e</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.asc">Sig</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem">buildr-1.4.19-java.gem</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.md5">bdf35f947eab94766ec4a4ca4b82e73e</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.asc">Sig</a> </td>
</tr>
<tr>
- <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem">buildr-1.4.19-x86-mswin32.gem</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.md5">9fbe0ac5148e5d3a6f449dfbd5dfc4a2</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.asc">Sig</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem">buildr-1.4.19-x86-mswin32.gem</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.md5">9fbe0ac5148e5d3a6f449dfbd5dfc4a2</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.asc">Sig</a> </td>
</tr>
<tr>
- <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.gem">buildr-1.4.19.gem</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.md5">626af3aabef47a6c55587aaeca5d879d</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.asc">Sig</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem">buildr-1.4.19.gem</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.md5">626af3aabef47a6c55587aaeca5d879d</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.asc">Sig</a> </td>
</tr>
<tr>
- <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.tgz">buildr-1.4.19.tgz</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.md5">f9bc0151a6ed9867c40393cced6195f5</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.asc">Sig</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz">buildr-1.4.19.tgz</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.md5">f9bc0151a6ed9867c40393cced6195f5</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.asc">Sig</a> </td>
</tr>
<tr>
- <td> <a href="http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.zip">buildr-1.4.19.zip</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.md5">1c88b93901524e236db41ec69a3bc72a</a> </td>
- <td> <a href="http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.asc">Sig</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip">buildr-1.4.19.zip</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.md5">1c88b93901524e236db41ec69a3bc72a</a> </td>
+ <td> <a href="http://archive.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.asc">Sig</a> </td>
</tr>
</table>
-<p style="text-align:right;">(<a href="http://www.apache.org/dist/buildr/1.4.19/KEYS">Release signing keys</a>)</p>
+<p style="text-align:right;">(<a href="http://archive.apache.org/dist/buildr/1.4.19/KEYS">Release signing keys</a>)</p>
<h3>buildr 1.4.18 (2014-06-24)</h3>
<table>
<tr>
Modified: buildr/site/index.html
URL: http://svn.apache.org/viewvc/buildr/site/index.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/index.html (original)
+++ buildr/site/index.html Tue Aug 26 09:26:54 2014
@@ -118,6 +118,22 @@
</ul>
<p>So let’s get started. You can <a href="quick_start.html">read the documentation online</a>, or <a href="buildr.pdf">download the <span class="caps">PDF</span></a>.</p>
<h2 id="news">What’s New</h2>
+<p>Highlights from Buildr 1.4.20 (2014-08-23)</p>
+<ul>
+ <li>Fixed : Work around bug/feature of jruby 1.7.13 that caches Gem::Version<br />
+ objects based on constructor parameters that causes issues with<br />
+ Buildr as we mutate the version objects through monkey patching.</li>
+ <li>Change: Upgrade rjb dependency to 1.4.9.</li>
+ <li>Change: <span class="caps">BUILDR</span>-701 – Update to JUnit 4.11. Submitted by Jean-Philippe Caruana.</li>
+ <li>Added: Support the ‘report_level’ property on findbugs addon.</li>
+ <li>Change: Update the findbugs addon to use the 3.0.0 version of Findbugs.</li>
+ <li>Change: Update the findbugs addon to use the built-in findbugs stylesheet<br />
+ to generate the html report.</li>
+ <li>Fixed: Ensure that the ‘single_intermediate_layout’ addon removes the top<br />
+ level target and reports directories during ‘clean’ phase.</li>
+ <li>Added: Enhance idea project generation of ejb facet by looking for ejb<br />
+ descriptors in location compatible with ejb-jars.</li>
+</ul>
<p>Highlights from Buildr 1.4.19 (2014-07-06)</p>
<ul>
<li>Fixed: <span class="caps">BUILDR</span>-700 – Ensure <span class="caps">SNAPSHOT</span> artifacts, constructed using the<br />
@@ -130,27 +146,6 @@
<li>Fixed: Fix bug introduced in 1.4.18 version of custom_pom addon where<br />
poms are created for artifacts that have a classifier.</li>
</ul>
-<p>Highlights from Buildr 1.4.18 (2014-06-24)</p>
-<ul>
- <li>Fixed: <span class="caps">BUILDR</span>-699 – Update the custom_pom addon to avoid failure when<br />
- used with zip packages.</li>
- <li>Fixed: <span class="caps">BUILDR</span>-694 – “buildr upload” fails: wrong number of arguments in<br />
- progress bar read() in Ruby 2.1.0. Submitted By Mark Reibert.</li>
- <li>Change: Remove support for uploads to RubyForge.org with gem dependencies<br />
- as the site no longer exists.</li>
- <li>Change: <span class="caps">BUILDR</span>-664 – Update Checkstyle addon so that extra_dependencies is<br />
- the project dependencies by default. Move the checkstyle dependencies<br />
- to the start of the classpath to avoid problems running checkstyle.<br />
- Submitted by Dieter Vrancken.</li>
- <li>Added: Extend Intellij <span class="caps">IDEA</span> support to allow creation of glassfish,<br />
- java and ruby scrip configurations.</li>
- <li>Change: Include additional rules in default pmd rule set:</li>
- <li>Change: Upgrade the version of <span class="caps">PMD</span> in use to 5.1.1 and add additional<br />
- default rule sets ‘finalizers’ and ‘braces’.</li>
- <li>Change: Supply a default xsl file for generating the jdepend report.</li>
- <li>Fixed: Fix the naming of css_lint addon file so it is made available<br />
- as an addon.</li>
-</ul>
<p>This is a partial list — see the <a href="CHANGELOG"><span class="caps">CHANGELOG</span></a> for full details.</p>
<h2 id="notices">Credits & Notices</h2>
<p><a href="http://www.apache.org"><img src="http://www.apache.org/images/asf-logo.gif" title="A project of the Apache Software Foundation" alt="A project of the Apache Software Foundation" /></a></p>
Modified: buildr/site/rdoc/Buildr/Apt.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/Apt.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/Apt.html (original)
+++ buildr/site/rdoc/Buildr/Apt.html Tue Aug 26 09:26:54 2014
@@ -474,7 +474,7 @@ Uses the compile.sources list if on argu
<div class="method-source-code" id="apt-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/compiler.rb, line 102</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/compiler.rb, line 109</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">apt</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">sources</span>)
<span class="ruby-identifier">sources</span> = <span class="ruby-identifier">compile</span>.<span class="ruby-identifier">sources</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">sources</span>.<span class="ruby-identifier">empty?</span>
<span class="ruby-identifier">file</span>(<span class="ruby-identifier">path_to</span>(<span class="ruby-value">:target</span>, <span class="ruby-string">'generated/apt'</span>)=<span class="ruby-operator">></span><span class="ruby-identifier">sources</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">task</span><span class="ruby-operator">|</span>
Modified: buildr/site/rdoc/Buildr/Compiler/Javac.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/Compiler/Javac.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/Compiler/Javac.html (original)
+++ buildr/site/rdoc/Buildr/Compiler/Javac.html Tue Aug 26 09:26:54 2014
@@ -67,7 +67,17 @@
+ <!-- Method Quickref -->
+<nav id="method-list-section" class="section">
+ <h3 class="section-header">Methods</h3>
+
+ <ul class="link-list">
+
+ <li class="calls-super" ><a href="#method-i-compile_map">#compile_map</a>
+ </ul>
+</nav>
+
</div>
<div id="project-metadata">
@@ -483,6 +493,54 @@ debug</p>
<!-- Methods -->
+ <section id="public-instance-5Buntitled-5D-method-details" class="method-section section">
+ <h3 class="section-header">Public Instance Methods</h3>
+
+
+ <div id="method-i-compile_map" class="method-detail ">
+
+ <div class="method-heading">
+ <span class="method-name">compile_map</span><span
+ class="method-args">(sources, target)</span>
+
+ <span class="method-click-advice">click to toggle source</span>
+
+ </div>
+
+
+ <div class="method-description">
+
+ <p><a href="../Filter.html">Filter</a> out source files that are known to not
+produce any corresponding .class output file. If we leave this type of file
+in the generated compile map the compiler will always be run due to missing
+output files.</p>
+
+
+ <div class="method-calls-super">
+ Calls superclass method
+
+ </div>
+
+
+
+ <div class="method-source-code" id="compile_map-source">
+ <pre><span class="ruby-comment"># File lib/buildr/java/compiler.rb, line 69</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">compile_map</span>(<span class="ruby-identifier">sources</span>, <span class="ruby-identifier">target</span>)
+ <span class="ruby-identifier">map</span> = <span class="ruby-keyword">super</span>
+ <span class="ruby-identifier">map</span>.<span class="ruby-identifier">reject!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>,<span class="ruby-identifier">_</span><span class="ruby-operator">|</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">key</span>) <span class="ruby-operator">==</span> <span class="ruby-string">'package-info.java'</span> } <span class="ruby-operator">||</span> <span class="ruby-identifier">map</span>
+<span class="ruby-keyword">end</span></pre>
+ </div><!-- compile_map-source -->
+
+ </div>
+
+
+
+
+ </div><!-- compile_map-method -->
+
+
+ </section><!-- public-instance-method-details -->
+
</section><!-- 5Buntitled-5D -->
</div><!-- documentation -->
Modified: buildr/site/rdoc/Buildr/IntellijIdea/IdeaModule.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/IntellijIdea/IdeaModule.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/IntellijIdea/IdeaModule.html (original)
+++ buildr/site/rdoc/Buildr/IntellijIdea/IdeaModule.html Tue Aug 26 09:26:54 2014
@@ -702,6 +702,8 @@
<span class="ruby-identifier">ejb_roots</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">path</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">d</span> = <span class="ruby-node">"#{path}/WEB-INF/#{descriptor}"</span>
<span class="ruby-identifier">default_deployment_descriptors</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">d</span> <span class="ruby-keyword">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">d</span>)
+ <span class="ruby-identifier">d</span> = <span class="ruby-node">"#{path}/META-INF/#{descriptor}"</span>
+ <span class="ruby-identifier">default_deployment_descriptors</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">d</span> <span class="ruby-keyword">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">d</span>)
<span class="ruby-keyword">end</span>
<span class="ruby-keyword">end</span>
<span class="ruby-identifier">deployment_descriptors</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:deployment_descriptors</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">default_deployment_descriptors</span>
@@ -1469,7 +1471,7 @@
<div class="method-source-code" id="base_document-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 463</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 465</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">base_document</span>
<span class="ruby-identifier">target</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>
<span class="ruby-constant">Builder</span><span class="ruby-operator">::</span><span class="ruby-constant">XmlMarkup</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value">:target</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">target</span>).<span class="ruby-identifier">module</span>(<span class="ruby-value">:version</span> =<span class="ruby-operator">></span> <span class="ruby-string">"4"</span>, <span class="ruby-value">:relativePaths</span> =<span class="ruby-operator">></span> <span class="ruby-string">"true"</span>, <span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">type</span>)
@@ -1504,7 +1506,7 @@
<div class="method-source-code" id="default_components-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 473</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 475</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">default_components</span>
[
<span class="ruby-identifier">lambda</span> { <span class="ruby-identifier">module_root_component</span> },
@@ -1540,7 +1542,7 @@
<div class="method-source-code" id="facet_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 480</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 482</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">facet_component</span>
<span class="ruby-identifier">create_composite_component</span>(<span class="ruby-string">"FacetManager"</span>, {}, <span class="ruby-keyword">self</span>.<span class="ruby-identifier">facets</span>)
<span class="ruby-keyword">end</span></pre>
@@ -1573,7 +1575,7 @@
<div class="method-source-code" id="generate_compile_output-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 539</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 541</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_compile_output</span>(<span class="ruby-identifier">xml</span>)
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">output</span>(<span class="ruby-value">:url</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_path</span>(<span class="ruby-keyword">self</span>.<span class="ruby-identifier">main_output_dir</span>.<span class="ruby-identifier">to_s</span>))
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">tag!</span>(<span class="ruby-string">"output-test"</span>, <span class="ruby-value">:url</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_path</span>(<span class="ruby-keyword">self</span>.<span class="ruby-identifier">test_output_dir</span>.<span class="ruby-identifier">to_s</span>))
@@ -1608,7 +1610,7 @@
<div class="method-source-code" id="generate_content-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 545</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 547</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_content</span>(<span class="ruby-identifier">xml</span>)
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">content</span>(<span class="ruby-value">:url</span> =<span class="ruby-operator">></span> <span class="ruby-string">"file://$MODULE_DIR$"</span>) <span class="ruby-keyword">do</span>
<span class="ruby-comment"># Source folders</span>
@@ -1659,7 +1661,7 @@
<div class="method-source-code" id="generate_initial_order_entries-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 571</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 573</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_initial_order_entries</span>(<span class="ruby-identifier">xml</span>)
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">orderEntry</span> <span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-string">"sourceFolder"</span>, <span class="ruby-value">:forTests</span> =<span class="ruby-operator">></span> <span class="ruby-string">"false"</span>
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">orderEntry</span> <span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-string">"jdk"</span>, <span class="ruby-value">:jdkName</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">jdk_version</span>, <span class="ruby-value">:jdkType</span> =<span class="ruby-operator">></span> <span class="ruby-string">"JavaSDK"</span>
@@ -1693,7 +1695,7 @@
<div class="method-source-code" id="generate_lib-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 506</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 508</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_lib</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">dependency_path</span>, <span class="ruby-identifier">export</span>, <span class="ruby-identifier">source_path</span>, <span class="ruby-identifier">project_dependencies</span>)
<span class="ruby-identifier">project_for_dependency</span> = <span class="ruby-constant">Buildr</span>.<span class="ruby-identifier">projects</span>.<span class="ruby-identifier">detect</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">project</span><span class="ruby-operator">|</span>
[<span class="ruby-identifier">project</span>.<span class="ruby-identifier">packages</span>, <span class="ruby-identifier">project</span>.<span class="ruby-identifier">compile</span>.<span class="ruby-identifier">target</span>, <span class="ruby-identifier">project</span>.<span class="ruby-identifier">resources</span>.<span class="ruby-identifier">target</span>, <span class="ruby-identifier">project</span>.<span class="ruby-identifier">test</span>.<span class="ruby-identifier">compile</span>.<span class="ruby-identifier">target</span>, <span class="ruby-identifier">project</span>.<span class="ruby-identifier">test</span>.<span class="ruby-identifier">resources</span>.<span class="ruby-identifier">target</span>].<span class="ruby-identifier">flatten</span>.
@@ -1739,7 +1741,7 @@
<div class="method-source-code" id="generate_module_lib-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 583</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 585</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_module_lib</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">export</span>, <span class="ruby-identifier">source_path</span>, <span class="ruby-identifier">test</span> = <span class="ruby-keyword">false</span>)
<span class="ruby-identifier">attribs</span> = {<span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-string">'module-library'</span>}
<span class="ruby-identifier">attribs</span>[<span class="ruby-value">:exported</span>] = <span class="ruby-string">''</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">export</span>
@@ -1787,7 +1789,7 @@
<div class="method-source-code" id="generate_project_dependency-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 576</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 578</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">generate_project_dependency</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">other_project</span>, <span class="ruby-identifier">export</span>, <span class="ruby-identifier">test</span> = <span class="ruby-keyword">false</span>)
<span class="ruby-identifier">attribs</span> = {<span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-string">'module'</span>, <span class="ruby-string">"module-name"</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">other_project</span>}
<span class="ruby-identifier">attribs</span>[<span class="ruby-value">:exported</span>] = <span class="ruby-string">''</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">export</span>
@@ -1823,7 +1825,7 @@
<div class="method-source-code" id="initial_components-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 469</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 471</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">initial_components</span>
[]
<span class="ruby-keyword">end</span></pre>
@@ -1856,7 +1858,7 @@
<div class="method-source-code" id="jar_path-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 523</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 525</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">jar_path</span>(<span class="ruby-identifier">path</span>)
<span class="ruby-node">"jar://#{resolve_path(path)}!/"</span>
<span class="ruby-keyword">end</span></pre>
@@ -1889,7 +1891,7 @@
<div class="method-source-code" id="module_root_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 484</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 486</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">module_root_component</span>
<span class="ruby-identifier">create_component</span>(<span class="ruby-string">"NewModuleRootManager"</span>, <span class="ruby-string">"inherit-compiler-output"</span> =<span class="ruby-operator">></span> <span class="ruby-string">"false"</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">generate_compile_output</span>(<span class="ruby-identifier">xml</span>)
@@ -1940,7 +1942,7 @@
<div class="method-source-code" id="net_excluded_directories-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 603</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 605</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">net_excluded_directories</span>
<span class="ruby-identifier">net</span> = []
<span class="ruby-identifier">all</span> = <span class="ruby-keyword">self</span>.<span class="ruby-identifier">excluded_directories</span>.<span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span> <span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">_</span>(<span class="ruby-identifier">dir</span>.<span class="ruby-identifier">to_s</span>) }.<span class="ruby-identifier">sort_by</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">d</span><span class="ruby-operator">|</span> <span class="ruby-identifier">d</span>.<span class="ruby-identifier">size</span> }
@@ -1980,7 +1982,7 @@
<div class="method-source-code" id="relative_dir_inside_dir-3F-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 567</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 569</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">relative_dir_inside_dir?</span>(<span class="ruby-identifier">dir</span>)
<span class="ruby-operator">!</span><span class="ruby-identifier">dir</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-string">"../"</span>)
<span class="ruby-keyword">end</span></pre>
@@ -2013,7 +2015,7 @@
<div class="method-source-code" id="resolve_path-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 535</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 537</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">resolve_path</span>(<span class="ruby-identifier">path</span>)
<span class="ruby-identifier">resolve_path_from_base</span>(<span class="ruby-identifier">path</span>, <span class="ruby-string">"$MODULE_DIR$"</span>)
<span class="ruby-keyword">end</span></pre>
@@ -2046,7 +2048,7 @@
<div class="method-source-code" id="root_project-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 439</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 441</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">root_project</span>
<span class="ruby-identifier">p</span> = <span class="ruby-identifier">buildr_project</span>
<span class="ruby-keyword">while</span> <span class="ruby-identifier">p</span>.<span class="ruby-identifier">parent</span>
@@ -2083,7 +2085,7 @@
<div class="method-source-code" id="test_dependency_details-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 447</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 449</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">test_dependency_details</span>
<span class="ruby-identifier">main_dependencies_paths</span> = <span class="ruby-identifier">main_dependencies</span>.<span class="ruby-identifier">map</span>(<span class="ruby-operator">&</span><span class="ruby-value">:to_s</span>)
<span class="ruby-identifier">target_dir</span> = <span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">compile</span>.<span class="ruby-identifier">target</span>.<span class="ruby-identifier">to_s</span>
@@ -2128,7 +2130,7 @@
<div class="method-source-code" id="url_for_path-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 527</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 529</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">url_for_path</span>(<span class="ruby-identifier">path</span>)
<span class="ruby-keyword">if</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp">/jar$/</span>
<span class="ruby-identifier">jar_path</span>(<span class="ruby-identifier">path</span>)
Modified: buildr/site/rdoc/Buildr/IntellijIdea/IdeaProject.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/IntellijIdea/IdeaProject.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/IntellijIdea/IdeaProject.html (original)
+++ buildr/site/rdoc/Buildr/IntellijIdea/IdeaProject.html Tue Aug 26 09:26:54 2014
@@ -628,7 +628,7 @@
<div class="method-source-code" id="new-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 624</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 626</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">buildr_project</span>)
<span class="ruby-keyword">super</span>()
<span class="ruby-ivar">@buildr_project</span> = <span class="ruby-identifier">buildr_project</span>
@@ -672,7 +672,7 @@
<div class="method-source-code" id="add_artifact-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 641</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 643</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_artifact</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">build_on_make</span> = <span class="ruby-keyword">false</span>)
<span class="ruby-identifier">add_to_composite_component</span>(<span class="ruby-keyword">self</span>.<span class="ruby-identifier">artifacts</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">artifact</span>(<span class="ruby-value">:name</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">name</span>, <span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">type</span>, <span class="ruby-value">:"build-on-make"</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">build_on_make</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
@@ -709,7 +709,7 @@
<div class="method-source-code" id="add_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 649</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 651</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_configuration</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">factory_name</span>, <span class="ruby-identifier">default</span> = <span class="ruby-keyword">false</span>)
<span class="ruby-identifier">add_to_composite_component</span>(<span class="ruby-keyword">self</span>.<span class="ruby-identifier">configurations</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">options</span> = {<span class="ruby-value">:type</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">type</span>, <span class="ruby-value">:factoryName</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">factory_name</span>}
@@ -749,7 +749,7 @@
<div class="method-source-code" id="add_data_source-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 706</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 708</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_data_source</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">add_to_composite_component</span>(<span class="ruby-keyword">self</span>.<span class="ruby-identifier">data_sources</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">data_source_options</span> = {
@@ -810,7 +810,7 @@
<div class="method-source-code" id="add_default_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 660</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 662</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_default_configuration</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">factory_name</span>)
<span class="ruby-identifier">add_configuration</span>(<span class="ruby-keyword">nil</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">factory_name</span>, <span class="ruby-keyword">true</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-keyword">yield</span> <span class="ruby-identifier">xml</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">block_given?</span>
@@ -845,7 +845,7 @@
<div class="method-source-code" id="add_default_testng_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 973</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 975</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_default_testng_configuration</span>(<span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">jvm_args</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:jvm_args</span>] <span class="ruby-operator">||</span> <span class="ruby-string">'-ea'</span>
<span class="ruby-identifier">dir</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:dir</span>] <span class="ruby-operator">||</span> <span class="ruby-string">'$PROJECT_DIR$'</span>
@@ -908,7 +908,7 @@
<div class="method-source-code" id="add_exploded_ear_artifact-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 777</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 779</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_exploded_ear_artifact</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> ={})
<span class="ruby-identifier">artifact_name</span> = <span class="ruby-identifier">to_artifact_name</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span>)
@@ -954,7 +954,7 @@
<div class="method-source-code" id="add_exploded_ejb_artifact-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 810</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 812</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_exploded_ejb_artifact</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">artifact_name</span> = <span class="ruby-identifier">to_artifact_name</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span>)
@@ -998,7 +998,7 @@
<div class="method-source-code" id="add_exploded_war_artifact-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 738</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 740</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_exploded_war_artifact</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">artifact_name</span> = <span class="ruby-identifier">to_artifact_name</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span>)
<span class="ruby-identifier">artifacts</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:artifacts</span>] <span class="ruby-operator">||</span> []
@@ -1066,7 +1066,7 @@
<div class="method-source-code" id="add_glassfish_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 906</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 908</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_glassfish_configuration</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">artifact_name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:name</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">project</span>.<span class="ruby-identifier">iml</span>.<span class="ruby-identifier">id</span>
<span class="ruby-identifier">server_name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:server_name</span>] <span class="ruby-operator">||</span> <span class="ruby-string">'Glassfish 4.0.0'</span>
@@ -1162,7 +1162,7 @@
<div class="method-source-code" id="add_gwt_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 889</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 891</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_gwt_configuration</span>(<span class="ruby-identifier">launch_page</span>, <span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:name</span>] <span class="ruby-operator">||</span> <span class="ruby-node">"Run #{launch_page}"</span>
<span class="ruby-identifier">shell_parameters</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:shell_parameters</span>] <span class="ruby-operator">||</span> <span class="ruby-string">""</span>
@@ -1208,7 +1208,7 @@
<div class="method-source-code" id="add_jar_artifact-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 794</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 796</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_jar_artifact</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">artifact_name</span> = <span class="ruby-identifier">to_artifact_name</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span>)
@@ -1253,7 +1253,7 @@
<div class="method-source-code" id="add_java_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 825</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 827</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_java_configuration</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">classname</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">args</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:args</span>] <span class="ruby-operator">||</span> <span class="ruby-string">''</span>
<span class="ruby-identifier">dir</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:dir</span>] <span class="ruby-operator">||</span> <span class="ruby-string">"file://$PROJECT_DIR$/"</span>
@@ -1317,7 +1317,7 @@
<div class="method-source-code" id="add_postgres_data_source-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 666</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 668</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_postgres_data_source</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-keyword">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value">:url</span>].<span class="ruby-identifier">nil?</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">options</span>[<span class="ruby-value">:database</span>]
<span class="ruby-identifier">default_url</span> = <span class="ruby-node">"jdbc:postgresql://#{(options[:host] || "127.0.0.1")}:#{(options[:port] || "5432")}/#{options[:database]}"</span>
@@ -1361,7 +1361,7 @@
<div class="method-source-code" id="add_ruby_script_configuration-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 860</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 862</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_ruby_script_configuration</span>(<span class="ruby-identifier">project</span>, <span class="ruby-identifier">script</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">args</span> = <span class="ruby-identifier">options</span>[<span class="ruby-value">:args</span>] <span class="ruby-operator">||</span> <span class="ruby-string">''</span>
<span class="ruby-identifier">path</span> = <span class="ruby-operator">::</span><span class="ruby-constant">Buildr</span><span class="ruby-operator">::</span><span class="ruby-constant">Util</span>.<span class="ruby-identifier">relative_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-identifier">script</span>), <span class="ruby-identifier">project</span>.<span class="ruby-identifier">base_dir</span>)
@@ -1419,7 +1419,7 @@
<div class="method-source-code" id="add_sql_server_data_source-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 681</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 683</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_sql_server_data_source</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">default_url</span> = <span class="ruby-keyword">nil</span>
<span class="ruby-keyword">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value">:url</span>].<span class="ruby-identifier">nil?</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">options</span>[<span class="ruby-value">:database</span>]
@@ -1473,7 +1473,7 @@
<div class="method-source-code" id="jdk_version-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 637</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 639</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">jdk_version</span>
<span class="ruby-ivar">@jdk_version</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">compile</span>.<span class="ruby-identifier">options</span>.<span class="ruby-identifier">source</span> <span class="ruby-operator">||</span> <span class="ruby-string">"1.6"</span>
<span class="ruby-keyword">end</span></pre>
@@ -1506,7 +1506,7 @@
<div class="method-source-code" id="version-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 633</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 635</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">version</span>
<span class="ruby-ivar">@version</span> <span class="ruby-operator">||</span> <span class="ruby-string">"12"</span>
<span class="ruby-keyword">end</span></pre>
@@ -1545,7 +1545,7 @@
<div class="method-source-code" id="add_glassfish_configuration_wrapper-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1017</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1019</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_glassfish_configuration_wrapper</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">name</span>)
<span class="ruby-identifier">xml</span>.<span class="ruby-constant">ConfigurationWrapper</span>(<span class="ruby-value">:VM_VAR</span> =<span class="ruby-operator">></span> <span class="ruby-string">'JAVA_OPTS'</span>, <span class="ruby-value">:RunnerId</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">name</span>.<span class="ruby-identifier">to_s</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">configuration_wrapper</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">configuration_wrapper</span>.<span class="ruby-identifier">option</span>(<span class="ruby-value">:name</span> =<span class="ruby-operator">></span> <span class="ruby-string">'USE_ENV_VARIABLES'</span>, <span class="ruby-value">:value</span> =<span class="ruby-operator">></span> <span class="ruby-string">'true'</span>)
@@ -1592,7 +1592,7 @@
<div class="method-source-code" id="add_glassfish_runner_settings-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1009</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1011</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">add_glassfish_runner_settings</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {})
<span class="ruby-identifier">xml</span>.<span class="ruby-constant">RunnerSettings</span>(<span class="ruby-value">:RunnerId</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">name</span>.<span class="ruby-identifier">to_s</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">runner_settings</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">options</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
@@ -1629,7 +1629,7 @@
<div class="method-source-code" id="artifact_content-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1035</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1037</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">artifact_content</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">project</span>, <span class="ruby-identifier">projects</span>, <span class="ruby-identifier">options</span>)
<span class="ruby-identifier">emit_module_output</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">projects</span>)
<span class="ruby-identifier">emit_jpa_descriptors</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">project</span>, <span class="ruby-identifier">options</span>)
@@ -1664,7 +1664,7 @@
<div class="method-source-code" id="artifacts_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1153</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1155</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">artifacts_component</span>
<span class="ruby-identifier">create_composite_component</span>(<span class="ruby-string">"ArtifactManager"</span>, {}, <span class="ruby-keyword">self</span>.<span class="ruby-identifier">artifacts</span>)
<span class="ruby-keyword">end</span></pre>
@@ -1697,7 +1697,7 @@
<div class="method-source-code" id="base_document-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1045</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1047</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">base_document</span>
<span class="ruby-identifier">target</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>
<span class="ruby-constant">Builder</span><span class="ruby-operator">::</span><span class="ruby-constant">XmlMarkup</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value">:target</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">target</span>).<span class="ruby-identifier">project</span>(<span class="ruby-value">:version</span> =<span class="ruby-operator">></span> <span class="ruby-string">"4"</span>)
@@ -1732,7 +1732,7 @@
<div class="method-source-code" id="configurations_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1157</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1159</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">configurations_component</span>
<span class="ruby-identifier">create_composite_component</span>(<span class="ruby-string">"ProjectRunConfigurationManager"</span>, {}, <span class="ruby-keyword">self</span>.<span class="ruby-identifier">configurations</span>)
<span class="ruby-keyword">end</span></pre>
@@ -1765,7 +1765,7 @@
<div class="method-source-code" id="data_sources_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1149</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1151</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">data_sources_component</span>
<span class="ruby-identifier">create_composite_component</span>(<span class="ruby-string">"DataSourceManagerImpl"</span>, {<span class="ruby-value">:format</span> =<span class="ruby-operator">></span> <span class="ruby-string">"xml"</span>, <span class="ruby-value">:hash</span> =<span class="ruby-operator">></span> <span class="ruby-string">"3208837817"</span>}, <span class="ruby-keyword">self</span>.<span class="ruby-identifier">data_sources</span>)
<span class="ruby-keyword">end</span></pre>
@@ -1798,7 +1798,7 @@
<div class="method-source-code" id="default_components-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1051</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1053</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">default_components</span>
[
<span class="ruby-identifier">lambda</span> { <span class="ruby-identifier">modules_component</span> },
@@ -1838,7 +1838,7 @@
<div class="method-source-code" id="extension-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1041</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1043</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">extension</span>
<span class="ruby-string">"ipr"</span>
<span class="ruby-keyword">end</span></pre>
@@ -1871,7 +1871,7 @@
<div class="method-source-code" id="framework_detection_exclusion_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1062</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1064</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">framework_detection_exclusion_component</span>
<span class="ruby-identifier">create_component</span>(<span class="ruby-string">'FrameworkDetectionExcludesConfiguration'</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">file</span> <span class="ruby-value">:url</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_path</span>(<span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">_</span>(<span class="ruby-value">:artifacts</span>))
@@ -1906,7 +1906,7 @@
<div class="method-source-code" id="initial_components-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1068</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1070</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">initial_components</span>
[
<span class="ruby-identifier">lambda</span> { <span class="ruby-identifier">project_root_manager_component</span> },
@@ -1942,7 +1942,7 @@
<div class="method-source-code" id="modules_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1094</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1096</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">modules_component</span>
<span class="ruby-identifier">create_component</span>(<span class="ruby-string">"ProjectModuleManager"</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">modules</span> <span class="ruby-keyword">do</span>
@@ -1997,7 +1997,7 @@
<div class="method-source-code" id="project_details_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1088</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1090</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">project_details_component</span>
<span class="ruby-identifier">create_component</span>(<span class="ruby-string">"ProjectDetails"</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">xml</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">xml</span>.<span class="ruby-identifier">option</span>(<span class="ruby-string">"name"</span> =<span class="ruby-operator">></span> <span class="ruby-string">"projectName"</span>, <span class="ruby-string">"value"</span> =<span class="ruby-operator">></span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">name</span>)
@@ -2032,7 +2032,7 @@
<div class="method-source-code" id="project_root_manager_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1075</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1077</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">project_root_manager_component</span>
<span class="ruby-identifier">attribs</span> = {}
<span class="ruby-identifier">attribs</span>[<span class="ruby-string">"version"</span>] = <span class="ruby-string">"2"</span>
@@ -2074,7 +2074,7 @@
<div class="method-source-code" id="resolve_path-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1161</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1163</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">resolve_path</span>(<span class="ruby-identifier">path</span>)
<span class="ruby-identifier">resolve_path_from_base</span>(<span class="ruby-identifier">path</span>, <span class="ruby-string">"$PROJECT_DIR$"</span>)
<span class="ruby-keyword">end</span></pre>
@@ -2107,7 +2107,7 @@
<div class="method-source-code" id="vcs_component-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1120</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1122</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">vcs_component</span>
<span class="ruby-identifier">project_directories</span> = <span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">projects</span>.<span class="ruby-identifier">select</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">p</span><span class="ruby-operator">|</span> <span class="ruby-identifier">p</span>.<span class="ruby-identifier">iml?</span> }.<span class="ruby-identifier">collect</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">p</span><span class="ruby-operator">|</span> <span class="ruby-identifier">p</span>.<span class="ruby-identifier">base_dir</span> }
<span class="ruby-identifier">project_directories</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">buildr_project</span>.<span class="ruby-identifier">base_dir</span>
Modified: buildr/site/rdoc/Buildr/IntellijIdea/ProjectExtension.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/IntellijIdea/ProjectExtension.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/IntellijIdea/ProjectExtension.html (original)
+++ buildr/site/rdoc/Buildr/IntellijIdea/ProjectExtension.html Tue Aug 26 09:26:54 2014
@@ -486,7 +486,7 @@
<div class="method-source-code" id="iml-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1308</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1310</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">iml</span>
<span class="ruby-keyword">if</span> <span class="ruby-identifier">iml?</span>
<span class="ruby-keyword">unless</span> <span class="ruby-ivar">@iml</span>
@@ -531,7 +531,7 @@
<div class="method-source-code" id="iml-3F-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1332</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1334</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">iml?</span>
<span class="ruby-ivar">@has_iml</span> = <span class="ruby-ivar">@has_iml</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">?</span> <span class="ruby-keyword">true</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@has_iml</span>
<span class="ruby-keyword">end</span></pre>
@@ -564,7 +564,7 @@
<div class="method-source-code" id="ipr-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1296</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1298</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">ipr</span>
<span class="ruby-keyword">if</span> <span class="ruby-identifier">ipr?</span>
<span class="ruby-ivar">@ipr</span> <span class="ruby-operator">||=</span> <span class="ruby-constant">IdeaProject</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword">self</span>)
@@ -601,7 +601,7 @@
<div class="method-source-code" id="ipr-3F-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1304</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1306</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">ipr?</span>
<span class="ruby-operator">!</span><span class="ruby-ivar">@no_ipr</span> <span class="ruby-operator">&&</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">parent</span>.<span class="ruby-identifier">nil?</span>
<span class="ruby-keyword">end</span></pre>
@@ -634,7 +634,7 @@
<div class="method-source-code" id="no_iml-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1328</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1330</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">no_iml</span>
<span class="ruby-ivar">@has_iml</span> = <span class="ruby-keyword">false</span>
<span class="ruby-keyword">end</span></pre>
@@ -667,7 +667,7 @@
<div class="method-source-code" id="no_ipr-source">
- <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1324</span>
+ <pre><span class="ruby-comment"># File lib/buildr/ide/idea.rb, line 1326</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">no_ipr</span>
<span class="ruby-ivar">@no_ipr</span> = <span class="ruby-keyword">true</span>
<span class="ruby-keyword">end</span></pre>
Modified: buildr/site/rdoc/Buildr/JMock.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/JMock.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/JMock.html (original)
+++ buildr/site/rdoc/Buildr/JMock.html Tue Aug 26 09:26:54 2014
@@ -468,7 +468,7 @@ href="JBehave.html">JBehave</a>.</p>
<div class="method-heading">
<span class="method-name">dependencies</span><span
- class="method-args">()</span>
+ class="method-args">(versions = {:hamcrest => "1.1"})</span>
<span class="method-click-advice">click to toggle source</span>
@@ -484,15 +484,15 @@ href="JBehave.html">JBehave</a>.</p>
<div class="method-source-code" id="dependencies-source">
<pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 99</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">dependencies</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">dependencies</span>(<span class="ruby-identifier">versions</span> = {<span class="ruby-value">:hamcrest</span> =<span class="ruby-operator">></span> <span class="ruby-string">"1.1"</span>})
<span class="ruby-identifier">two_or_later</span> = <span class="ruby-identifier">version</span>[<span class="ruby-value">0</span>,<span class="ruby-value">1</span>].<span class="ruby-identifier">to_i</span> <span class="ruby-operator">>=</span> <span class="ruby-value">2</span>
<span class="ruby-identifier">group</span> = <span class="ruby-identifier">two_or_later</span> <span class="ruby-operator">?</span> <span class="ruby-string">"org.jmock"</span> <span class="ruby-operator">:</span> <span class="ruby-string">"jmock"</span>
<span class="ruby-ivar">@dependencies</span> <span class="ruby-operator">||=</span> [<span class="ruby-node">"#{group}:jmock:jar:#{version}"</span>]
<span class="ruby-keyword">if</span> <span class="ruby-identifier">two_or_later</span>
<span class="ruby-ivar">@dependencies</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"org.jmock:jmock-junit#{Buildr::JUnit.version.to_s[0,1]}:jar:#{version}"</span>
- <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator"><<</span> <span class="ruby-string">"org.hamcrest:hamcrest-core:jar:1.1"</span>
- <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator"><<</span> <span class="ruby-string">"org.hamcrest:hamcrest-library:jar:1.1"</span>
+ <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"org.hamcrest:hamcrest-core:jar:#{versions[:hamcrest]}"</span>
+ <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator"><<</span> <span class="ruby-node">"org.hamcrest:hamcrest-library:jar:#{versions[:hamcrest]}"</span>
<span class="ruby-keyword">end</span>
<span class="ruby-ivar">@dependencies</span>
<span class="ruby-keyword">end</span></pre>
Modified: buildr/site/rdoc/Buildr/JUnit.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/JUnit.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/JUnit.html (original)
+++ buildr/site/rdoc/Buildr/JUnit.html Tue Aug 26 09:26:54 2014
@@ -510,7 +510,8 @@ available to the test case.</p>
<div class="method-source-code" id="dependencies-source">
<pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 200</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">dependencies</span>
- <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator">||=</span> [<span class="ruby-node">"junit:junit:jar:#{version}"</span>]<span class="ruby-operator">+</span> <span class="ruby-constant">JMock</span>.<span class="ruby-identifier">dependencies</span>
+ <span class="ruby-identifier">four11_or_newer</span> = <span class="ruby-identifier">version</span> <span class="ruby-operator">>=</span> <span class="ruby-string">"4.11"</span>
+ <span class="ruby-ivar">@dependencies</span> <span class="ruby-operator">||=</span> [<span class="ruby-node">"junit:junit:jar:#{version}"</span>]<span class="ruby-operator">+</span> (<span class="ruby-identifier">four11_or_newer</span> <span class="ruby-operator">?</span> <span class="ruby-constant">JMock</span>.<span class="ruby-identifier">dependencies</span>({<span class="ruby-value">:hamcrest</span> =<span class="ruby-operator">></span> <span class="ruby-string">'1.3'</span>}) <span class="ruby-operator">:</span> <span class="ruby-constant">JMock</span>.<span class="ruby-identifier">dependencies</span>)
<span class="ruby-keyword">end</span></pre>
</div><!-- dependencies-source -->
Modified: buildr/site/rdoc/Buildr/MultiTest.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/MultiTest.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/MultiTest.html (original)
+++ buildr/site/rdoc/Buildr/MultiTest.html Tue Aug 26 09:26:54 2014
@@ -500,7 +500,7 @@
<div class="method-source-code" id="tests-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 405</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 406</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">tests</span>(<span class="ruby-identifier">dependencies</span>)
<span class="ruby-ivar">@frameworks</span>.<span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">tests</span>(<span class="ruby-identifier">dependencies</span>) }.<span class="ruby-identifier">flatten</span>
<span class="ruby-keyword">end</span></pre>
Modified: buildr/site/rdoc/Buildr/TestNG.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/TestNG.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/TestNG.html (original)
+++ buildr/site/rdoc/Buildr/TestNG.html Tue Aug 26 09:26:54 2014
@@ -500,7 +500,7 @@ line runner.</p>
<div class="method-source-code" id="dependencies-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 306</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 307</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">dependencies</span>
<span class="ruby-keyword">return</span> [<span class="ruby-node">"org.testng:testng:jar:jdk15:#{version}"</span>] <span class="ruby-operator">+</span> <span class="ruby-constant">JMock</span>.<span class="ruby-identifier">dependencies</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">version</span> <span class="ruby-operator"><</span> <span class="ruby-string">"6.0"</span>
[<span class="ruby-node">"org.testng:testng:jar:#{version}"</span>,<span class="ruby-string">'com.beust:jcommander:jar:1.27'</span>] <span class="ruby-operator">+</span> <span class="ruby-constant">JMock</span>.<span class="ruby-identifier">dependencies</span>
@@ -534,7 +534,7 @@ line runner.</p>
<div class="method-source-code" id="version-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 302</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/tests.rb, line 303</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">version</span>
<span class="ruby-constant">Buildr</span>.<span class="ruby-identifier">settings</span>.<span class="ruby-identifier">build</span>[<span class="ruby-string">'testng'</span>] <span class="ruby-operator">||</span> <span class="ruby-constant">VERSION</span>
<span class="ruby-keyword">end</span></pre>
Modified: buildr/site/rdoc/Buildr/VersionRequirement.html
URL: http://svn.apache.org/viewvc/buildr/site/rdoc/Buildr/VersionRequirement.html?rev=1620542&r1=1620541&r2=1620542&view=diff
==============================================================================
--- buildr/site/rdoc/Buildr/VersionRequirement.html (original)
+++ buildr/site/rdoc/Buildr/VersionRequirement.html Tue Aug 26 09:26:54 2014
@@ -685,7 +685,7 @@ create a new requirement</p>
<div class="method-source-code" id="26-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 147</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 149</span>
<span class="ruby-keyword">def</span> <span class="ruby-operator">&</span>(<span class="ruby-identifier">other</span>)
<span class="ruby-identifier">operation</span>(<span class="ruby-value">:&</span>, <span class="ruby-identifier">other</span>)
<span class="ruby-keyword">end</span></pre>
@@ -722,7 +722,7 @@ VersionRequirement.create('1 & 2').c
<div class="method-source-code" id="composed-3F-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 101</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 102</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">composed?</span>
<span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">></span> <span class="ruby-value">1</span>
<span class="ruby-keyword">end</span></pre>
@@ -755,7 +755,7 @@ VersionRequirement.create('1 & 2').c
<div class="method-source-code" id="default-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 106</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 107</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">default</span>
<span class="ruby-identifier">default</span> = <span class="ruby-keyword">nil</span>
<span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">reverse</span>.<span class="ruby-identifier">find</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">r</span><span class="ruby-operator">|</span>
@@ -799,12 +799,13 @@ VersionRequirement.create('1 & 2').c
<div class="method-source-code" id="satisfied_by-3F-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 121</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 122</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">satisfied_by?</span>(<span class="ruby-identifier">version</span>)
<span class="ruby-keyword">return</span> <span class="ruby-keyword">false</span> <span class="ruby-keyword">unless</span> <span class="ruby-identifier">version</span>
<span class="ruby-keyword">unless</span> <span class="ruby-identifier">version</span>.<span class="ruby-identifier">kind_of?</span>(<span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Version</span>)
<span class="ruby-identifier">raise</span> <span class="ruby-node">"Invalid version: #{version.inspect}"</span> <span class="ruby-keyword">unless</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">version?</span>(<span class="ruby-identifier">version</span>)
- <span class="ruby-identifier">version</span> = <span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Version</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value">0</span>).<span class="ruby-identifier">tap</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">v</span>.<span class="ruby-identifier">version</span> = <span class="ruby-identifier">version</span>.<span class="ruby-identifier">strip</span> }
+ <span class="ruby-comment"># dup required due to jruby 1.7.13 bug/feature that caches versions?</span>
+ <span class="ruby-identifier">version</span> = <span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Version</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value">0</span>).<span class="ruby-identifier">dup</span>.<span class="ruby-identifier">tap</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">v</span>.<span class="ruby-identifier">version</span> = <span class="ruby-identifier">version</span>.<span class="ruby-identifier">strip</span> }
<span class="ruby-keyword">end</span>
<span class="ruby-identifier">message</span> = <span class="ruby-identifier">op</span> <span class="ruby-operator">==</span> <span class="ruby-value">:|</span> <span class="ruby-string"> </span><span class="ruby-operator">:</span><span class="ruby-identifier">any?</span> <span class="ruby-operator">:</span> <span class="ruby-value">:all?</span>
<span class="ruby-identifier">result</span> = <span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">send</span> <span class="ruby-identifier">message</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">req</span><span class="ruby-operator">|</span>
@@ -846,7 +847,7 @@ VersionRequirement.create('1 & 2').c
<div class="method-source-code" id="to_s-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 152</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 154</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">to_s</span>
<span class="ruby-identifier">str</span> = <span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">map</span>(<span class="ruby-operator">&</span><span class="ruby-value">:to_s</span>).<span class="ruby-identifier">join</span>(<span class="ruby-string">" "</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@op</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-string">" "</span>).<span class="ruby-identifier">to_s</span>
<span class="ruby-identifier">str</span> = <span class="ruby-string">"( "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">str</span> <span class="ruby-operator">+</span> <span class="ruby-string">" )"</span> <span class="ruby-keyword">if</span> <span class="ruby-identifier">negative</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">></span> <span class="ruby-value">1</span>
@@ -883,7 +884,7 @@ create a new requirement</p>
<div class="method-source-code" id="7C-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 141</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 143</span>
<span class="ruby-keyword">def</span> <span class="ruby-operator">|</span>(<span class="ruby-identifier">other</span>)
<span class="ruby-identifier">operation</span>(<span class="ruby-value">:|</span>, <span class="ruby-identifier">other</span>)
<span class="ruby-keyword">end</span></pre>
@@ -922,7 +923,7 @@ create a new requirement</p>
<div class="method-source-code" id="operation-source">
- <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 162</span>
+ <pre><span class="ruby-comment"># File lib/buildr/java/version_requirement.rb, line 164</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">operation</span>(<span class="ruby-identifier">op</span>, <span class="ruby-identifier">other</span>)
<span class="ruby-ivar">@op</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">op</span>
<span class="ruby-keyword">if</span> <span class="ruby-identifier">negative</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">negative</span> <span class="ruby-operator">&&</span> <span class="ruby-ivar">@op</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">op</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">requirements</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">==</span> <span class="ruby-value">1</span>