Author: channa
Date: Thu Mar 27 09:02:02 2008
New Revision: 15240
Log:
Added personalization to self registration e-mail (MASHUP-615).
Modified:
trunk/mashup/java/modules/core/conf/web_root.xml
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
Modified: trunk/mashup/java/modules/core/conf/web_root.xml
==============================================================================
--- trunk/mashup/java/modules/core/conf/web_root.xml (original)
+++ trunk/mashup/java/modules/core/conf/web_root.xml Thu Mar 27 09:02:02 2008
@@ -98,6 +98,10 @@
<param-value>[EMAIL PROTECTED]</param-value>
</init-param>
<init-param>
+ <param-name>email_greeting</param-name>
+ <param-value>Hi</param-value>
+ </init-param>
+ <init-param>
<param-name>email_subject</param-name>
<param-value>Self-Registration E-mail Address
Verification</param-value>
</init-param>
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
Thu Mar 27 09:02:02 2008
@@ -66,6 +66,7 @@
public static final String EMAIL_SUBJECT = "email_subject";
public static final String EMAIL_BODY = "email_body";
public static final String EMAIL_FOOTER = "email_footer";
+ public static final String EMAIL_GREETING = "email_greeting";
public static final String USER_REGISTRY = "user_registry";
public static final String MASHUP_MEDIA_TYPE = "wso2_mashup";
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MainServlet.java
Thu Mar 27 09:02:02 2008
@@ -63,6 +63,7 @@
EmailVerifierConfig verifierConfig = new EmailVerifierConfig();
String relayHost =
servletConfig.getInitParameter(MashupConstants.EMAIL_RELAY_HOST);
String fromEmail =
servletConfig.getInitParameter(MashupConstants.EMAIL_FROM_ADDRESS);
+ String greeting =
servletConfig.getInitParameter(MashupConstants.EMAIL_GREETING);
verifierConfig.setHost(relayHost);
verifierConfig.setRegistrationServiceEPR(servletConfig.getInitParameter(
MashupConstants.REG_VALIDATION_URL));
@@ -78,6 +79,7 @@
// Add the e-mail parameters to the servlet context.
servletContext.setAttribute(MashupConstants.EMAIL_RELAY_HOST,
relayHost);
servletContext.setAttribute(MashupConstants.EMAIL_FROM_ADDRESS,
fromEmail);
+ servletContext.setAttribute(MashupConstants.EMAIL_GREETING, greeting);
try {
EmailVerifier.init(realm, verifierConfig);
} catch (UserStoreException e) {
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/InfoCardRegistrationBean.java
Thu Mar 27 09:02:02 2008
@@ -79,11 +79,12 @@
/**
* Accepts users information submitted and initiates verification.
- *
+ * @param request Servlet request object.
* @return true if self registration was successfully initiated.
*/
- public boolean register() {
+ public boolean register(HttpServletRequest request) {
boolean success = false;
+ String salutation = RegistrationBean.getSalutation(request, fullName);
// Information already validated - proceed with verification.
EmailVerifier verifier = new EmailVerifier();
@@ -99,7 +100,7 @@
String password = uuid.substring(uuid.length() - 8);
try {
- verifier.requestUserVerification(userName, emailId, password,
userAttributes);
+ verifier.requestUserVerification(userName, emailId, password,
userAttributes, salutation);
success = true;
} catch (UserStoreException e) {
log.error("Error perrforming self registration", e);
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/RegistrationBean.java
Thu Mar 27 09:02:02 2008
@@ -127,11 +127,12 @@
/**
* Accepts users information submitted and initiates verification.
- *
+ * @param request Servlet request object.
* @return true if self registration was successfully initiated.
*/
- public boolean register() {
+ public boolean register(HttpServletRequest request) {
boolean success = false;
+ String salutation = getSalutation(request, fullName);
// Information already validated - proceed with verification.
EmailVerifier verifier = new EmailVerifier();
@@ -141,7 +142,7 @@
userAttributes.put(MashupConstants.EMAIL_ID, emailId);
try {
- verifier.requestUserVerification(userName, emailId, password,
userAttributes);
+ verifier.requestUserVerification(userName, emailId, password,
userAttributes, salutation);
success = true;
} catch (UserStoreException e) {
log.error("Error perrforming self registration", e);
@@ -400,4 +401,25 @@
return valid;
}
+
+ /**
+ * Returns a salutation given a full name string.
+ * @param fullName The full name of the person being addressed.
+ * @return A salutation string.
+ */
+ public static String getSalutation(HttpServletRequest request, String
fullName) {
+ String greeting = (String)
request.getSession().getServletContext().getAttribute(
+ MashupConstants.EMAIL_GREETING);
+ StringBuffer salutation = new StringBuffer(greeting);
+ int firstNameEnd = fullName.indexOf(" ");
+
+ // Add the first name to the greeting if one has been provided.
+ if (firstNameEnd > -1) {
+ salutation.append(" ");
+ salutation.append(fullName.substring(0, firstNameEnd));
+ }
+
+ salutation.append(",\n");
+ return salutation.toString();
+ }
}
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
