Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv9489/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
RegisterPorlet.java LoginPortlet.java
Log Message:
CMSC-633 Use a single email setting for emailing in the CMSContainer
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-633
Index: RegisterPorlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPorlet.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- RegisterPorlet.java 12 Dec 2008 14:43:01 -0000 1.1.2.13
+++ RegisterPorlet.java 4 Feb 2009 12:16:29 -0000 1.1.2.14
@@ -16,7 +16,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.finalist.cmsc.login.EmailUtils;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.community.person.Person;
@@ -24,6 +23,7 @@
import com.finalist.cmsc.services.community.person.RegisterStatus;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.util.EmailSender;
public class RegisterPorlet extends AbstractLoginPortlet {
@@ -98,7 +98,7 @@
if (StringUtils.isNotBlank(emailFrom) &&
!isEmailAddress(emailFrom)) {
throw new AddressException("Email address '" + emailFrom +
"' is not available or working!");
}
- EmailUtils.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
+ EmailSender.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
email, "text/plain;charset=utf-8");
}
catch (AddressException e) {
Index: LoginPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -b -r1.11.2.3 -r1.11.2.4
--- LoginPortlet.java 12 Dec 2008 12:36:46 -0000 1.11.2.3
+++ LoginPortlet.java 4 Feb 2009 12:16:29 -0000 1.11.2.4
@@ -25,7 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.finalist.cmsc.login.EmailUtils;
import com.finalist.cmsc.login.PasswordGenerator;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.community.Community;
@@ -34,6 +33,7 @@
import com.finalist.cmsc.services.community.person.RegisterStatus;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.util.EmailSender;
/**
* Login portlet
@@ -121,7 +121,7 @@
if (StringUtils.isNotBlank(emailFrom) &&
!isEmailAddress(emailFrom)) {
throw new AddressException("Email address "+emailFrom+"is
not availalbe");
}
- EmailUtils.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
+ EmailSender.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
email, "text/plain;charset=utf-8");
sendMessage = "view.account.success";
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
