-logXML... round-tripping fixed

diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/org/aspectj/testing/xml/SoftMessage.java
index 208b155b724fefb541003b9f75e514abe3a1675a..8caa77828709e8c76c435c1164a5beab4b01410d 100644 (file)
--- a/testing/src/org/aspectj/testing/xml/SoftMessage.java
+++ b/testing/src/org/aspectj/testing/xml/SoftMessage.java
@@ -101,7 +101,7 @@ public class SoftMessage implements IMessage {
                String value = message.getMessage();
                if (null != value) {
                        value = XMLWriter.attributeValue(value);
-                       out.printAttribute("message", value);
+                       out.printAttribute("text", value);
                }
                value = message.getDetails();
                if (null != value) {

diff --git a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
index 7df8436a09d22f9da2dfc4e9be3ae9a5380bbb13..022342aa2c35a89cb06c6bf59149e18846d96c47 100644 (file)
--- a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
+++ b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java
@@ -44,8 +44,9 @@ public class SoftSourceLocation implements ISourceLocation  {
        out.printAttribute("line", "" + sl.getLine());
        // other attributes not supported
        File file = sl.getSourceFile();
-       if (null != file) {
-           out.printAttribute("file", file.getPath());
+       if ((null != file) && !ISourceLocation.NO_FILE.equals(file)) {
+           String value = XMLWriter.attributeValue(file.getPath());
+           out.printAttribute("file", value);
        }
        out.endElement(elementName);
     }