Index: scripts/parameters.xml =================================================================== --- scripts/parameters.xml (revision 549405) +++ scripts/parameters.xml (working copy) @@ -46,6 +46,7 @@ description="Do always notify Run Status or only when status is changed" value="true"/> + - - + + + + + Index: scripts/framework.xml =================================================================== --- scripts/framework.xml (revision 549405) +++ scripts/framework.xml (working copy) @@ -171,7 +171,7 @@ - + Index: scripts/publisher.xml =================================================================== --- scripts/publisher.xml (revision 549405) +++ scripts/publisher.xml (working copy) @@ -19,15 +19,15 @@ Status Publisher Implementation ====================================================================== --> - + - + - + - + + + + + + + + + + + + + + + + + + + + value="${mail.subject.prefix} ${mail.execution.status} ${os.name} ${mail.os.arch}: ${suite.name}${mail.subject.suffix}"/> - - - - + + + + + - + - - - - + - + + + - - + - ${mail.summary}${mail.message} + files="${mail.attachs},${mail.execution.log}"> + ${mail.summary.content}${mail.message.content} @@ -108,9 +128,9 @@ - @{text} Index: scripts/cc-exec-adaptor.xml =================================================================== --- scripts/cc-exec-adaptor.xml (revision 549405) +++ scripts/cc-exec-adaptor.xml (working copy) @@ -121,41 +121,72 @@ depends="define-ant-contrib" if="framework.parameters.usemail" unless="${suite.name}.parameters.run.skipped"> + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - + + + + + + - + + + + + + + + + - - + + @@ -163,27 +194,16 @@ + unless="mail.message"> - - - - - - - - - - - -