Author: bodewig
Date: Mon Nov 3 08:45:39 2008
New Revision: 710102
URL: http://svn.apache.org/viewvc?rev=710102&view=rev
Log:
whitespace
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Ear.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Ear.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Ear.java?rev=710102&r1=710101&r2=710102&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Ear.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Ear.java Mon Nov 3
08:45:39 2008
@@ -131,10 +131,11 @@
|| !FILE_UTILS.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
logOnFirstPass("Warning: selected " + archiveType
- + " files include a " + XML_DESCRIPTOR_PATH + " which will"
- + " be ignored (please use appxml attribute to "
- + archiveType + " task)",
- Project.MSG_WARN);
+ + " files include a " + XML_DESCRIPTOR_PATH
+ + " which will"
+ + " be ignored (please use appxml attribute to "
+ + archiveType + " task)",
+ Project.MSG_WARN);
} else {
super.zipFile(file, zOut, vPath, mode);
descriptorAdded = true;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?rev=710102&r1=710101&r2=710102&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Mon Nov 3
08:45:39 2008
@@ -637,8 +637,9 @@
}
} else if (INDEX_NAME.equalsIgnoreCase(vPath) && index) {
logOnFirstPass("Warning: selected " + archiveType
- + " files include a " + INDEX_NAME + " which will"
- + " be replaced by a newly generated one.", Project.MSG_WARN);
+ + " files include a " + INDEX_NAME + " which will"
+ + " be replaced by a newly generated one.",
+ Project.MSG_WARN);
} else {
if (index && vPath.indexOf("/") == -1) {
rootEntries.addElement(vPath);
@@ -672,7 +673,7 @@
&& !filesetManifestConfig.getValue().equals("skip")) {
// we add this to our group of fileset manifests
logOnFirstPass("Found manifest to merge in file " + file,
- Project.MSG_VERBOSE);
+ Project.MSG_VERBOSE);
try {
Manifest newManifest = null;
@@ -754,14 +755,14 @@
try {
originalManifest = getManifestFromJar(zipFile);
if (originalManifest == null) {
- logOnFirstPass("Updating jar since the current jar has no
manifest",
- Project.MSG_VERBOSE);
+ logOnFirstPass("Updating jar since the current jar has"
+ + " no manifest", Project.MSG_VERBOSE);
needsUpdate = true;
} else {
Manifest mf = createManifest();
if (!mf.equals(originalManifest)) {
- logOnFirstPass("Updating jar since jar manifest has
changed",
- Project.MSG_VERBOSE);
+ logOnFirstPass("Updating jar since jar manifest has"
+ + " changed", Project.MSG_VERBOSE);
needsUpdate = true;
}
}
@@ -806,7 +807,7 @@
+ zipFile + " because no files were included.",
Project.MSG_WARN);
}
- return true;
+ return true;
} else if (emptyBehavior.equals("fail")) {
throw new BuildException("Cannot create " + archiveType
+ " archive " + zipFile
@@ -817,8 +818,8 @@
ZipOutputStream zOut = null;
try {
if (!skipWriting) {
- log("Building MANIFEST-only jar: "
- + getDestFile().getAbsolutePath());
+ log("Building MANIFEST-only jar: "
+ + getDestFile().getAbsolutePath());
}
zOut = new ZipOutputStream(new FileOutputStream(getDestFile()));
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java?rev=710102&r1=710101&r2=710102&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java Mon Nov 3
08:45:39 2008
@@ -189,12 +189,13 @@
//check to see if we warn or not
if (!FILE_UTILS.fileNameEquals(addedWebXmlFile, file)) {
logOnFirstPass("Warning: selected " + archiveType
- + " files include a second " + XML_DESCRIPTOR_PATH
- + " which will be ignored.\n"
- + "The duplicate entry is at " + file + '\n'
- + "The file that will be used is "
- + addedWebXmlFile,
- Project.MSG_WARN);
+ + " files include a second "
+ + XML_DESCRIPTOR_PATH
+ + " which will be ignored.\n"
+ + "The duplicate entry is at " + file + '\n'
+ + "The file that will be used is "
+ + addedWebXmlFile,
+ Project.MSG_WARN);
}
} else {
//no added file, yet
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?rev=710102&r1=710101&r2=710102&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Mon Nov 3
08:45:39 2008
@@ -704,7 +704,7 @@
if (doUpdate && !zipFile.exists()) {
doUpdate = false;
logOnFirstPass("ignoring update attribute as " + archiveType
- + " doesn't exist.", Project.MSG_DEBUG);
+ + " doesn't exist.", Project.MSG_DEBUG);
}
}
@@ -721,7 +721,7 @@
for (int j = 0; j < files.length; j++) {
logOnFirstPass("Adding file " + files[j] + " to fileset",
- Project.MSG_VERBOSE);
+ Project.MSG_VERBOSE);
ZipFileSet zf = new ZipFileSet();
zf.setProject(getProject());
zf.setSrc(new File(basedir, files[j]));
@@ -1153,12 +1153,13 @@
if (emptyBehavior.equals("skip")) {
if (doUpdate) {
logOnFirstPass(archiveType + " archive " + zipFile
- + " not updated because no new files were included.",
- Project.MSG_VERBOSE);
+ + " not updated because no new files were"
+ + " included.", Project.MSG_VERBOSE);
} else {
- logOnFirstPass("Warning: skipping " + archiveType + "
archive "
- + zipFile + " because no files were included.",
- Project.MSG_WARN);
+ logOnFirstPass("Warning: skipping " + archiveType
+ + " archive " + zipFile
+ + " because no files were included.",
+ Project.MSG_WARN);
}
} else if (emptyBehavior.equals("fail")) {
throw new BuildException("Cannot create " + archiveType
@@ -1457,8 +1458,9 @@
int mode, ZipExtraField[] extra)
throws IOException {
if (doFilesonly) {
- logOnFirstPass("skipping directory " + vPath + " for file-only
archive",
- Project.MSG_VERBOSE);
+ logOnFirstPass("skipping directory " + vPath
+ + " for file-only archive",
+ Project.MSG_VERBOSE);
return;
}
if (addedDirs.get(vPath) != null) {
@@ -1515,7 +1517,8 @@
if (entries.contains(vPath)) {
if (duplicate.equals("preserve")) {
- logOnFirstPass(vPath + " already added, skipping",
Project.MSG_INFO);
+ logOnFirstPass(vPath + " already added, skipping",
+ Project.MSG_INFO);
return;
} else if (duplicate.equals("fail")) {
throw new BuildException("Duplicate file " + vPath
@@ -1524,7 +1527,7 @@
} else {
// duplicate equal to add, so we continue
logOnFirstPass("duplicate file " + vPath
- + " found, adding.", Project.MSG_VERBOSE);
+ + " found, adding.", Project.MSG_VERBOSE);
}
} else {
logOnFirstPass("adding entry " + vPath, Project.MSG_VERBOSE);
@@ -1745,7 +1748,8 @@
v.addElement(orig[i]);
} else {
logOnFirstPass("Ignoring directory " + orig[i].getName()
- + " as only files will be added.", Project.MSG_VERBOSE);
+ + " as only files will be added.",
+ Project.MSG_VERBOSE);
}
}
