Author: norman
Date: Sat Jun 5 07:07:14 2010
New Revision: 951664
URL: http://svn.apache.org/viewvc?rev=951664&view=rev
Log:
Store password in User class
Removed:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PasswordAwareMailboxSession.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PasswordAwareUser.java
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
Sat Jun 5 07:07:14 2010
@@ -18,19 +18,14 @@
****************************************************************/
package org.apache.james.imap.jcr;
-import java.util.ArrayList;
-import java.util.Locale;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.imap.jcr.mail.JCRMailboxMapper;
import org.apache.james.imap.jcr.mail.model.JCRMailbox;
-import org.apache.james.imap.mailbox.BadCredentialsException;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.Authenticator;
-import org.apache.james.imap.store.PasswordAwareMailboxSession;
import org.apache.james.imap.store.StoreMailboxManager;
import org.apache.james.imap.store.StoreMessageManager;
import org.apache.james.imap.store.Subscriber;
@@ -72,29 +67,4 @@ public class JCRMailboxManager extends S
});
}
-
- /**
- * Return a {...@link PasswordAwareMailboxSession} if the login was
successful
- *
- * (non-Javadoc)
- * @see
org.apache.james.imap.store.StoreMailboxManager#login(java.lang.String,
java.lang.String, org.apache.commons.logging.Log)
- */
- public MailboxSession login(String userid, String passwd, Log log) throws
BadCredentialsException, MailboxException {
- if (login(userid, passwd)) {
- return new PasswordAwareMailboxSession(randomId(), userid, passwd,
log, getDelimiter(), new ArrayList<Locale>());
- } else {
- throw new BadCredentialsException();
- }
- }
-
-
- /**
- * Logout every open JCR Session
- */
- @Override
- public void endProcessingRequest(MailboxSession session) {
- super.endProcessingRequest(session);
- }
-
-
}
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
Sat Jun 5 07:07:14 2010
@@ -24,7 +24,7 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.store.PasswordAwareUser;
+import org.apache.james.imap.mailbox.MailboxSession.User;
/**
* Manage JCR {...@link Session}. It use the username and the password of
@@ -50,7 +50,7 @@ public class MailboxSessionJCRRepository
* @throws RepositoryException
*/
public Session login(MailboxSession session) throws RepositoryException {
- PasswordAwareUser user = (PasswordAwareUser) session.getUser();
+ User user = session.getUser();
String username = user.getUserName();
String password = user.getPassword();
char[] pass = null;
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
Sat Jun 5 07:07:14 2010
@@ -74,6 +74,13 @@ public interface MailboxSession {
public String getUserName();
/**
+ * Return the Password for the logged in user
+ *
+ * @return password
+ */
+ public String getPassword();
+
+ /**
* Gets acceptable localisation for this user in preference order.
* When localising a phrase, each <code>Locale</code> should be
* tried in order until an appropriate translation is obtained.
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
Sat Jun 5 07:07:14 2010
@@ -48,18 +48,21 @@ public class SimpleMailboxSession implem
private final String userName;
+ private final String password;
+
private boolean open;
private final List<Locale> localePreferences;
private final Map<Object, Object> attributes;
- public SimpleMailboxSession(final long sessionId, final String userName,
final Log log, char deliminator,
+ public SimpleMailboxSession(final long sessionId, final String userName,
final String password, final Log log, char deliminator,
final List<Locale> localePreferences) {
super();
this.sessionId = sessionId;
this.log = log;
this.userName = userName;
+ this.password = password;
sharedSpaces = new ArrayList<Namespace>();
otherUsersSpace = null;
personalSpace = new SimpleMailboxNamespace(deliminator, "");
@@ -165,4 +168,12 @@ public class SimpleMailboxSession implem
return attributes;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.mailbox.MailboxSession.User#getPassword()
+ */
+ public String getPassword() {
+ return password;
+ }
+
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
Sat Jun 5 07:07:14 2010
@@ -369,7 +369,7 @@ public abstract class StoreMailboxManage
* @see
org.apache.james.imap.mailbox.MailboxManager#createSystemSession(java.lang.String,
org.apache.commons.logging.Log)
*/
public MailboxSession createSystemSession(String userName, Log log) {
- return createSession(userName, log);
+ return createSession(userName, null, log);
}
@@ -380,8 +380,8 @@ public abstract class StoreMailboxManage
* @param log
* @return session
*/
- private SimpleMailboxSession createSession(String userName, Log log) {
- return new SimpleMailboxSession(randomId(), userName, log, delimiter,
new ArrayList<Locale>());
+ private SimpleMailboxSession createSession(String userName, String
password, Log log) {
+ return new SimpleMailboxSession(randomId(), userName, password, log,
delimiter, new ArrayList<Locale>());
}
@@ -459,7 +459,7 @@ public abstract class StoreMailboxManage
*/
public MailboxSession login(String userid, String passwd, Log log) throws
BadCredentialsException, MailboxException {
if (login(userid, passwd)) {
- return createSession(userid, log);
+ return createSession(userid, passwd, log);
} else {
throw new BadCredentialsException();
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=951664&r1=951663&r2=951664&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Sat Jun 5 07:07:14 2010
@@ -360,11 +360,11 @@ public class TorqueMailboxManager implem
}
public MailboxSession createSystemSession(String userName, Log log) {
- return createSession(userName, log);
+ return createSession(userName, null, log);
}
- private MailboxSession createSession(String userName, Log log) {
- return new SimpleMailboxSession(random.nextLong(), userName, log,
delimiter, new ArrayList<Locale>());
+ private MailboxSession createSession(String userName, String password, Log
log) {
+ return new SimpleMailboxSession(random.nextLong(), userName, password,
log, delimiter, new ArrayList<Locale>());
}
public String resolve(final String userName, String mailboxPath) {
@@ -401,7 +401,7 @@ public class TorqueMailboxManager implem
public MailboxSession login(String userid, String passwd, Log log) throws
BadCredentialsException, MailboxException {
if (login(userid, passwd)) {
- return createSession(userid, log);
+ return createSession(userid, passwd, log);
} else {
throw new BadCredentialsException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
