-logXML... round-tripping fixed

2 files changed, 4 insertions, 3 deletions

diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/org/aspectj/testing/xml/SoftMessage.java
index 208b155b7..8caa77828 100644
--- 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 7df8436a0..022342aa2 100644
--- 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);
     }