Merge branch 'DATAFU-52'
diff --git a/README.md b/README.md
index 678fa4e..1b3c821 100644
--- a/README.md
+++ b/README.md
@@ -78,10 +78,10 @@
To run tests for a single class, use the `test.single` property. For example, to run only the QuantileTests:
```
-/gradlew :datafu-pig:test -Dtest.single=QuantileTests
+./gradlew :datafu-pig:test -Dtest.single=QuantileTests
```
-The tests can also be run from within eclipse.
+The tests can also be run from within eclipse. Note that you may run out of heap when executing tests in Eclipse. To fix this adjust your heap settings for the TestNG plugin. Go to Eclipse->Preferences. Select TestNG->Run/Debug. Add "-Xmx1G" to the JVM args.
### DataFu Hourglass
@@ -93,4 +93,4 @@
```
cd contrib/hourglass
ant jar
-```
\ No newline at end of file
+```
diff --git a/build-plugin/build.gradle b/build-plugin/build.gradle
index f16f2d2..eab96e0 100644
--- a/build-plugin/build.gradle
+++ b/build-plugin/build.gradle
@@ -5,8 +5,8 @@
}
dependencies {
- compile files("../staticlibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar")
- compile files("../staticlibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar")
+ compile "org.eclipse.tycho:org.eclipse.jdt.compiler.apt:1.1.0.v20140509-1235"
+ compile "org.eclipse.jdt:core:3.3.0-v_771"
compile files(getToolsJar())
}
diff --git a/cobertura/COPYING b/cobertura/COPYING
deleted file mode 100644
index fbdd65f..0000000
--- a/cobertura/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/cobertura/COPYRIGHT b/cobertura/COPYRIGHT
deleted file mode 100644
index 2dc9103..0000000
--- a/cobertura/COPYRIGHT
+++ /dev/null
@@ -1,34 +0,0 @@
-Cobertura - http://cobertura.sourceforge.net/
-
-List of all contributors to Cobertura
-Listed alphabetically by last name
-
-Copyright (C) 2005 Björn Beskow <bbeskow a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2008 Matt Cordes <mcordes a.t visa d.o.t com>
-Copyright (C) 2005 Erik Dick <erdick a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Mark Doliner <thekingant a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Joakim Erdfelt <joakim a.t erdfelt d.o.t net>
-Copyright (C) 2008 Julian Gamble <juliangamble a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2006 Dan Godfrey <dgodfrey99 a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2008 Tri Bao Ho <hotribao a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2006 Naoki Iwami <naoki_iwami a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2003 jcoverage ltd.
-Copyright (C) 2009 John Lewis <lewijw a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Grzegorz Lukasik <hauserx a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2006 Jiri Mares <jirimares a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2009 Amit Nithianandan <ANithian a.t gmail d.o.t com>
-Copyright (C) 2005 Olivier Parent <olivier-parent a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2009 Ed Randall <ed_randall a.t yahoo d.o.t com>
-Copyright (C) 2005 Alex Ruiz <alruiz15 a.t users d.o.t yahoo d.o.t com>
-Copyright (C) 2005 James Seigel <cgul a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Mark Sinke <marksinke a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2009 Charlie Squires <rockonword a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2010 Piotr Tabor <piotr.tabor a.t gmail d.o.t com>
-Copyright (C) 2005 Jeremy Thomerson <jthomerson a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2009 Chris van Es <cvanes a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2006 Srivathsan Varadarajan <vatsanv a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Nathan Wilson <ndciwilson a.t users d.o.t sourceforge d.o.t net>
-Copyright (C) 2005 Alexei Yudichev <sflexus a.t users d.o.t sourceforge d.o.t net>
-
-Code in the net.sourceforge.cobertura.javancss package is
-Copyright (C) 2000 Chr. Clemens Lee <clemens a.t kclee d.o.t com>
diff --git a/cobertura/ChangeLog b/cobertura/ChangeLog
deleted file mode 100644
index f1531b7..0000000
--- a/cobertura/ChangeLog
+++ /dev/null
@@ -1,270 +0,0 @@
-version 1.9.4.1:
- * Fix a problem that occurs in Tomcat. When TouchCollector
- initializes, it calls ProjectData.initialize() which (with
- Tomcat only) eventually calls TouchCollector. However,
- TouchCollector's static members have not been initialized.
- Added a test that highlights this problem. (Thanks to Jack Cobb
- for suggesting the fix).
- * Runs on Java 5. (Fix for Bug 2962599).
-
-
-version 1.9.4:
- * Cobertura is now up to 10x faster. Aggregates changes in
- temporary TouchCollector class (thread-safe, but lock-free) and after that
- applies it on real model (ProjectData) as a batch operation. (Piotr Tabor)
- * Fixed "Some packages are included more then once" bug (#2875576) that
- caused some counts on the HTML report to be incorrect. (Charlie Squires)
- * Fixed "Inner classes not counted in coverage report total" bug (#2943320)
- (Charlie Squires)
-
-version 1.9.3:
- * Update to the latest Javancss (32.53) to fix some complexity calculation
- problems. Bug #2824425. (John Lewis)
- * Non-Java source files (like Groovy) no longer show the JavaNCSS warnings
- during cobertura-report. Fix of bug #2819844.
- * Support the case where multiple classloaders each load the Cobertura
- classes. (Ed Randall)
- * Fixed bug added with 1.9.2 where a NullPointerException is thrown
- if ProjectData.saveGlobalProjectData() is called before any instrumented
- code is executed.
-
-version 1.9.2:
- * Cobertura is now thread safe.
- * Fix for FileLocker exception when writing coverage data
- (java.lang.IllegalStateException: Shutdown in progress) that started
- to appear with Java 6 update 14. (Chris van Es)
- * Fix for bug "Unix scripts behave oddly due to DOS format - ID: 2788621"
-
-version 1.9.1.1:
- * Just a copy of 1.9.1 with a corrected Maven POM file (cobertura-runtime.pom).
- A new version has to be created to get it uploaded to the central Maven repo.
-
-version 1.9.1:
- * Complexity calculation now works with Java 5 language
- features such as Annotations. (Tri Bao Ho)
- * Removed the bold font from the source-view for uncovered lines to
- improve the alignment. (Jiri Mares)
- * Support Ant <dirset>s. (Matt Cordes, John Lewis)
- * Support the antlib mechanism for defining and importing
- ant tasks. (Richard Atkins)
- * Reports now support source encoded in something than UTF-8. (Jiri Mares)
- * Report generation performance improvement. (Ignat Zapolsky)
- * Report generation will look in zip and jar files if the
- source java file is not found. (Charlie Squires, John Lewis)
- * cobertura-check with linerate=0, branchrate=0,
- packagebranchrate=0, packagelinerate=0, totalbranchrate=0,
- totallinerate=0 will no longer default all the values to
- 50 as before. Therefore, cobertura-check will always pass.
- Note that this still means that <cobertura-check /> (with
- no attributes) will still default to 50 for all rates. (Charlie
- Squires) (Bug 2152919)
- * New coberturaFlush.war is created. Deploy it to a
- web server and invoke http://<HOST>:<PORT>/coberturaFlush/flushCobertura
- for a convenient way of flushing the cobertura data to the
- datafile without stopping the web server. (Amit Nithianandan)
- * XML report now shows total lines-covered, lines-valid,
- branches-covered, branches-valid, and complexity. (Julian Gamble)
- * New report option called "summaryXml" will create
- a small summary XML report that does not have all the
- details on the classes - just the overall totals. This
- is for large projects where the full XML report gets so
- big it impairs continuous build processes. (Julian Gamble and Dan Godfrey)
- * Migrated from asm-2.2.1 to asm-3.0. (Jiri Mares)
- * The percentage coverage of 199 out of 200 lines has been 100%.
- No more! Now it is 99%. (Jiri Mares)
- * Spelling error corrected in main.css file - changed magin to
- margin. (Dennis Lundberg)
-
-version 1.9:
- * Much improved branch coverage. Information on whether
- the true as well as the false of an if statement is
- collected. Also, information on the branches of a
- switch statement (including the default) is collected.
- (Jiri Mares)
- * Assume Java source files are saved as UTF-8 instead of
- the computer's default encoding.
- * Write all HTML and XML reports in UTF-8 instead of the
- computer's default encoding (Naoki Iwami).
- * Fix a bug where the Cobertura ant tasks would not work
- correctly in Microsoft Windows when Cobertura was
- installed on a different drive than the drive from which
- you're running ant (Srivathsan Varadarajan).
- * Added a "maxmemory" attribute to the instrument, merge
- and report ant tasks (Matt Cordes).
- * Improve support for Maven and similar environments where
- control over system properties is difficult such as
- app servers, IoC containers, IDEs, etc. Setting the
- datafile location is difficult in these environments.
- To correct this, a cobertura.properties file
- located in the classpath is used to properly set the
- net.sourceforge.cobertura.datafile property.
- (Joakim Erdfelt)
-
-version 1.8 (2006-04-10)
- * Ability to have multiple <ignore/> regular expressions
- in the instrument task (Alexei Yudichev).
- * Ability to specify a minimum branch coverage rate and
- line coverage rate for each package when using
- cobertura-check.
- * Show the number of lines and branches covered and the
- total number of lines and branches in the HTML report.
- * Support for instrumenting classes written in Groovy.
- * Lock the data file before trying to write to it. This
- allows multiple JVMs (or multiple class loaders within
- a single JVM) to write to the same coverage data file
- with no problems (John Lewis).
- * Ability to instrument classes on a given classpath
- instead of specifying filesets (John Lewis).
- * Ability to specify which classes will be instrumented
- using regular expressions (John Lewis).
- * Archives within archives will be instrumented if you
- specify an includeClassname regular expression (John
- Lewis).
- * If instrumenting an archive, remove any signatures
- and checksums, since they will no longer be valid (John
- Lewis).
- * Removed the Class-Path line from cobertura.jar. You may
- need to modify your Cobertura taskdef to include the jars
- in Cobertura's 'lib' directory. See our Ant task web
- page for an example.
- * Reorganized libs into a flatter directory structure--you
- may need to update your ant scripts.
- * Upgraded from asm 2.1 to asm 2.2.1. No code changes were
- needed.
- * Copied portions of classes from JavaNCSS into Cobertura
- so that we don't need to include the entire JavaNCSS and
- CCL jars.
-
-version 1.7 (2005-12-06)
- * log4j is no longer used by the Cobertura classes that are
- accessed by instrumented Java code. This means you will
- not need to add log4j to your project's classpath in order
- to use Cobertura (but log4j is still required when
- instrumenting and reporting).
- * Upgraded from asm 2.0 to asm 2.1. No code changes were
- needed.
- * Improved the merge task. It should work correctly now
- (with help from Björn Beskow).
- * Fixed the ability to specify a data file in the merge task.
- * Changed the command-line interface to the merge task and
- added a helper batch/shell script.
- * Added better error checking to the merge task.
- * Fixed a bug where an empty or incomplete coverage data
- file would be written when you test classes inside Tomcat,
- and you stop Tomcat using the shutdown.bat or shutdown.sh
- scripts. This would result in an EOFException when running
- cobertura-report.
- * Added support for classes compiled with AspectJ.
- * Cobertura now produces valid XHTML 1.0 reports.
-
-version 1.6 (2005-08-22)
- * Can now use multiple filesets in the cobertura-instrument
- task (Thanks to Grzegorz Lukasik).
- * Can now use multiple filesets in the cobertura-report task
- (Thanks to Jeremy Thomerson, Grzegorz Lukasik and James Seigel).
- * No longer using the Java version of GNU GetOpt
- * Fixed a bug where the total number of classes displayed in
- the HTML report included anonymous classes when it should
- not have.
-
-version 1.5 (2005-08-05)
- * Shortened the header shown when running Cobertura (Thanks
- to Jarkko Viinamäki).
- * Don't save the data file twice after instrumenting.
- * Print a warning when running cobertura-report with a
- data file that does not contain information from the
- instrument step.
- * When instrumenting, you can now specify a zip, jar, war,
- ear or sar file and Cobertura will instrument any classes
- inside of the archive. You must explicity give the name
- of the archive when instrumenting--giving the name of the
- directory containing the archive will not work (Thanks to
- Grzegorz Lukasik).
- * Fixed a bug where the class list in the HTML reports did
- not show multiple classes with the same name, but in
- different packages.
- * Add a timestamp and version number to all HTML reports.
- * Add a timestamp and version number to all XML reports.
- * Add the combined line-rate and branch-rate for all
- packages to all XML reports.
- * Fixed the merge task (Thanks to Mark Sinke).
- * The check task now supports checking against a project's
- total branch and line coverage rates (Thanks to Nathan
- Wilson).
- * The check ant task now allows you to fail the ant build,
- if desired (Thanks to Nathan Wilson).
- * The check task can set an ant property to "true" on
- failure (Thanks to Alex Ruiz).
- * Changed some of the parameters for the check task. See
- the online documentation for usage information.
- * The command line Windows batch scripts work better.
-
-version 1.4 (2005-05-30)
- * Fixed a bug that sometimes resulted in a
- StringIndexOutOfBoundsException when running cobertura-report
- (Thanks to Grzegorz Lukasik).
- * Fixed a bug where classes without coverage data ("N/A") were
- not always sorted correctly in the HTML report (Thanks to
- Olivier Parent).
- * Fixed a bug where the code complexity column would not always
- sort correctly in locales that use a comma to split the decimal
- part of the number (Thanks to Olivier Parent).
- * Show "N/A" in the branch column of the HTML report for classes
- and packages that do not have any branches.
-
-version 1.3 (2005-05-20)
- * Increased speed of HTML reports by filtering the files read
- in to determine cyclomatic complexity numbers on.
- * In the lower left pane of the HTML reports, classes are now
- sorted only by their class name (instead of by their package
- name plus class name).
- * Changed the format of the XML reports to something that
- is hopefully easier to use and more natural. This
- unfortunately breaks backward compatability.
- * We're using a DTD for the XML reports now. See
- http://cobertura.sourceforge.net/xml/coverage-01.dtd
- * Added the ability to specify the location of the coverage
- data files from the ant tasks and the command line.
- * More user-friendly error checking and reporting.
-
-version 1.2 (2005-03-16)
- * Fix a bug that caused the XML reports to be invalid XML
- (they were missing the </package> tag).
- * Use Java 1.4 pattern matching and remove Jakarta ORO.
-
-version 1.1 (2005-03-08)
- * Fix a bug in the syntax highlighting code of the HTML report
- generation. Previously, the highlighting for single quotes
- containing "\\" would not end correctly.
- * Check the third party jars into CVS using the correct CVS
- substition flag (binary, not ASCII).
- * Temporary files created by the instrument ant task and merge
- ant task are now deleted after the ant task finishes.
- * Switch the instrumentation classes to use ASM instead of
- Apache BCEL. There are three benefits to this:
- 1. BCEL was throwing exceptions with some source code compiled
- with JDK 1.5--ASM works fine.
- 2. ASM is licensed under the revised BSD license, which
- is compatable with the GPL, which allows us to remove
- the questionable exception for BCEL.
- 3. Instrumentation is about 5 times faster with ASM than BCEL.
- * Modify the HTML reports so that classes without line number
- information will appear as "Not Applicable." This includes
- skeleton classes, stub classes, interfaces, or anything not
- compiled with debug=true.
- * Fix bug #1151777 with a patch from Jeremy Thomerson.
- Previously we were not escaping some characters correctly in the
- generated XML coverage report (specificially < and >).
- * Set the class-path in the cobertura.jar manifest file correctly.
- * Fill feature request #1151779 with a patch from Jeremy Thomerson.
- This changes the structure of the XML report so that <classes> are
- enclosed inside <packages>.
-
-version 1.0 (2005-02-12)
- * Forked jcoverage 1.0.5 (although the version in the source says 1.0.4).
- All original code is copyright 2003 jcoverage ltd. Kurt Guenther
- highlighted a bug in the branch coverage, was was fixed.
- * Applied a patch from Joakim Erdfelt to fix a bug where jcoverage
- would fail to instrument classes if you attempted to instrument a
- very large number of classes (in the hundreds).
- * Rewrote the HTML reporting and included code complexity in the output.
diff --git a/cobertura/README b/cobertura/README
deleted file mode 100644
index f8daf49..0000000
--- a/cobertura/README
+++ /dev/null
@@ -1,31 +0,0 @@
-ABOUT
-
-Cobertura is a free Java code coverage reporting tool. It is
-based on jcoverage 1.0.5. See the Cobertura web page for more
-details. http://cobertura.sourceforge.net/
-
-
-COPYRIGHT
-
-See the included file "COPYRIGHT"
-
-
-LICENSE
-
-Cobertura is free software. Most of it is licensed under the GNU
-GPL, and you can redistribute it and/or modify it under the terms
-of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option)
-any later version. Please review the file COPYING included in this
-distribution for further details.
-
-Parts of Cobertura are licensed under the Apache Software License,
-Version 1.1.
-
-
-WARRANTY
-
-Cobertura is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
diff --git a/cobertura/cobertura-check.bat b/cobertura/cobertura-check.bat
deleted file mode 100644
index 46a3582..0000000
--- a/cobertura/cobertura-check.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-REM
-REM Grab the directory where this script resides, for use later
-REM
-set COBERTURA_HOME=%~dp0
-
-REM
-REM Read all parameters into a single variable using an ugly loop
-REM
-set CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:getArgs
-if ""%1""=="""" goto doneStart
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto getArgs
-:doneStart
-
-java -cp "%COBERTURA_HOME%cobertura.jar;%COBERTURA_HOME%lib\asm-3.0.jar;%COBERTURA_HOME%lib\asm-tree-3.0.jar;%COBERTURA_HOME%lib\log4j-1.2.9.jar;%COBERTURA_HOME%lib\jakarta-oro-2.0.8.jar" net.sourceforge.cobertura.check.Main %CMD_LINE_ARGS%
diff --git a/cobertura/cobertura-check.sh b/cobertura/cobertura-check.sh
deleted file mode 100644
index 31d0aa2..0000000
--- a/cobertura/cobertura-check.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-3.0.jar:`dirname $0`/lib/asm-tree-3.0.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.check.Main $*
diff --git a/cobertura/cobertura-instrument.bat b/cobertura/cobertura-instrument.bat
deleted file mode 100644
index cfcb762..0000000
--- a/cobertura/cobertura-instrument.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-REM
-REM Grab the directory where this script resides, for use later
-REM
-set COBERTURA_HOME=%~dp0
-
-REM
-REM Read all parameters into a single variable using an ugly loop
-REM
-set CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:getArgs
-if ""%1""=="""" goto doneStart
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto getArgs
-:doneStart
-
-java -cp "%COBERTURA_HOME%cobertura.jar;%COBERTURA_HOME%lib\asm-3.0.jar;%COBERTURA_HOME%lib\asm-tree-3.0.jar;%COBERTURA_HOME%lib\log4j-1.2.9.jar;%COBERTURA_HOME%lib\jakarta-oro-2.0.8.jar" net.sourceforge.cobertura.instrument.Main %CMD_LINE_ARGS%
diff --git a/cobertura/cobertura-instrument.sh b/cobertura/cobertura-instrument.sh
deleted file mode 100644
index b877c3c..0000000
--- a/cobertura/cobertura-instrument.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-3.0.jar:`dirname $0`/lib/asm-tree-3.0.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.instrument.Main $*
diff --git a/cobertura/cobertura-merge.bat b/cobertura/cobertura-merge.bat
deleted file mode 100644
index c87f79b..0000000
--- a/cobertura/cobertura-merge.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-REM
-REM Grab the directory where this script resides, for use later
-REM
-set COBERTURA_HOME=%~dp0
-
-REM
-REM Read all parameters into a single variable using an ugly loop
-REM
-set CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:getArgs
-if ""%1""=="""" goto doneStart
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto getArgs
-:doneStart
-
-java -cp "%COBERTURA_HOME%cobertura.jar;%COBERTURA_HOME%lib\asm-3.0.jar;%COBERTURA_HOME%lib\asm-tree-3.0.jar;%COBERTURA_HOME%lib\log4j-1.2.9.jar;%COBERTURA_HOME%lib\jakarta-oro-2.0.8.jar" net.sourceforge.cobertura.merge.Main %CMD_LINE_ARGS%
diff --git a/cobertura/cobertura-merge.sh b/cobertura/cobertura-merge.sh
deleted file mode 100644
index 40040f2..0000000
--- a/cobertura/cobertura-merge.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-3.0.jar:`dirname $0`/lib/asm-tree-3.0.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.merge.Main $*
diff --git a/cobertura/cobertura-report.bat b/cobertura/cobertura-report.bat
deleted file mode 100644
index a0edb68..0000000
--- a/cobertura/cobertura-report.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-REM
-REM Grab the directory where this script resides, for use later
-REM
-set COBERTURA_HOME=%~dp0
-
-REM
-REM Read all parameters into a single variable using an ugly loop
-REM
-set CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:getArgs
-if ""%1""=="""" goto doneStart
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto getArgs
-:doneStart
-
-java -cp "%COBERTURA_HOME%cobertura.jar;%COBERTURA_HOME%lib\asm-3.0.jar;%COBERTURA_HOME%lib\asm-tree-3.0.jar;%COBERTURA_HOME%lib\log4j-1.2.9.jar;%COBERTURA_HOME%lib\jakarta-oro-2.0.8.jar" net.sourceforge.cobertura.reporting.Main %CMD_LINE_ARGS%
diff --git a/cobertura/cobertura-report.sh b/cobertura/cobertura-report.sh
deleted file mode 100644
index 87cd147..0000000
--- a/cobertura/cobertura-report.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-3.0.jar:`dirname $0`/lib/asm-tree-3.0.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.reporting.Main $*
diff --git a/cobertura/cobertura.jar b/cobertura/cobertura.jar
deleted file mode 100644
index 438fe55..0000000
--- a/cobertura/cobertura.jar
+++ /dev/null
Binary files differ
diff --git a/cobertura/coberturaFlush.war b/cobertura/coberturaFlush.war
deleted file mode 100644
index 3deb909..0000000
--- a/cobertura/coberturaFlush.war
+++ /dev/null
Binary files differ
diff --git a/cobertura/examples/basic/README b/cobertura/examples/basic/README
deleted file mode 100644
index 1e8dad0..0000000
--- a/cobertura/examples/basic/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains a simple example of using Cobertura to
-instrument an application and generate coverage reports.
-
-To run the example:
- ant
-
-The application and its tests will be compiled, Cobertura will
-instrument the application, the instrumented application will then be
-tested, and a Cobertura report produced in HTML and XML.
-
-The Cobertura reports can be found in:
- reports/cobertura-html/index.html
- reports/cobertura-xml/coverage.xml
-
diff --git a/cobertura/examples/basic/build.properties b/cobertura/examples/basic/build.properties
deleted file mode 100644
index 2b7d0b7..0000000
--- a/cobertura/examples/basic/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The source code for the examples can be found in this directory
-src.dir=src
-
-# The path to cobertura.jar
-cobertura.dir=../..
-
-# Classes generated by the javac compiler are deposited in this directory
-classes.dir=classes
-
-# Instrumented classes are deposited into this directory
-instrumented.dir=instrumented
-
-# All reports go into this directory
-reports.dir=reports
-
-# Unit test reports from JUnit are deposited into this directory
-reports.xml.dir=${reports.dir}/junit-xml
-reports.html.dir=${reports.dir}/junit-html
-
-# Coverage reports are deposited into these directories
-coverage.xml.dir=${reports.dir}/cobertura-xml
-coverage.summaryxml.dir=${reports.dir}/cobertura-summary-xml
-coverage.html.dir=${reports.dir}/cobertura-html
diff --git a/cobertura/examples/basic/build.xml b/cobertura/examples/basic/build.xml
deleted file mode 100644
index a86ef1e..0000000
--- a/cobertura/examples/basic/build.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="cobertura.examples.basic" default="coverage" basedir=".">
-
- <description>
- Cobertura - http://cobertura.sourceforge.net/
- Copyright (C) 2003 jcoverage ltd.
- Copyright (C) 2005 Mark Doliner <thekingant@users.sourceforge.net>
- Copyright (C) 2006 Dan Godfrey
- Cobertura is licensed under the GNU General Public License
- Cobertura comes with ABSOLUTELY NO WARRANTY
- </description>
-
- <property file="build.properties" />
-
- <path id="cobertura.classpath">
- <fileset dir="${cobertura.dir}">
- <include name="cobertura.jar" />
- <include name="lib/**/*.jar" />
- </fileset>
- </path>
-
- <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
-
- <target name="init">
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${instrumented.dir}" />
- <mkdir dir="${reports.xml.dir}" />
- <mkdir dir="${reports.html.dir}" />
- <mkdir dir="${coverage.xml.dir}" />
- <mkdir dir="${coverage.summaryxml.dir}" />
- <mkdir dir="${coverage.html.dir}" />
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="yes">
- <classpath refid="cobertura.classpath" />
- </javac>
- </target>
-
- <target name="instrument" depends="init,compile">
- <!--
- Remove the coverage data file and any old instrumentation.
- -->
- <delete file="cobertura.ser"/>
- <delete dir="${instrumented.dir}" />
-
- <!--
- Instrument the application classes, writing the
- instrumented classes into ${build.instrumented.dir}.
- -->
- <cobertura-instrument todir="${instrumented.dir}">
- <!--
- The following line causes instrument to ignore any
- source line containing a reference to log4j, for the
- purposes of coverage reporting.
- -->
- <ignore regex="org.apache.log4j.*" />
-
- <fileset dir="${classes.dir}">
- <!--
- Instrument all the application classes, but
- don't instrument the test classes.
- -->
- <include name="**/*.class" />
- <exclude name="**/*Test.class" />
- </fileset>
- </cobertura-instrument>
- </target>
-
- <target name="test" depends="init,compile">
- <junit fork="yes" dir="${basedir}" failureProperty="test.failed">
- <!--
- Note the classpath order: instrumented classes are before the
- original (uninstrumented) classes. This is important.
- -->
- <classpath location="${instrumented.dir}" />
- <classpath location="${classes.dir}" />
-
- <!--
- The instrumented classes reference classes used by the
- Cobertura runtime, so Cobertura and its dependencies
- must be on your classpath.
- -->
- <classpath refid="cobertura.classpath" />
-
- <formatter type="xml" />
- <test name="${testcase}" todir="${reports.xml.dir}" if="testcase" />
- <batchtest todir="${reports.xml.dir}" unless="testcase">
- <fileset dir="${src.dir}">
- <include name="**/*Test.java" />
- </fileset>
- </batchtest>
- </junit>
-
- <junitreport todir="${reports.xml.dir}">
- <fileset dir="${reports.xml.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${reports.html.dir}" />
- </junitreport>
- </target>
-
- <target name="coverage-check">
- <cobertura-check branchrate="34" totallinerate="100" />
- </target>
-
- <target name="coverage-report">
- <!--
- Generate an XML file containing the coverage data using
- the "srcdir" attribute.
- -->
- <cobertura-report srcdir="${src.dir}" destdir="${coverage.xml.dir}" format="xml" />
- </target>
-
- <target name="summary-coverage-report">
- <!--
- Generate an summary XML file containing the coverage data using
- the "srcdir" attribute.
- -->
- <cobertura-report srcdir="${src.dir}" destdir="${coverage.summaryxml.dir}" format="summaryXml" />
- </target>
-
- <target name="alternate-coverage-report">
- <!--
- Generate a series of HTML files containing the coverage
- data in a user-readable form using nested source filesets.
- -->
- <cobertura-report destdir="${coverage.html.dir}">
- <fileset dir="${src.dir}">
- <include name="**/*.java"/>
- </fileset>
- </cobertura-report>
- </target>
-
- <target name="clean" description="Remove all files created by the build/test process.">
- <delete dir="${classes.dir}" />
- <delete dir="${instrumented.dir}" />
- <delete dir="${reports.dir}" />
- <delete file="cobertura.log" />
- <delete file="cobertura.ser" />
- </target>
-
- <target name="coverage" depends="compile,instrument,test,coverage-report,summary-coverage-report,alternate-coverage-report" description="Compile, instrument ourself, run the tests and generate JUnit and coverage reports."/>
-
-</project>
diff --git a/cobertura/examples/basic/build_with_specific_data_file.xml b/cobertura/examples/basic/build_with_specific_data_file.xml
deleted file mode 100644
index b2c8036..0000000
--- a/cobertura/examples/basic/build_with_specific_data_file.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- This build file does the same thing as the normal build.xml for
- this example, except that we specify a location for the coverage
- data file.
--->
-
-<project name="cobertura.examples.basic" default="coverage" basedir=".">
-
- <description>
- Cobertura - http://cobertura.sourceforge.net/
- Copyright (C) 2003 jcoverage ltd.
- Copyright (C) 2005 Mark Doliner <thekingant@users.sourceforge.net>
- Cobertura is licensed under the GNU General Public License
- Cobertura comes with ABSOLUTELY NO WARRANTY
- </description>
-
- <property file="build.properties" />
-
- <path id="cobertura_classpath">
- <fileset dir="${cobertura.dir}">
- <include name="cobertura.jar" />
- <include name="lib/**/*.jar" />
- </fileset>
- </path>
-
- <taskdef classpathref="cobertura_classpath" resource="tasks.properties"/>
-
- <target name="init">
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${instrumented.dir}" />
- <mkdir dir="${reports.xml.dir}" />
- <mkdir dir="${reports.html.dir}" />
- <mkdir dir="${coverage.xml.dir}" />
- <mkdir dir="${coverage.html.dir}" />
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="yes">
- <classpath refid="cobertura_classpath" />
- </javac>
- </target>
-
- <target name="instrument" depends="init,compile">
- <!--
- Remove the coverage data file and any old instrumentation.
- -->
- <delete file="${reports.dir}/basic_coverage.ser"/>
- <delete dir="${instrumented.dir}" />
-
- <!--
- Instrument the application classes, writing the
- instrumented classes into ${build.instrumented.dir}.
- -->
- <cobertura-instrument datafile="${reports.dir}/basic_coverage.ser" todir="${instrumented.dir}">
- <!--
- The following line causes instrument to ignore any
- source line containing a reference to log4j, for the
- purposes of coverage reporting.
- -->
- <ignore regex="org.apache.log4j.*" />
-
- <fileset dir="${classes.dir}">
- <!--
- Instrument all the application classes, but
- don't instrument the test classes.
- -->
- <include name="**/*.class" />
- <exclude name="**/*Test.class" />
- </fileset>
- </cobertura-instrument>
- </target>
-
- <target name="test" depends="init,compile">
- <junit fork="yes" dir="${basedir}" failureProperty="test.failed">
- <!--
- Specify the name of the coverage data file to use.
- -->
- <sysproperty key="net.sourceforge.cobertura.datafile" file="${reports.dir}/basic_coverage.ser" />
-
- <!--
- Note the classpath order: instrumented classes are before the
- original (uninstrumented) classes. This is important.
- -->
- <classpath location="${instrumented.dir}" />
- <classpath location="${classes.dir}" />
-
- <!--
- The instrumented classes reference classes used by the
- Cobertura runtime, so Cobertura and its dependencies
- must be on your classpath.
- -->
- <classpath refid="cobertura_classpath" />
-
- <formatter type="xml" />
- <test name="${testcase}" todir="${reports.xml.dir}" if="testcase" />
- <batchtest todir="${reports.xml.dir}" unless="testcase">
- <fileset dir="${src.dir}">
- <include name="**/*Test.java" />
- </fileset>
- </batchtest>
- </junit>
-
- <junitreport todir="${reports.xml.dir}">
- <fileset dir="${reports.xml.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${reports.html.dir}" />
- </junitreport>
- </target>
-
- <target name="coverage-report">
- <cobertura-report datafile="${reports.dir}/basic_coverage.ser" srcdir="${src.dir}" destdir="${coverage.xml.dir}" format="xml" />
- <cobertura-report datafile="${reports.dir}/basic_coverage.ser" srcdir="${src.dir}" destdir="${coverage.html.dir}" />
- </target>
-
- <target name="clean" description="Remove all files created by the build/test process.">
- <delete dir="${classes.dir}" />
- <delete dir="${instrumented.dir}" />
- <delete dir="${reports.dir}" />
- <delete file="cobertura.log" />
- </target>
-
- <target name="coverage" depends="compile,instrument,test,coverage-report" description="Compile, instrument ourself, run the tests and generate JUnit and coverage reports."/>
-
-</project>
diff --git a/cobertura/examples/basic/src/com/example/simple/Simple.java b/cobertura/examples/basic/src/com/example/simple/Simple.java
deleted file mode 100644
index 4a0c141..0000000
--- a/cobertura/examples/basic/src/com/example/simple/Simple.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Cobertura - http://cobertura.sourceforge.net/
- *
- * Copyright (C) 2003 jcoverage ltd.
- * Copyright (C) 2005 Mark Doliner <thekingant@users.sourceforge.net>
- *
- * Cobertura is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * Cobertura is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cobertura; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-package com.example.simple;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.log4j.Logger;
-
-public class Simple
-{
-
- private static final Logger logger = Logger.getLogger(Simple.class);
-
- public int square(int x)
- {
- if (logger.isDebugEnabled())
- {
- logger.debug("x: " + x);
- }
-
- int result = x * x;
-
- if (logger.isDebugEnabled())
- {
- logger.debug("result: " + result);
- }
-
- return result;
- }
-
- public int f(int x)
- {
- if (logger.isDebugEnabled())
- {
- logger.debug("x: " + x);
- }
-
- if (x < 0)
- {
- if (logger.isDebugEnabled())
- {
- logger.debug("negative x");
- }
-
- return square(x);
- }
- else if ((x >= 0) && (x <= 5))
- {
- if (logger.isDebugEnabled())
- {
- logger.debug("0<=x<=5");
- }
-
- return x + 3;
- }
- else
- {
- return 2 * x;
- }
- }
-
- public int sum(Collection c)
- {
- int result = 0;
-
- for (Iterator i = c.iterator(); i.hasNext();)
- {
- int value = ((Number)i.next()).intValue();
-
- if (logger.isDebugEnabled())
- {
- logger.debug("value: " + value);
- }
-
- result += value;
- }
-
- if (logger.isDebugEnabled())
- {
- logger.debug("result: " + result);
- }
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/cobertura/examples/basic/src/com/example/simple/SimpleTest.java b/cobertura/examples/basic/src/com/example/simple/SimpleTest.java
deleted file mode 100644
index a49c26e..0000000
--- a/cobertura/examples/basic/src/com/example/simple/SimpleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Cobertura - http://cobertura.sourceforge.net/
- *
- * Copyright (C) 2003 jcoverage ltd.
- * Copyright (C) 2005 Mark Doliner <thekingant@users.sourceforge.net>
- *
- * Cobertura is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * Cobertura is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cobertura; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-package com.example.simple;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-import junit.framework.TestCase;
-
-public class SimpleTest extends TestCase
-{
-
- final Simple simple = new Simple();
-
- public SimpleTest(String nm)
- {
- super(nm);
- }
-
- public void testSquare()
- {
- assertEquals(1, simple.square(1));
- assertEquals(1, simple.square(-1));
- }
-
- public void testF()
- {
- assertEquals(1, simple.f(-1));
- assertEquals(12, simple.f(6));
- }
-
- public void testSum()
- {
- Collection c = new LinkedList();
- c.add(new Integer(3));
- c.add(new Integer(5));
- c.add(new Integer(8));
- assertEquals(16, simple.sum(c));
- }
-}
\ No newline at end of file
diff --git a/cobertura/lib/asm-3.0.jar b/cobertura/lib/asm-3.0.jar
deleted file mode 100644
index 112f5bd..0000000
--- a/cobertura/lib/asm-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/cobertura/lib/asm-tree-3.0.jar b/cobertura/lib/asm-tree-3.0.jar
deleted file mode 100644
index 2a4b208..0000000
--- a/cobertura/lib/asm-tree-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/cobertura/lib/jakarta-oro-2.0.8.jar b/cobertura/lib/jakarta-oro-2.0.8.jar
deleted file mode 100644
index 23488d2..0000000
--- a/cobertura/lib/jakarta-oro-2.0.8.jar
+++ /dev/null
Binary files differ
diff --git a/cobertura/lib/jakarta-oro-license.txt b/cobertura/lib/jakarta-oro-license.txt
deleted file mode 100644
index 100f86b..0000000
--- a/cobertura/lib/jakarta-oro-license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their
- * name, without prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
diff --git a/cobertura/lib/log4j-1.2.9.jar b/cobertura/lib/log4j-1.2.9.jar
deleted file mode 100644
index a6568b0..0000000
--- a/cobertura/lib/log4j-1.2.9.jar
+++ /dev/null
Binary files differ
diff --git a/cobertura/lib/log4j-license.txt b/cobertura/lib/log4j-license.txt
deleted file mode 100644
index 030564f..0000000
--- a/cobertura/lib/log4j-license.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "log4j" and "Apache Software Foundation" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation. For more information on the
- * Apache Software Foundation, please see <http://www.apache.org/>.
- *
- */
diff --git a/datafu-hourglass/.gitignore b/datafu-hourglass/.gitignore
index 685bfd2..7544cd3 100644
--- a/datafu-hourglass/.gitignore
+++ b/datafu-hourglass/.gitignore
@@ -1 +1,2 @@
test-logs/
+/bin
diff --git a/datafu-hourglass/src/main/java/datafu/hourglass/fs/PathUtils.java b/datafu-hourglass/src/main/java/datafu/hourglass/fs/PathUtils.java
index 25e66ea..f9580e7 100644
--- a/datafu-hourglass/src/main/java/datafu/hourglass/fs/PathUtils.java
+++ b/datafu-hourglass/src/main/java/datafu/hourglass/fs/PathUtils.java
@@ -314,8 +314,8 @@
* Gets the root path for a path in the "yyyy/MM/dd" format. This is part of the path preceding the
* "yyyy/MM/dd" portion.
*
- * @param path
- * @return
+ * @param path in "yyyy/MM/dd" format
+ * @return root of input path
*/
public static Path getNestedPathRoot(Path path)
{
diff --git a/datafu-pig/.gitignore b/datafu-pig/.gitignore
index 634b0a2..fe4962d 100644
--- a/datafu-pig/.gitignore
+++ b/datafu-pig/.gitignore
@@ -1,2 +1,3 @@
/bin
+/test-output
/data
diff --git a/eclipselibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar b/eclipselibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar
deleted file mode 100644
index b28c032..0000000
--- a/eclipselibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar
+++ /dev/null
Binary files differ
diff --git a/eclipselibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar b/eclipselibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar
deleted file mode 100644
index aa7695a..0000000
--- a/eclipselibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar
+++ /dev/null
Binary files differ
diff --git a/staticlibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar b/staticlibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar
deleted file mode 100644
index b28c032..0000000
--- a/staticlibs/org.eclipse.jdt.compiler.apt_1.0.500.v20120522-1651.jar
+++ /dev/null
Binary files differ
diff --git a/staticlibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar b/staticlibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar
deleted file mode 100644
index aa7695a..0000000
--- a/staticlibs/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar
+++ /dev/null
Binary files differ
diff --git a/tools/autojar.jar b/tools/autojar.jar
deleted file mode 100644
index af6e61a..0000000
--- a/tools/autojar.jar
+++ /dev/null
Binary files differ
diff --git a/tools/jarjar-1.1.jar b/tools/jarjar-1.1.jar
deleted file mode 100644
index 352c00a..0000000
--- a/tools/jarjar-1.1.jar
+++ /dev/null
Binary files differ
