From b23b67c1cc0b2541580f23c9aec97c0b84a823f4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Feb 2014 09:56:37 -0500
Subject: [PATCH] Select default/configured gc period in create/edit repository page
---
src/main/java/com/gitblit/authority/GitblitAuthority.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 37088ae..51626e6 100644
--- a/src/main/java/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -43,6 +43,7 @@
import java.security.cert.X509Certificate;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -90,10 +91,10 @@
import com.gitblit.IStoredSettings;
import com.gitblit.IUserService;
import com.gitblit.Keys;
-import com.gitblit.MailExecutor;
import com.gitblit.client.HeaderPanel;
import com.gitblit.client.Translation;
import com.gitblit.models.UserModel;
+import com.gitblit.service.MailService;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.StringUtils;
@@ -131,7 +132,7 @@
private TableRowSorter<UserCertificateTableModel> defaultSorter;
- private MailExecutor mail;
+ private MailService mail;
private JButton certificateDefaultsButton;
@@ -146,7 +147,7 @@
if (i + 1 == args.length) {
System.out.println("Invalid --baseFolder parameter!");
System.exit(-1);
- } else if (args[i + 1] != ".") {
+ } else if (!".".equals(args[i + 1])) {
folder = args[i+1];
}
break;
@@ -258,7 +259,7 @@
return null;
}
gitblitSettings = new FileSettings(file.getAbsolutePath());
- mail = new MailExecutor(gitblitSettings);
+ mail = new MailService(gitblitSettings);
String us = gitblitSettings.getString(Keys.realm.userService, "${baseFolder}/users.conf");
String ext = us.substring(us.lastIndexOf(".") + 1).toLowerCase();
IUserService service = null;
@@ -853,7 +854,7 @@
// send email
try {
if (mail.isReady()) {
- Message message = mail.createMessage(user.emailAddress);
+ Message message = mail.createMessage(Arrays.asList(user.emailAddress));
message.setSubject("Your Gitblit client certificate for " + metadata.serverHostname);
// body of email
--
Gitblit v1.9.1