incubator-kalumet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1202596 - in /incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils: NotifierUtils.java PublisherUtils.java
Date Wed, 16 Nov 2011 09:08:42 GMT
Author: jbonofre
Date: Wed Nov 16 09:08:42 2011
New Revision: 1202596

URL: http://svn.apache.org/viewvc?rev=1202596&view=rev
Log:
Update the title of notification and report

Modified:
    incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/NotifierUtils.java
    incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/PublisherUtils.java

Modified: incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/NotifierUtils.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/NotifierUtils.java?rev=1202596&r1=1202595&r2=1202596&view=diff
==============================================================================
--- incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/NotifierUtils.java
(original)
+++ incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/NotifierUtils.java
Wed Nov 16 09:08:42 2011
@@ -64,7 +64,7 @@ public class NotifierUtils {
                     Destination destination = (Destination) destinationIterator.next();
                     addresses.add(VariableUtils.replace(destination.getAddress(), environment.getVariables()));
                 }
-                EmailUtils.sendHTMLEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "AutoDeploy Update Notification
- Environment " + environment.getName(), addresses, notifyContent);
+                EmailUtils.sendHTMLEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "Apache Kalumet Notification
- Environment " + environment.getName(), addresses, notifyContent);
             }
         } catch (Exception e) {
             LOGGER.warn("Can't send notification.", e);

Modified: incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/PublisherUtils.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/PublisherUtils.java?rev=1202596&r1=1202595&r2=1202596&view=diff
==============================================================================
--- incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/PublisherUtils.java
(original)
+++ incubator/kalumet/trunk/utils/src/main/java/org/apache/kalumet/utils/PublisherUtils.java
Wed Nov 16 09:08:42 2011
@@ -81,10 +81,10 @@ public class PublisherUtils {
                     TransformerFactory transformerFactory = TransformerFactory.newInstance();
                     Transformer transformer = transformerFactory.newTransformer(new StreamSource(xslFile));
                     transformer.transform(new StreamSource(inputFile), new StreamResult(new
FileOutputStream(outputFile)));
-                    EmailUtils.sendHTMLEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "AutoDeploy Update Report
- Environment " + environment.getName(), addresses, (String) FileUtils.readFileToString(new
File(outputFile), null));
+                    EmailUtils.sendHTMLEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "Apache Kalumet Report
- Environment " + environment.getName(), addresses, (String) FileUtils.readFileToString(new
File(outputFile), null));
                 } else {
                     LOGGER.debug("No XSL transformation file found, send a text e-mail");
-                    EmailUtils.sendTextEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "AutoDeploy Update Report
- Environmment " + environment.getName(), addresses, (String) FileUtils.readFileToString(new
File(environmentCacheDir + "/" + UpdateLog.MAIN_LOG_FILE)));
+                    EmailUtils.sendTextEmail(VariableUtils.replace(email.getMailhost(), environment.getVariables()),
VariableUtils.replace(email.getFrom(), environment.getVariables()), "Apache Kalumet Report
- Environmment " + environment.getName(), addresses, (String) FileUtils.readFileToString(new
File(environmentCacheDir + "/" + UpdateLog.MAIN_LOG_FILE)));
                 }
             }
         } catch (Exception e) {



Mime
View raw message