diff options
| author | James Moger <james.moger@gitblit.com> | 2011-12-20 19:35:54 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-12-20 19:36:56 -0500 |
| commit | eb96eab513101783a750c13419de6bdce3d2fa4c (patch) | |
| tree | 5ed57cd6c9188889dc8ad7bb850b3fd4ae5756d2 /src/com/gitblit/GitBlit.java | |
| parent | 4bd2037edddbf444ac9817e9d14710be45850a10 (diff) | |
| download | gitblit-eb96eab513101783a750c13419de6bdce3d2fa4c.tar.gz gitblit-eb96eab513101783a750c13419de6bdce3d2fa4c.zip | |
Renamed GitblitUserService, sendMail method, sendmail.groovy, and RepositoryModel.mailingLists
Diffstat (limited to 'src/com/gitblit/GitBlit.java')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index f0122791..835aa132 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -743,8 +743,8 @@ public class GitBlit implements ServletContextListener { "gitblit", null, "preReceiveScript")));
model.postReceiveScripts = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "postReceiveScript")));
- model.mailRecipients = new ArrayList<String>(Arrays.asList(config.getStringList(
- "gitblit", null, "mailRecipient")));
+ model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
+ "gitblit", null, "mailingList")));
}
r.close();
return model;
@@ -971,8 +971,8 @@ public class GitBlit implements ServletContextListener { config.setStringList("gitblit", null, "postReceiveScript",
repository.postReceiveScripts);
}
- if (repository.mailRecipients != null) {
- config.setStringList("gitblit", null, "mailRecipient", repository.mailRecipients);
+ if (repository.mailingLists != null) {
+ config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
}
try {
config.save();
@@ -1485,7 +1485,7 @@ public class GitBlit implements ServletContextListener { * @param subject
* @param message
*/
- public void sendEmailToAdministrators(String subject, String message) {
+ public void sendMailToAdministrators(String subject, String message) {
try {
Message mail = mailExecutor.createMessageForAdministrators();
if (mail != null) {
@@ -1505,8 +1505,8 @@ public class GitBlit implements ServletContextListener { * @param message
* @param toAddresses
*/
- public void sendEmail(String subject, String message, ArrayList<String> toAddresses) {
- this.sendEmail(subject, message, toAddresses.toArray(new String[0]));
+ public void sendMail(String subject, String message, ArrayList<String> toAddresses) {
+ this.sendMail(subject, message, toAddresses.toArray(new String[0]));
}
/**
@@ -1516,7 +1516,7 @@ public class GitBlit implements ServletContextListener { * @param message
* @param toAddresses
*/
- public void sendEmail(String subject, String message, String... toAddresses) {
+ public void sendMail(String subject, String message, String... toAddresses) {
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
@@ -1634,11 +1634,7 @@ public class GitBlit implements ServletContextListener { loginService = (IUserService) realmClass.newInstance();
}
} catch (Throwable t) {
- loginService = new UserServiceWrapper() {
- @Override
- public void setupService(IStoredSettings settings) {
- }
- };
+ loginService = new GitblitUserService();
}
setUserService(loginService);
mailExecutor = new MailExecutor(settings);
|