Browse Source

whitespace only

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1190244 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 13 years ago
parent
commit
6923618f30
2 changed files with 50 additions and 50 deletions
  1. +40
    -40
      WHATSNEW
  2. +10
    -10
      src/main/org/apache/tools/ant/taskdefs/Javac.java

+ 40
- 40
WHATSNEW View File

@@ -25,9 +25,9 @@ Fixed bugs:

* MailLogger ignore the Maillogger.starttls.enable property.
Bugzilla Report 50668.
* Delete task example does not work
Bugzilla Report 50816.
Bugzilla Report 50816.

* <splash>'s proxy handling has been delegated to <setproxy>
internally so the two tasks are consistent. <splash>'s way of not
@@ -55,10 +55,10 @@ Fixed bugs:

* Exec task may mix the stderr and stdout output while logging it
Bugzilla Report 50507.
* Missing space between "finished" and timestamp in task/target
finish message from ProfileLogger.
Bugzilla Report 51109.
Bugzilla Report 51109.

* Redirecting the output of a java, exec or apply task could print in the
error output stream some "Pipe broken" errors.
@@ -120,7 +120,7 @@ Other changes:
* <junit filtertrace="true"/> will no longer filter out the very
first line of the stacktrace containing the original exception
message even if it matches one of the filter expressions.
* Upgraded to Apache AntUnit 1.2

* Provide read access to Mkdir.dir. Bugzilla Report 51684.
@@ -175,7 +175,7 @@ Changes that could break older environments:
* The list elements returned by ProjectHelper#getExtensionStack are
now String arrays of length 3 rather than 2 in order to support the
onMissingExtensionPoint attribute.
Bugzilla Report 49473.
Bugzilla Report 49473.

* When using <property file="..." prefix="..."/> properties defined
inside the same file will only get used in expansions if the ${}
@@ -213,7 +213,7 @@ Fixed bugs:
For large files this is not feasible.
We now explicitly request to copy at most 16 MiB per request.
Bugzilla Report 49326.
* DemuxInputStream.read() should return unsigned values
Bugzilla Report 49279.

@@ -371,7 +371,7 @@ Other changes:
defined or silently work as plain targets if it hasn't. This is
useful for targets that get included/imported in different
scenarios where a given extension-point may or may not exist.
Bugzilla Report 49473.
Bugzilla Report 49473.

* Ant now logs a warning message if it fails to change the file
modification time in for example when using <touch> or preserving
@@ -443,8 +443,8 @@ Changes that could break older environments:

* Ant no longer ships with Apache Xerces-J or the XML APIs but relies
on the Java runtime to provide a parser and matching API versions.
* The stylebook ant task and the ant-stylebook.jar are removed.
* The stylebook ant task and the ant-stylebook.jar are removed.

Fixed bugs:
-----------
@@ -466,38 +466,38 @@ Fixed bugs:

* VectorSet#remove(Object) would fail if the size of the vector
equaled its capacity.
* Regression : ant -diagnostics was returning with exit code 1
Bugzilla Report 48782
* Fix for exec task sometimes inserts extraneous newlines
Bugzilla Report 48746
* SymlinkTest#testSymbolicLinkUtilsMethods failing on MacOS
Bugzilla Report 48785.

* If <concat>'s first resourcecollection child is a <resources>,
any subsequently added child resourcecollection joins the first.
Bugzilla Report 48816.
Bugzilla Report 48816.
* <get> with an invalid URL could trigger an NPE in some JVMs.
Bugzilla Report 48833
* Broken Pipe issue under Ubuntu Linux
Bugzilla Report 48789
* Properties wrongly read from file or not update during read
Bugzilla Report 48768
Bugzilla Report 48768

* AntClassLoader in Ant 1.8.0 has been considerably slower than in
1.7.1
Bugzilla Report 48853
* ANT_CMD_LINE_ARGS are rippling through lower level Ant usage
Bugzilla Report 48876
* email : IO error sending mail with plain mimetype
Bugzilla Report 48932
Bugzilla Report 48932

* the complete-ant-cmd.pl script failed to create a proper cache of
target if "ant -p" failed.
@@ -541,7 +541,7 @@ Other changes:

* The <zip> family of tasks has been sped up for bigger archives.
Bugzilla Report 48755.
* Add removeKeepExtension option to NetRexxC task.
Bugzilla Report 48788.

@@ -556,11 +556,11 @@ Other changes:
of Object args as strings; previously only API-level usage of the
equals condition allowed Object args, but Ant 1.8.x+ property
evaluation may yield values of any type.
* BuildFileTest.assertPropertyUnset() fails with a slightly more
meaningful error message
Bugzilla Report 48834
* <junit> will now throw an exception if a test name is empty. This
used to manifest itself in unrelated errors like
Bugzilla Report 43586.
@@ -608,9 +608,9 @@ Fixed bugs:
the jarjar links task and protentially other third-party subclasses
as well.
Bugzilla Report 48541.
* <scp> task didn't report build file location when a remote operation failed
Bugzilla Report 48578.
Bugzilla Report 48578.

* <propertyfile> would add the same comment and a date line each time
it updated an existing property file.
@@ -676,7 +676,7 @@ Changes that could break older environments:
The TempFile task still does not create the file by default, can be
instructed to do so however using a new parameter.
Bugzilla Report 33969.
* A lock in Project ensured that a BuildListener's messageLogged
method was only ever executed by a single thread at a time, while
all other methods could be invoked by multiple threads
@@ -845,10 +845,10 @@ Fixed bugs:

* <symlink> task couldn't overwrite files that were in the way of the symlink.
Bugzilla Report 43426.
* <symlink> task failonerror="false" does not stop build from failing
when 'ln' command returns non-zero.
Bugzilla Report 43624
Bugzilla Report 43624

* <touch> task couldn't differentiate between "no resources
specified" and "no resources matched."
@@ -861,7 +861,7 @@ Fixed bugs:
* <globmapper> had an indexoutofbounds when the prefix and postfix
overlapped.
Bugzilla Report 44731.
* <typedef> and <taskdef> failed to accept file names with #
characters in them.
Bugzilla Report 45190
@@ -914,7 +914,7 @@ Fixed bugs:
* <filterset> sometimes incorrectly flagged infinite recursions of
filter tokens
Bugzilla Report 44226.
* failures were treated as errors in forked JUnit tests when JUnit 4
was used.
Bugzilla Report 43892.
@@ -1176,15 +1176,15 @@ Other changes:
to provide filenames, rather than require that all resources
are instances or subclasses of FileResource.
Bugzilla Report 43348
* There is now a URLProvider interface for resources that act as a
source of URLs. This should be used by tasks that require resources
to provide URLs, rather than require that all resources are
instances or subclasses of URLResource.
* Fixcrlf now gives better error messages on bad directory attributes.
Bugzilla Report 43936
* a new property ant.project.default-target holds the value of the
current <project>'s default attribute.

@@ -1593,7 +1593,7 @@ Other changes:
* It is now possible to suppress the "FAILED" lines sent to Ant's
logging system via <junit>'s new logFailedTests attribute.
Bugzilla Report 35073.
* <propertyfile> now can delete entries.

* The <resources> resource collection can now optionally cache its
@@ -1641,7 +1641,7 @@ Other changes:
be loaded from the specified classpath rather than the system
classloader.
Bugzilla Report 41369.
* <property location="from" basedir="to" relative="true"/> can now
calculate relative paths.

@@ -1656,7 +1656,7 @@ Other changes:
* <import> can now import non-File resources if they provide an URL
- as the <url> and <javaresource> resources do.
Bugzilla Report 29251
* <import> can now import multiple resources specified as resource
collections.
Bugzilla Report 22269.
@@ -1735,7 +1735,7 @@ Fixed bugs:

* SPI support in jar was broken.
Bugzilla report 41201.
* jsch-0.1.30 causes SCP task to hang
Bugzilla report 41090.

@@ -1795,7 +1795,7 @@ Fixed bugs:
Bugzilla 42946

* <junit> supports collecting and rerunning failed test cases
(textXXX methods). Bugzilla 42984.
(textXXX methods). Bugzilla 42984.

* War task failed with "No WEB-INF/web.xml file was added" when called
a second time. Bugzilla 43121.
@@ -1876,7 +1876,7 @@ Other changes:
<comment> nested element as nested text instead of using the 'value'
attribute.

* A new logger, BigProjectLogger, lists the project name with every target
* A new logger, BigProjectLogger, lists the project name with every target

* Default text added to macrodef. Bugzilla report 42301.



+ 10
- 10
src/main/org/apache/tools/ant/taskdefs/Javac.java View File

@@ -949,7 +949,7 @@ public class Javac extends MatchingTask {
protected void scanDir(File srcDir, File destDir, String[] files) {
GlobPatternMapper m = new GlobPatternMapper();
String[] extensions = findSupportedFileExtensions();
for (int i = 0; i < extensions.length; i++) {
m.setFrom(extensions[i]);
m.setTo("*.class");
@@ -1147,15 +1147,15 @@ public class Javac extends MatchingTask {
if (adapter.execute()) {
// Success
if (createMissingPackageInfoClass) {
try {
generateMissingPackageInfoClasses(destDir != null
? destDir
: getProject()
.resolveFile(src.list()[0]));
} catch (IOException x) {
// Should this be made a nonfatal warning?
throw new BuildException(x, getLocation());
}
try {
generateMissingPackageInfoClasses(destDir != null
? destDir
: getProject()
.resolveFile(src.list()[0]));
} catch (IOException x) {
// Should this be made a nonfatal warning?
throw new BuildException(x, getLocation());
}
}
} else {
// Fail path


Loading…
Cancel
Save