Revision: 4051
Author: solomax666
Date: Sun Aug 14 04:56:25 2011
Log: - MailHandler and Feedbackmanagement are turned into beans
http://code.google.com/p/openmeetings/source/detail?r=4051
Modified:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
/branches/dev/injection/src/app/org/openmeetings/utils/mail/MailHandler.java
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 04:44:55 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 04:56:25 2011
@@ -172,6 +172,8 @@
<bean id="serverSharingSessionList"
class="org.openmeetings.server.cache.ServerSharingSessionList" />
<bean id="serverSocketMinaProcess"
class="org.openmeetings.server.socket.ServerSocketMinaProcess" />
<bean id="whiteboardConvertionJobManagerSWFTools"
class="org.openmeetings.app.data.record.WhiteboardConvertionJobManagerSWFTools"
/>
+ <bean id="mailHandler" class="org.openmeetings.utils.mail.MailHandler"
/>
+ <bean id="feedbackManagement"
class="org.openmeetings.app.data.conference.Feedbackmanagement" />
<tx:annotation-driven transaction-manager="jpaTransactionManager"/>
<context:annotation-config/>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
Sun Aug 14 04:56:25 2011
@@ -11,24 +11,14 @@
import org.springframework.beans.factory.annotation.Autowired;
public class Feedbackmanagement {
- private static final Logger log = Red5LoggerFactory.getLogger(
- Feedbackmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(Feedbackmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private Fieldmanagment fieldmanagment;
-
- private static Feedbackmanagement instance;
-
- private Feedbackmanagement() {
- }
-
- public static synchronized Feedbackmanagement getInstance() {
- if (instance == null) {
- instance = new Feedbackmanagement();
- }
- return instance;
- }
+ @Autowired
+ private MailHandler mailHandler;
public String sendFeedback(String username, String email, String message)
{
try {
@@ -43,7 +33,7 @@
Fieldlanguagesvalues fValue = fieldmanagment
.getFieldByIdAndLanguage(new Long(499),
new Long(
default_lang_id));
- return
MailHandler.sendMail("[email protected]",
+ return
mailHandler.sendMail("[email protected]",
fValue.getValue(), template);
} catch (Exception err) {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Aug 14 04:56:25 2011
@@ -69,6 +69,8 @@
private Roommanagement roommanagement;
@Autowired
private UsersDaoImpl usersDao;
+ @Autowired
+ private MailHandler mailHandler;
private final SimpleDateFormat dateFormat = new
SimpleDateFormat("HH:mm");
@@ -574,7 +576,7 @@
System.out.println(template);
- return MailHandler.sendMail(email, subject, template);
+ return mailHandler.sendMail(email, subject, template);
} catch (Exception err) {
log.error("sendInvitationLink", err);
@@ -605,7 +607,7 @@
message += "<a href='" + invitation_link
+ "'>Click here to enter room</a>";
- return MailHandler.sendMail(email, subject, message);
+ return mailHandler.sendMail(email, subject, message);
} catch (Exception e) {
log.error("sendInvitationReminderLink", e);
}
@@ -627,7 +629,7 @@
String cancelling_person, String subject, String
message) {
log.debug("sendInvitationCancelmail");
try {
- return MailHandler.sendMail(email, subject, message);
+ return mailHandler.sendMail(email, subject, message);
} catch (Exception e) {
log.error("sendInvitationCancelmail : " +
e.getMessage());
}
@@ -649,7 +651,7 @@
String cancelling_person, String subject, String
message) {
log.debug("sendInvitationUpdateMail");
try {
- return MailHandler.sendMail(email, subject, message);
+ return mailHandler.sendMail(email, subject, message);
} catch (Exception e) {
log.error("sendInvitationUpdateMail : " +
e.getMessage());
}
@@ -887,7 +889,7 @@
invitation_link, default_lang_id, starttime,
endtime);
- return MailHandler.sendMail(email, subject,
template);
+ return mailHandler.sendMail(email, subject,
template);
}
} catch (Exception err) {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
Sun Aug 14 04:56:25 2011
@@ -18,14 +18,17 @@
@Transactional
public class Emailmanagement {
- private static final Logger log = Red5LoggerFactory.getLogger(
- Emailmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(Emailmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ @PersistenceContext
+ private EntityManager em;
+
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private Fieldmanagment fieldmanagment;
- @PersistenceContext
- private EntityManager em;
+ @Autowired
+ private MailHandler mailHandler;
private boolean checkUserLevel(int user_level) {
if (user_level > 1) {
@@ -241,7 +244,7 @@
Fieldlanguagesvalues label = fieldmanagment
.getFieldByIdAndLanguage(new
Long(512), default_lang_id);
- succ = MailHandler.sendMail(EMail,
label.getValue(), template);
+ succ = mailHandler.sendMail(EMail,
label.getValue(), template);
} else {
@@ -251,7 +254,7 @@
Fieldlanguagesvalues label = fieldmanagment
.getFieldByIdAndLanguage(new
Long(512), default_lang_id);
- succ = MailHandler.sendMail(EMail,
label.getValue(), template);
+ succ = mailHandler.sendMail(EMail,
label.getValue(), template);
}
return succ;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 04:44:55 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 04:56:25 2011
@@ -91,6 +91,8 @@
private UserSipDataDaoImpl userSipDataDao;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
+ @Autowired
+ private MailHandler mailHandler;
/**
* query for a list of users
@@ -1489,7 +1491,7 @@
Fieldlanguagesvalues labelid517 = fieldmanagment
.getFieldByIdAndLanguage(new Long(517),
default_lang_id);
- MailHandler.sendMail(email, labelid517.getValue(), template);
+ mailHandler.sendMail(email, labelid517.getValue(), template);
}
/**
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Sun Aug 14 04:44:55 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Sun Aug 14 04:56:25 2011
@@ -86,6 +86,8 @@
private SOAPLoginDaoImpl soapLoginDao;
@Autowired
private Invitationmanagement invitationManagement;
+ @Autowired
+ private Feedbackmanagement feedbackManagement;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
@@ -891,7 +893,7 @@
*/
public String sendFeedback(String SID, String username, String message,
String email) {
- return Feedbackmanagement.getInstance().sendFeedback(username,
email,
+ return feedbackManagement.sendFeedback(username, email,
message);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sun Aug 14 04:44:55 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sun Aug 14 04:56:25 2011
@@ -91,6 +91,8 @@
private UsersDaoImpl usersDao;
@Autowired
private UserContactsDaoImpl userContactsDao;
+ @Autowired
+ private MailHandler mailHandler;
/**
* get your own user-object
@@ -680,7 +682,7 @@
denyLinkHTML,
profileLinkHTML);
if (userToAdd.getAdresses() != null) {
-
MailHandler.sendMail(userToAdd.getAdresses().getEmail(),
+
mailHandler.sendMail(userToAdd.getAdresses().getEmail(),
user.getFirstname() + "
" + user.getLastname()
+ " " +
fValue1193.getValue(), template);
}
@@ -885,7 +887,7 @@
0L,
userContacts.getContact(), user, user,
false, null,
false, 0L);
-
MailHandler.sendMail(user.getAdresses().getEmail(),
+
mailHandler.sendMail(user.getAdresses().getEmail(),
userContacts.getContact().getFirstname()
+ "
"
+ userContacts.getContact()
@@ -1047,7 +1049,7 @@
String aLinkHTML = "<br/><br/><a
href='" + profile_link
+ "'>" + fValue1302.getValue() +
"</a><br/>";
- MailHandler.sendMail(email,
fValue1301.getValue() + " "
+ mailHandler.sendMail(email,
fValue1301.getValue() + " "
+ subject,
message.replaceAll("\\<.*?>", "")
+ aLinkHTML);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/utils/mail/MailHandler.java
Fri Aug 12 11:20:41 2011
+++
/branches/dev/injection/src/app/org/openmeetings/utils/mail/MailHandler.java
Sun Aug 14 04:56:25 2011
@@ -14,12 +14,9 @@
public class MailHandler {
private static final Logger log =
Red5LoggerFactory.getLogger(MailHandler.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired //FIXME
- static private Configurationmanagement cfgManagement;
-
- public MailHandler() {
- }
-
+ @Autowired
+ private Configurationmanagement cfgManagement;
+
/**
* send mail to address
*
@@ -28,7 +25,7 @@
* @param message
* @return
*/
- public static String sendMail(String toEmail, String subj, String
message) {
+ public String sendMail(String toEmail, String subj, String message) {
try {
// String smtpServer="smtp.xmlcrm.org";
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
