From cc47aad618137ee6481c8bc164d8074bd30fde9e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Dec 2013 11:04:46 -0500
Subject: [PATCH] Remove @Inject references because they confuse JEE containers
---
src/main/java/com/gitblit/authority/GitblitAuthority.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 668ca98..36c016d 100644
--- a/src/main/java/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -90,10 +90,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 +131,7 @@
private TableRowSorter<UserCertificateTableModel> defaultSorter;
- private MailExecutor mail;
+ private MailService mail;
private JButton certificateDefaultsButton;
@@ -258,7 +258,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;
--
Gitblit v1.9.1