Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/cs-db/initial/dml-basic.sql b/cs-db/initial/dml-basic.sql
- index 113d7bc..02eb855 100644
- --- a/cs-db/initial/dml-basic.sql
- +++ b/cs-db/initial/dml-basic.sql
- @@ -27,7 +27,7 @@ VALUES
- INSERT INTO SYSTEM_PARAMETERS
- (SP_PARAM_NAME, SP_PARAM_VALUE)
- VALUES
- -('DEFAULT_EMAIL', 'conf.nsc@gmail.com')
- +('DEFAULT_EMAIL', 'freelifer@yandex.ru')
- /
- INSERT INTO SYSTEM_PARAMETERS
- diff --git a/cs-db/initial/dml-mail-templates.sql b/cs-db/initial/dml-mail-templates.sql
- index 06ed1ff..59eb7fc 100644
- --- a/cs-db/initial/dml-mail-templates.sql
- +++ b/cs-db/initial/dml-mail-templates.sql
- @@ -4,7 +4,7 @@ REM
- INSERT INTO MAIL_SERVERS
- (ms_id_pk, ms_login, ms_password, ms_mailhost_send, ms_protocol_send, ms_charset, ms_is_default_yn)
- VALUES
- -(mail_servers_sq.nextval, 'conf.nsc', 'LLLN2pOK', 'smtp.gmail.com', 'smtp', 'Windows-1251', 1);
- +(mail_servers_sq.nextval, 'freelifer', 'yfdctulf', 'smtp.yandex.ru', 'smtp', 'Windows-1251', 1);
- INSERT INTO domain_objects
- diff --git a/cs-db/patch/old/0088-20090628-ddl.sql b/cs-db/patch/old/0088-20090628-ddl.sql
- index e464e6d..7900a6a 100644
- --- a/cs-db/patch/old/0088-20090628-ddl.sql
- +++ b/cs-db/patch/old/0088-20090628-ddl.sql
- @@ -52,4 +52,4 @@ ALTER TABLE ACTIVITY_CONFIGS
- INSERT INTO MAIL_SERVERS
- (ms_id_pk, ms_login, ms_password, ms_mailhost_send, ms_protocol_send, ms_charset, ms_is_default_yn)
- VALUES
- -(mail_servers_sq.nextval, 'conf.nsc', 'LLLN2pOK', 'smtp.gmail.com', 'smtp', 'Windows-1251', 1);
- +(mail_servers_sq.nextval, 'freelifer', 'yfdctulf', 'smtp.yandex.com', 'smtp', 'Windows-1251', 1);
- diff --git a/cs-db/patch/old/0089-20090628-dml.sql b/cs-db/patch/old/0089-20090628-dml.sql
- index bdf7492..61aea7e 100644
- --- a/cs-db/patch/old/0089-20090628-dml.sql
- +++ b/cs-db/patch/old/0089-20090628-dml.sql
- @@ -8,7 +8,7 @@ REM ========================================
- INSERT INTO SYSTEM_PARAMETERS
- (SP_PARAM_NAME, SP_PARAM_VALUE)
- VALUES
- -('DEFAULT_EMAIL', 'conf.nsc@gmail.com')
- +('DEFAULT_EMAIL', 'freelifer@yandex.ru')
- /
- INSERT INTO SYSTEM_PARAMETERS
- diff --git a/cs-web/src/main/java/ru/nsc/ict/cs/web/pages/user/ParticipationEdit.java b/cs-web/src/main/java/ru/nsc/ict/cs/web/pages/user/ParticipationEdit.java
- index 3c87fab..3ef7a50 100644
- --- a/cs-web/src/main/java/ru/nsc/ict/cs/web/pages/user/ParticipationEdit.java
- +++ b/cs-web/src/main/java/ru/nsc/ict/cs/web/pages/user/ParticipationEdit.java
- @@ -23,6 +23,7 @@ import ru.nsc.ict.cs.web.components.CitySelector;
- import ru.nsc.ict.cs.web.components.FormFieldSet;
- import ru.nsc.ict.cs.web.framework.AccessDeniedException;
- import ru.nsc.ict.cs.web.pages.Registration;
- +import ru.nsc.ict.cs.web.services.MailServiceImpl;
- import ru.nsc.ict.cs.web.utils.PersonAuthenticity;
- import ru.nsc.ict.cs.web.utils.select.DirEncoder;
- import ru.nsc.ict.cs.web.utils.select.DirSelectModel;
- @@ -32,6 +33,7 @@ import ru.nsc.ict.organizer.DAO.LanguageDAO;
- import ru.nsc.ict.organizer.DAO.LocalizationDAO;
- import ru.nsc.ict.organizer.DAO.OrganizationDAO;
- import ru.nsc.ict.organizer.DAO.PersonDAO;
- +import ru.nsc.ict.organizer.DAO.mail.MailTemplateDAO;
- import ru.nsc.ict.organizer.DAO.security.SecurityDAO;
- import ru.nsc.ict.organizer.DAO.security.UserDAO;
- import ru.nsc.ict.organizer.bean.ApplicationParticipationBean;
- @@ -39,6 +41,10 @@ import ru.nsc.ict.organizer.bean.LanguageBean;
- import ru.nsc.ict.organizer.bean.OrganizationBean;
- import ru.nsc.ict.organizer.bean.UserBean;
- import ru.nsc.ict.organizer.bean.dirs.StringResourceLocalizationBean;
- +import ru.nsc.ict.organizer.bean.mail.MailAddressee;
- +import ru.nsc.ict.organizer.bean.mail.MailMessageBean;
- +import ru.nsc.ict.organizer.bean.mail.MailMessageImpl;
- +import ru.nsc.ict.organizer.bean.mail.MailTemplateBean;
- @Import(library = {"${tapestry.scriptaculous}/prototype.js", "context:js/selectfix.js"})
- public class ParticipationEdit extends AbstractUserParticipationPage {
- @@ -346,11 +352,52 @@ public class ParticipationEdit extends AbstractUserParticipationPage {
- if (isSendConfirmation)
- {
- +
- + LanguageBean language = getConference().getLanguage();
- + MailTemplateBean template = MailTemplateDAO.getDAO().getPasswordRecoveryTemplate(language, getContext());
- +
- + MailMessageImpl mailMessage = new MailMessageImpl();
- + mailMessage.setSubject("mailSubject");
- + mailMessage.setText("mailText");
- + mailMessage.setRecipientName(getContext().getUser().getEmail());
- +
- +// MailServiceImpl mailService = new MailServiceImpl()
- +// mailService.sendMail(mailMessage, getConference(), true, getContext());
- +
- +
- +
- +
- + //getNotifier().setInfoMessage(messages.get("password.recovery.sent") + " " + mailMessage.getRecipientName());
- +
- +
- try
- {
- java.io.BufferedWriter writer = new java.io.BufferedWriter(new java.io.FileWriter(new java.io.File("E:\\moch.txt")));
- writer.append(new java.util.Date().toString());
- + writer.newLine();
- +
- + writer.append("mailMessage.getBccCopy = " + mailMessage.getBccCopy());
- + writer.newLine();
- +
- + writer.append("mailMessage.getFromEmail = " + mailMessage.getFromEmail());
- + writer.newLine();
- +
- + writer.append("mailMessage.getFromName = " + mailMessage.getFromName());
- + writer.newLine();
- +
- + writer.append("mailMessage.getRecipientName = " + mailMessage.getRecipientName());
- + writer.newLine();
- +
- + writer.append("mailMessage.getSubject = " + mailMessage.getSubject());
- + writer.newLine();
- +
- + writer.append("mailMessage.getText = " + mailMessage.getText());
- + writer.newLine();
- +
- + writer.append("mailMessage.toString = " + mailMessage.toString());
- + writer.newLine();
- +
- writer.flush();
- writer.close();
Add Comment
Please, Sign In to add comment