Author: carlos
Date: Sun Jan 27 17:47:51 2008
New Revision: 615695
URL: http://svn.apache.org/viewvc?rev=615695&view=rev
Log:
Add header and footer to the mails
Modified:
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
Modified:
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
URL:
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties?rev=615695&r1=615694&r2=615695&view=diff
==============================================================================
---
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
(original)
+++
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
Sun Jan 27 17:47:51 2008
@@ -4,4 +4,6 @@
mailHostName=localhost
[EMAIL PROTECTED]
[EMAIL PROTECTED]
-mailSubject=[REPOSITORY_SYNC]
+mailSubject=[Maven Central Repository Synchronization]
+mailFooter=This is an automated email, do not respond.\
+Contact the owners at [EMAIL PROTECTED]
Modified:
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java?rev=615695&r1=615694&r2=615695&view=diff
==============================================================================
---
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
(original)
+++
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
Sun Jan 27 17:47:51 2008
@@ -169,7 +169,7 @@
synchronizer.sync(repositories);
if (synchronizer.failedRepositories.isEmpty()) {
- synchronizer.sendEmail("--- All repositories synchronized
successfully ---");
+ synchronizer.sendEmail("SUCCESS", "--- All repositories
synchronized successfully ---");
} else {
StringBuffer sb = new StringBuffer();
sb.append("--- Some repositories were not synchronized ---");
@@ -182,19 +182,19 @@
sb.append("\n");
sb.append("\n");
}
- synchronizer.sendEmail(sb.toString());
+ synchronizer.sendEmail("FAILURE", sb.toString());
}
/* send email out */
}
- private void sendEmail(String text) {
+ private void sendEmail(String subject, String text) {
SimpleEmail email = new SimpleEmail();
email.setHostName(options.getMailHostname());
try {
email.addTo(options.getMailTo());
email.setFrom(options.getMailFrom());
- email.setSubject(options.getMailSubject());
+ email.setSubject(options.getMailSubject() + " " + subject);
email.setMsg(text);
email.send();
} catch (EmailException e) {
Modified:
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
URL:
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java?rev=615695&r1=615694&r2=615695&view=diff
==============================================================================
---
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
(original)
+++
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
Sun Jan 27 17:47:51 2008
@@ -14,11 +14,12 @@
private static final String MAIL_TO = "mailTo";
private static final String MAIL_FROM = "mailFrom";
private static final String MAIL_SUBJECT = "mailSubject";
+ private static final String MAIL_FOOTER = "mailFooter";
private String exclusionsFile;
private String basedir;
private String logFile;
private boolean dryRun = true;
- private String mailHostname, mailTo, mailFrom, mailSubject;
+ private String mailHostname, mailTo, mailFrom, mailSubject, mailFooter;
public String getExclusionsFile() {
return exclusionsFile;
@@ -114,5 +115,13 @@
public void setMailSubject(String mailSubject) {
this.mailSubject = mailSubject;
+ }
+
+ public void setMailFooter(String mailFooter) {
+ this.mailFooter = mailFooter;
+ }
+
+ public String getMailFooter() {
+ return mailFooter;
}
}