Browse Source

I added an XML declaration (<?xml version="1.0"?>) to the XML log file.

Also, I removed some extra spaces in XmlLogger.java.

Submitted by: "Ingmar Stein" <stein@xtramind.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269678 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
ef9d413c7b
1 changed files with 12 additions and 11 deletions
  1. +12
    -11
      src/main/org/apache/tools/ant/XmlLogger.java

+ 12
- 11
src/main/org/apache/tools/ant/XmlLogger.java View File

@@ -130,14 +130,15 @@ public class XmlLogger implements BuildListener {
if (outFilename == null) { if (outFilename == null) {
outFilename = "log.xml"; outFilename = "log.xml";
} }
// specify output in UTF8 otherwise accented characters will blow // specify output in UTF8 otherwise accented characters will blow
// up everything // up everything
Writer out = Writer out =
new OutputStreamWriter(new FileOutputStream(outFilename), new OutputStreamWriter(new FileOutputStream(outFilename),
"UTF8"); "UTF8");
out.write("<?xml version=\"1.0\"?>\n");
out.write("<?xml:stylesheet type=\"text/xsl\" href=\"log.xsl\"?>\n\n"); out.write("<?xml:stylesheet type=\"text/xsl\" href=\"log.xsl\"?>\n\n");
(new DOMElementWriter()).write(buildElement.element, out, 0, "\t");
(new DOMElementWriter()).write(buildElement.element, out, 0, "\t");
out.flush(); out.flush();
out.close(); out.close();
@@ -155,7 +156,7 @@ public class XmlLogger implements BuildListener {
} }
return threadStack; return threadStack;
} }
public void targetStarted(BuildEvent event) { public void targetStarted(BuildEvent event) {
Target target = event.getTarget(); Target target = event.getTarget();
TimedElement targetElement = new TimedElement(); TimedElement targetElement = new TimedElement();
@@ -173,14 +174,14 @@ public class XmlLogger implements BuildListener {
long totalTime = System.currentTimeMillis() - targetElement.startTime; long totalTime = System.currentTimeMillis() - targetElement.startTime;
targetElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime)); targetElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime));


TimedElement parentElement = null;
TimedElement parentElement = null;
Stack threadStack = getStack(); Stack threadStack = getStack();
if (!threadStack.empty()) { if (!threadStack.empty()) {
TimedElement poppedStack = (TimedElement)threadStack.pop(); TimedElement poppedStack = (TimedElement)threadStack.pop();
if (poppedStack != targetElement) { if (poppedStack != targetElement) {
throw new RuntimeException("Mismatch - popped element = " + poppedStack.element + throw new RuntimeException("Mismatch - popped element = " + poppedStack.element +
" finished task element = " + targetElement.element); " finished task element = " + targetElement.element);
}
}
if (!threadStack.empty()) { if (!threadStack.empty()) {
parentElement = (TimedElement)threadStack.peek(); parentElement = (TimedElement)threadStack.peek();
} }
@@ -188,7 +189,7 @@ public class XmlLogger implements BuildListener {
if (parentElement == null) { if (parentElement == null) {
buildElement.element.appendChild(targetElement.element); buildElement.element.appendChild(targetElement.element);
} }
else {
else {
parentElement.element.appendChild(targetElement.element); parentElement.element.appendChild(targetElement.element);
} }
} }
@@ -231,7 +232,7 @@ public class XmlLogger implements BuildListener {
if (poppedStack != taskElement) { if (poppedStack != taskElement) {
throw new RuntimeException("Mismatch - popped element = " + poppedStack.element + throw new RuntimeException("Mismatch - popped element = " + poppedStack.element +
" finished task element = " + taskElement.element); " finished task element = " + taskElement.element);
}
}
} }
} }
} }
@@ -239,7 +240,7 @@ public class XmlLogger implements BuildListener {
public void messageLogged(BuildEvent event) { public void messageLogged(BuildEvent event) {
Element messageElement = doc.createElement(MESSAGE_TAG); Element messageElement = doc.createElement(MESSAGE_TAG);


String name = "debug";
String name;
switch(event.getPriority()) { switch(event.getPriority()) {
case Project.MSG_ERR: name = "error"; break; case Project.MSG_ERR: name = "error"; break;
case Project.MSG_WARN: name = "warn"; break; case Project.MSG_WARN: name = "warn"; break;
@@ -252,7 +253,7 @@ public class XmlLogger implements BuildListener {
messageElement.appendChild(messageText); messageElement.appendChild(messageText);


TimedElement parentElement = null; TimedElement parentElement = null;
Task task = event.getTask(); Task task = event.getTask();
Target target = event.getTarget(); Target target = event.getTarget();
if (task != null) { if (task != null) {
@@ -261,7 +262,7 @@ public class XmlLogger implements BuildListener {
if (parentElement == null && target != null) { if (parentElement == null && target != null) {
parentElement = (TimedElement)targets.get(target); parentElement = (TimedElement)targets.get(target);
} }
if (parentElement == null) { if (parentElement == null) {
Stack threadStack = (Stack)threadStacks.get(Thread.currentThread()); Stack threadStack = (Stack)threadStacks.get(Thread.currentThread());
if (threadStack != null) { if (threadStack != null) {
@@ -270,7 +271,7 @@ public class XmlLogger implements BuildListener {
} }
} }
} }
if (parentElement != null) { if (parentElement != null) {
parentElement.element.appendChild(messageElement); parentElement.element.appendChild(messageElement);
} }


Loading…
Cancel
Save