Author: dimuthul
Date: Fri Dec 21 00:38:59 2007
New Revision: 11643

Log:

Adding requirements by the MashUp team.



Modified:
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserStoreAdmin.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLUserStoreAdmin.java
   
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
   
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
   
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifierConfig.java

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserStoreAdmin.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserStoreAdmin.java
       (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/UserStoreAdmin.java
       Fri Dec 21 00:38:59 2007
@@ -18,6 +18,12 @@
      */
     public void updateUser(String userName, Object newCredential, Object 
oldCredential)
             throws UserManagerException;
+    
+    /**
+     * Update method for admin
+     */
+    public void updateUser(String userName, Object newCredential)
+            throws UserManagerException;
 
     /**
      * Delete user from user store

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLUserStoreAdmin.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLUserStoreAdmin.java
  (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/acl/realm/ACLUserStoreAdmin.java
  Fri Dec 21 00:38:59 2007
@@ -10,7 +10,8 @@
 /**
  * Manipulates data in the User Store
  */
-public class ACLUserStoreAdmin extends ACLUserStoreReader implements 
UserStoreAdmin {
+public class ACLUserStoreAdmin
+        extends ACLUserStoreReader implements UserStoreAdmin {
 
     private Authorizer authorizer = null;
 
@@ -43,8 +44,8 @@
     /**
      * Update user in the user store
      */
-    public void updateUser(String userName, Object newCredential, Object 
oldCredential)
-            throws UserManagerException {
+    public void updateUser(String userName, Object newCredential,
+            Object oldCredential) throws UserManagerException {
         if (!authorizer.isUserAuthorized(adminUserName,
                 UserManagerConstants.USER_RESOURCE, 
UserManagerConstants.EDIT)) {
 
@@ -55,6 +56,18 @@
         usAdmin.updateUser(userName, newCredential, oldCredential);
     }
 
+    public void updateUser(String userName, Object newCredential)
+            throws UserManagerException {
+        if (!authorizer.isUserAuthorized(adminUserName,
+                UserManagerConstants.USER_RESOURCE, 
UserManagerConstants.EDIT)) {
+
+            throw new UnauthorizedException("unAuthorized", new String[] {
+                    UserManagerConstants.USER_RESOURCE,
+                    UserManagerConstants.EDIT });
+        }
+        usAdmin.updateUser(userName, newCredential);
+    }
+
     /**
      * Delete user from user store
      */

Modified: 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
==============================================================================
--- 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
      (original)
+++ 
trunk/commons/usermanager/modules/core/src/main/java/org/wso2/usermanager/readwrite/DefaultUserStoreAdmin.java
      Fri Dec 21 00:38:59 2007
@@ -18,34 +18,34 @@
 
 import javax.sql.DataSource;
 
-public class DefaultUserStoreAdmin extends DefaultUserStoreReader implements 
UserStoreAdmin {
+public class DefaultUserStoreAdmin
+        extends DefaultUserStoreReader implements UserStoreAdmin {
 
     private static Log log = LogFactory.getLog(DefaultUserStoreAdmin.class);
-    
+
     public DefaultUserStoreAdmin(DataSource dataSource) {
         super(dataSource);
     }
-    
+
     public DefaultUserStoreAdmin(DataSource dataSource, UserStoreData store) {
         super(dataSource, store);
     }
-    
+
     public void addUser(String userName, Object credential)
             throws UserManagerException {
         if (!(credential instanceof String)) {
             throw new UserManagerException("Credential type not support");
         }
-        
+
         Connection dbConnection = null;
         try {
             dbConnection = dataSource.getConnection();
             if (dbConnection == null) {
                 throw new UserManagerException("null_connection");
             }
-            PreparedStatement addUserStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER));
-            
-            
+            PreparedStatement addUserStmt = dbConnection.prepareStatement(data
+                    .getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER));
+
             addUserStmt.setString(1, userName);
             MessageDigest dgst = MessageDigest.getInstance("MD5");
             dgst.update(((String) credential).getBytes());
@@ -63,45 +63,47 @@
             throw new UserManagerException("errorCreatingPasswordDigest", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
 
     }
 
-    public void updateUser(String userName, Object newCredential, Object 
oldCredential)
-            throws UserManagerException {
+    public void updateUser(String userName, Object newCredential,
+            Object oldCredential) throws UserManagerException {
         Connection dbConnection = null;
         try {
             dbConnection = dataSource.getConnection();
             if (dbConnection == null) {
                 throw new UserManagerException("null_connection");
             }
-            PreparedStatement getUserStmt = dbConnection
-            
.prepareStatement(data.getAuthenticatorSQL(DefaultRealmConstants.GET_USER));
+            PreparedStatement getUserStmt = dbConnection.prepareStatement(data
+                    .getAuthenticatorSQL(DefaultRealmConstants.GET_USER));
             getUserStmt.setString(1, userName);
-            
+
             ResultSet rs = getUserStmt.executeQuery();
             if (rs.next()) {
                 if (oldCredential != null) {
                     MessageDigest dgst = MessageDigest.getInstance("MD5");
                     dgst.update(((String) oldCredential).getBytes());
                     String dbCred = rs
-                    
.getString(data.getColumnName(DefaultRealmConstants.COLUMN_ID_CREDENTIAL));
-                    if(!Base64.encode(dgst.digest()).equals(dbCred)){
+                            .getString(data
+                                    
.getColumnName(DefaultRealmConstants.COLUMN_ID_CREDENTIAL));
+                    if (!Base64.encode(dgst.digest()).equals(dbCred)) {
                         throw new UserManagerException("oldPasswordIncorrect");
                     }
                 }
-            }else{
+            } else {
                 throw new UserManagerException("oldPasswordIncorrect");
             }
-    
+
             PreparedStatement updateUserStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.UPDATE_USER));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.UPDATE_USER));
             MessageDigest dgst = MessageDigest.getInstance("MD5");
             dgst.update(((String) newCredential).getBytes());
             updateUserStmt.setString(1, Base64.encode(dgst.digest()));
@@ -117,24 +119,61 @@
             throw new UserManagerException("errorCreatingPasswordDigest", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
+            }
+        }
+    }
+
+    public void updateUser(String userName, Object newCredential)
+            throws UserManagerException {
+        Connection dbConnection = null;
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
+            
+            PreparedStatement updateUserStmt = dbConnection
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.UPDATE_USER));
+            MessageDigest dgst = MessageDigest.getInstance("MD5");
+            dgst.update(((String) newCredential).getBytes());
+            updateUserStmt.setString(1, Base64.encode(dgst.digest()));
+            updateUserStmt.setString(2, userName);
+            updateUserStmt.executeUpdate();
+            dbConnection.commit();
+            updateUserStmt.close();
+        } catch (SQLException e) {
+            log.debug(e);
+            throw new UserManagerException("errorModifyingUserStore", e);
+        } catch (NoSuchAlgorithmException e) {
+            log.debug(e);
+            throw new UserManagerException("errorCreatingPasswordDigest", e);
+        } finally {
+            try {
+                if (dbConnection != null) {
+                    dbConnection.close();
+                }
+            } catch (SQLException e) {
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
 
     public void deleteUser(String userName) throws UserManagerException {
         Connection dbConnection = null;
-      try {
-          dbConnection = dataSource.getConnection();
-          if (dbConnection == null) {
-              throw new UserManagerException("null_connection");
-          }
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
             PreparedStatement deleteUserStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER));
             deleteUserStmt.setString(1, userName);
             deleteUserStmt.executeUpdate();
             dbConnection.commit();
@@ -144,18 +183,18 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
 
     public void setUserProperties(String userName, Map properties)
             throws UserManagerException {
-        
+
         String userid = data.getUserId(userName);
         if (userid == null) {
             throw new UserManagerException("nullUser");
@@ -165,18 +204,20 @@
             return;
         }
         Connection dbConnection = null;
-       try {
-           dbConnection = dataSource.getConnection();
-           if (dbConnection == null) {
-               throw new UserManagerException("null_connection");
-           }
+        try {
+            dbConnection = dataSource.getConnection();
+            if (dbConnection == null) {
+                throw new UserManagerException("null_connection");
+            }
             PreparedStatement deleteUserPropsStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ATTRIBUTE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ATTRIBUTE));
             deleteUserPropsStmt.setString(1, userid);
             deleteUserPropsStmt.executeUpdate();
 
             PreparedStatement setUserPropertiesStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ATTRIBUTE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ATTRIBUTE));
 
             Iterator ite = properties.entrySet().iterator();
             while (ite.hasNext()) {
@@ -199,11 +240,11 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
 
@@ -211,7 +252,7 @@
 
     public void setRoleProperties(String roleName, Map properties)
             throws UserManagerException {
-        
+
         String roleid = data.getRoleId(roleName);
         if (roleid == null) {
             throw new UserManagerException("nullRole");
@@ -223,12 +264,14 @@
                 throw new UserManagerException("null_connection");
             }
             PreparedStatement deleteRolePropsStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE_ATTRIBUTE));
             deleteRolePropsStmt.setString(1, roleid);
             deleteRolePropsStmt.executeUpdate();
 
             PreparedStatement setRolePropertiesStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE_ATTRIBUTE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE_ATTRIBUTE));
 
             Iterator ite = properties.entrySet().iterator();
             while (ite.hasNext()) {
@@ -254,11 +297,11 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
@@ -270,8 +313,8 @@
             if (dbConnection == null) {
                 throw new UserManagerException("null_connection");
             }
-            PreparedStatement addRoleStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE));
+            PreparedStatement addRoleStmt = dbConnection.prepareStatement(data
+                    .getUserStoreAdminSQL(DefaultRealmConstants.ADD_ROLE));
             String idRole = UUIDGenerator.getUUID();
             addRoleStmt.setString(1, roleName);
             addRoleStmt.setString(2, idRole);
@@ -283,11 +326,11 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
@@ -300,7 +343,8 @@
                 throw new UserManagerException("null_connection");
             }
             PreparedStatement deleteRoleStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_ROLE));
             deleteRoleStmt.setString(1, roleName);
             deleteRoleStmt.execute();
             dbConnection.commit();
@@ -310,18 +354,18 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
 
     public void addUserToRole(String userName, String roleName)
             throws UserManagerException {
-       
+
         String userid = data.getUserId(userName);
         String roleid = data.getRoleId(roleName);
 
@@ -335,7 +379,8 @@
                 throw new UserManagerException("null_connection");
             }
             PreparedStatement addUserToRoleStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ROLE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.ADD_USER_ROLE));
             String id = UUIDGenerator.getUUID();
             addUserToRoleStmt.setString(1, id);
             addUserToRoleStmt.setString(2, userid);
@@ -348,11 +393,11 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
@@ -366,7 +411,8 @@
                 throw new UserManagerException("null_connection");
             }
             PreparedStatement removeUserFromRoleStmt = dbConnection
-                    
.prepareStatement(data.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ROLE));
+                    .prepareStatement(data
+                            
.getUserStoreAdminSQL(DefaultRealmConstants.DELETE_USER_ROLE));
             removeUserFromRoleStmt.setString(1, userName);
             removeUserFromRoleStmt.setString(2, roleName);
             removeUserFromRoleStmt.executeUpdate();
@@ -377,14 +423,13 @@
             throw new UserManagerException("errorModifyingUserStore", e);
         } finally {
             try {
-                if(dbConnection != null){
+                if (dbConnection != null) {
                     dbConnection.close();
                 }
             } catch (SQLException e) {
-                throw new UserManagerException("errorClosingConnection",e);
+                throw new UserManagerException("errorClosingConnection", e);
             }
         }
     }
 
-   
 }

Modified: 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
==============================================================================
--- 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
     (original)
+++ 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifier.java
     Fri Dec 21 00:38:59 2007
@@ -29,7 +29,6 @@
 import org.wso2.usermanager.UserStoreAdmin;
 import org.wso2.usermanager.readwrite.DefaultRealm;
 
-
 import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 
 public class EmailVerifier {
@@ -50,7 +49,7 @@
     private static final String GET_USER_PROPERTY_SQL = "select * from 
PENDING_USER_PROPERTIES where username=?";
     private static final String DELETE_USER_PROPERTY = "delete from 
PENDING_USER_PROPERTIES where username=?";
     private static final String ADD_USER_PROPERTY_SQL = "insert into 
PENDING_USER_PROPERTIES(username, property_name, property_value) values(?, ?, 
?)";
-    
+
     private static Connection dbConnection = null;
 
     /**
@@ -85,7 +84,8 @@
     public String getUserName(String confString) throws UserManagerException {
 
         try {
-            PreparedStatement getUserByConfStmt = 
dbConnection.prepareStatement(GET_USER_BY_CONF_SQL);
+            PreparedStatement getUserByConfStmt = dbConnection
+                    .prepareStatement(GET_USER_BY_CONF_SQL);
             getUserByConfStmt.setString(1, confString);
             ResultSet rs = getUserByConfStmt.executeQuery();
             if (rs.next()) {
@@ -106,17 +106,18 @@
         }
 
         boolean isConfirmed = false;
- 
+
         try {
-            PreparedStatement getUserByConfStmt = 
dbConnection.prepareStatement(GET_USER_BY_CONF_SQL);
+            PreparedStatement getUserByConfStmt = dbConnection
+                    .prepareStatement(GET_USER_BY_CONF_SQL);
             PreparedStatement getUserPropertyStmt = dbConnection
-            .prepareStatement(GET_USER_PROPERTY_SQL);
+                    .prepareStatement(GET_USER_PROPERTY_SQL);
 
             PreparedStatement deleteUserStmt = dbConnection
-            .prepareStatement(DELETE_USER_SQL);
+                    .prepareStatement(DELETE_USER_SQL);
             PreparedStatement deleteUserPropertyStmt = dbConnection
-            .prepareStatement(DELETE_USER_PROPERTY);
-            
+                    .prepareStatement(DELETE_USER_PROPERTY);
+
             getUserByConfStmt.setString(1, confString);
             ResultSet rs = getUserByConfStmt.executeQuery();
             if (rs.next()) {
@@ -140,7 +141,7 @@
                 deleteUserPropertyStmt.executeUpdate();
                 deleteUserStmt.setString(1, username);
                 deleteUserStmt.executeUpdate();
-                
+
                 dbConnection.commit();
 
                 getUserByConfStmt.close();
@@ -173,25 +174,26 @@
                 || password.length() == 0) {
             throw new UserManagerException("invalidData");
         }
-        
-        if(realm.getUserStoreReader().isExistingUser(username)){
+
+        if (realm.getUserStoreReader().isExistingUser(username)) {
             throw new UserManagerException("duplicateUser");
         }
-        
+
         try {
-            
-            PreparedStatement getUser = 
dbConnection.prepareStatement(GET_USER_BY_USER_SQL);
+
+            PreparedStatement getUser = dbConnection
+                    .prepareStatement(GET_USER_BY_USER_SQL);
             getUser.setString(1, username);
             ResultSet rs = getUser.executeQuery();
-            if(rs.next()){
-                throw new UserManagerException("duplicateUser"); 
+            if (rs.next()) {
+                throw new UserManagerException("duplicateUser");
             }
-            
+
             PreparedStatement addUserStmt = dbConnection
-            .prepareStatement(ADD_USER_SQL);
+                    .prepareStatement(ADD_USER_SQL);
             PreparedStatement addUserPropertyStmt = dbConnection
-            .prepareStatement(ADD_USER_PROPERTY_SQL);
-    
+                    .prepareStatement(ADD_USER_PROPERTY_SQL);
+
             Random random = new Random();
             byte[] temp = new byte[16];
             random.nextBytes(temp);
@@ -222,7 +224,7 @@
                     addUserPropertyStmt.setString(3, value);
                     addUserPropertyStmt.executeUpdate();
                 }
-                
+
                 dbConnection.commit();
                 addUserStmt.close();
                 addUserPropertyStmt.close();
@@ -248,7 +250,11 @@
             msg.setFrom(new InternetAddress(config.getFromAddress()));
             msg.setRecipient(Message.RecipientType.TO, new InternetAddress(
                     emailAddr));
-            msg.setSubject("EmailVerification");
+            if (config.getSubject().length() == 0) {
+                msg.setSubject(EmailVerifierConfig.DEFAULT_VALUE_SUBJECT);
+            } else {
+                msg.setSubject(config.getSubject());
+            }
 
             String responseMessage = getResponseMessage(confString, epr);
             msg.setText(responseMessage);
@@ -308,11 +314,16 @@
         }
     }
 
-    
-
     private String getResponseMessage(String confString, String epr) {
-        return "Please point your browser to : " + epr + "?" + CONF_STRING
-                + "=" + confString;
+        String msg = null;
+        if (config.getEmailBody().length() == 0) {
+            msg = EmailVerifierConfig.DEFAULT_VALUE_MESSAGE + epr + "?"
+                    + CONF_STRING + "=" + confString;
+        } else {
+            msg = config.getEmailBody() + epr + "?" + CONF_STRING + "="
+                    + confString;
+        }
+        return msg;
     }
 
 }

Modified: 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifierConfig.java
==============================================================================
--- 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifierConfig.java
       (original)
+++ 
trunk/commons/usermanager/modules/verification/src/main/java/org/wso2/usermanager/verification/email/EmailVerifierConfig.java
       Fri Dec 21 00:38:59 2007
@@ -1,6 +1,15 @@
 package org.wso2.usermanager.verification.email;
 
 public class EmailVerifierConfig {
+        
+    public final static String PORT = "mail.smtp.port";
+    public final static String HOST = "mail.smtp.host";
+    public final static String FROM_ADDRESS = "from";
+    public final static String USERNAME = "username";
+    public final static String PASSWORD = "password";
+      
+    public final static String DEFAULT_VALUE_SUBJECT = "EmailVerification";
+    public final static String DEFAULT_VALUE_MESSAGE = "Please point your 
browser to : ";
     /**
      * Mail server port
      */
@@ -30,12 +39,9 @@
 
     private String registrationServiceEPR;
     
-    public final static String PORT = "mail.smtp.port";
-    public final static String HOST = "mail.smtp.host";
-    public final static String FROM_ADDRESS = "from";
-    public final static String USERNAME = "username";
-    public final static String PASSWORD = "password";
-    public final static String DEFAULT_ROLE = "defaultRole";
+    private String subject = DEFAULT_VALUE_SUBJECT;
+    
+    private String emailBody = DEFAULT_VALUE_MESSAGE;
     
        public String getFromAddress() {
                return fromAddress;
@@ -84,6 +90,22 @@
        public void setRegistrationServiceEPR(String registrationServiceEPR) {
                this.registrationServiceEPR = registrationServiceEPR;
        }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject.trim();
+    }
+
+    public String getEmailBody() {
+        return emailBody;
+    }
+
+    public void setEmailBody(String emailMessage) {
+        this.emailBody = emailMessage.trim();
+    }
     
     
 

_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev

Reply via email to