harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r538104 - in /harmony/enhanced/buildtest/branches/2.0/scripts: adaptor-interface.xml local.properties.template parameters.xml publisher.xml
Date Tue, 15 May 2007 09:25:53 GMT
Author: smishura
Date: Tue May 15 02:25:51 2007
New Revision: 538104

URL: http://svn.apache.org/viewvc?view=rev&rev=538104
Log:
Apply third patch from HARMONY-3798:
([testing] there is no default publisher implementation in the current BTI v 2.0)

Note: excluded scripts/cc-project.xml becuase the file already contains update

Modified:
    harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/local.properties.template
    harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml?view=diff&rev=538104&r1=538103&r2=538104
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml Tue May 15 02:25:51
2007
@@ -22,6 +22,15 @@
      ====================================================================== -->
 <project name="adaptor-interface" basedir=".">
 
+    <!-- Default setup target implementation. -->
+    <target name="setup">
+        <echo>
+--------
+WARNING: The adaptor.xml for '${suite.name}' Test Suite does not implement
+-------- the setup target. Default implementation does nothing...
+</echo>
+    </target>
+
     <!-- Default clean target implementation. -->
     <target name="clean">
         <echo>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/local.properties.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/local.properties.template?view=diff&rev=538104&r1=538103&r2=538104
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/local.properties.template (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/local.properties.template Tue May 15 02:25:51
2007
@@ -1,12 +1,6 @@
-# Do you want to sent email notifications and to where? and from whom?
+# Do you want to send email notifications and to where? and from whom?
 #
 # framework.parameters.usemail=some.smtp.host
 # framework.parameters.usemail.to=some@mail.address.net
 # framework.parameters.usemail.from=me@some.host
-
-# Prefix to be used in subject field of the mail notifications
-framework.parameters.mail.prefix=[build-test alert]
-
-# Do you want to see framework execution log?
-framework.parameters.options.dolog=false
 

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml?view=diff&rev=538104&r1=538103&r2=538104
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml Tue May 15 02:25:51 2007
@@ -10,6 +10,18 @@
     <cc webport="8080" description="The port on which CC will make its web publishing"/>
     <cc jmxport="8000" description="The port for CC's JMX console."/>
 
+    <usemail 
+        description="Specify the SMTP server to be used for E-Mail Notifications">
+        <always 
+            description="Do always notify Run Status or only when status is changed"
+            value="true"/>
+        <to description="E-Mail address to send notifications to"/>
+        <from description="E-Mail address to send notifications from"/>
+        <subject.prefix 
+            description="Subject prefix of E-Mail Notifications"
+            value="[build-test alert]"/>
+    </usemail>
+
     <external>
         <ant-contrib
             jar="ant-contrib-1.0b3.jar"

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml?view=diff&rev=538104&r1=538103&r2=538104
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml Tue May 15 02:25:51 2007
@@ -20,17 +20,34 @@
      ====================================================================== -->
 <project name="publisher" default="run" basedir=".">
 
-    <condition property="execution.status" 
+    <!-- check whether we should send notification or not -->
+    <condition property="do.mail">
+        <and>
+            <!-- if framework was configured to send notifications -->
+            <isset property="framework.parameters.usemail"/>
+            <or>
+                <!-- and it was configured to always notify about run status -->
+                <istrue value="${framework.parameters.usemail.always}"/>
+                <!-- or, in case of run-status change -->
+                <not>
+                    <equals arg1="${thisbuildsuccessful}"
+                            arg2="${lastbuildsuccessful}"/>
+                </not>
+            </or>
+        </and>
+    </condition>
+
+    <condition property="execution.status"
                value="BUILD PASSED"
                else="BUILD FAILED">
         <istrue value="${thisbuildsuccessful}"/>
     </condition>
 
-    <property name="mail.subject.line" 
-              value="${framework.parameters.mail.prefix} ${execution.status} ${os.name} ${os.arch}:
${suite.name}"/>
+    <property name="mail.subject.line"
+              value="${framework.parameters.usemail.subject.prefix} ${execution.status} ${os.name}
${os.arch}: ${suite.name}"/>
 
     <!-- implement publisher interface -->
-    <target name="publish" if="framework.parameters.usemail" depends="-compose-message">
+    <target name="publish" if="do.mail" depends="-compose-message">
         <mail mailhost="${framework.parameters.usemail}"
               tolist="${framework.parameters.usemail.to}"
               from="${framework.parameters.usemail.from}"
@@ -39,16 +56,16 @@
         </mail>
     </target>
 
-    <target name="-compose-message" if="framework.parameters.usemail">
-        <property name="cc.xsl.files.dir" 
+    <target name="-compose-message" if="do.mail">
+        <property name="cc.xsl.files.dir"
                   value="${ext.cc.location}/webapps/cruisecontrol/xsl"/>
-        <property name="transformed.file" 
+        <property name="transformed.file"
                   value="${temp.files.dir}/${suite.name}-email-message.txt"/>
-		<xslt basedir="${scripts.dir}/xslt"
-			  in="${logdir}/${logfile}" 
-			  style="${scripts.dir}/xslt/br.xsl" 
+        <xslt basedir="${scripts.dir}/xslt"
+              in="${logdir}/${logfile}"
+              style="${scripts.dir}/xslt/br.xsl"
               out="${transformed.file}"
-			  classpath="${ext.xalan.location}:${ext.cc.location}/lib/serializer-2.7.0.jar"/>
+              classpath="${ext.xalan.location}:${ext.cc.location}/lib/serializer-2.7.0.jar"/>
     </target>
 
 </project>



Mime
View raw message