Author: rdonkin
Date: Thu Dec 6 06:20:37 2007
New Revision: 601742
URL: http://svn.apache.org/viewvc?rev=601742&view=rev
Log:
Rename: not need to suffix with Instance.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
Thu Dec 6 06:20:37 2007
@@ -50,17 +50,17 @@
public Mailbox getInbox(User user) throws MailboxManagerException {
- return getMailboxManagerInstance().getMailbox(getInboxName(user),true);
+ return getMailboxManager().getMailbox(getInboxName(user),true);
}
- public MailboxManager getMailboxManagerInstance()
+ public MailboxManager getMailboxManager()
throws MailboxManagerException {
return mailboxManager;
}
public Mailbox getMailbox(User authUser, String mailboxName,
boolean autoCreate) throws MailboxManagerException {
- return getMailboxManagerInstance().getMailbox(
+ return getMailboxManager().getMailbox(
mailboxName, autoCreate);
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
Thu Dec 6 06:20:37 2007
@@ -27,7 +27,7 @@
public interface MailboxManagerProvider {
- public MailboxManager getMailboxManagerInstance() throws
MailboxManagerException;
+ public MailboxManager getMailboxManager() throws MailboxManagerException;
Mailbox getInbox(User user) throws MailboxManagerException;
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
Thu Dec 6 06:20:37 2007
@@ -54,7 +54,7 @@
if (result == null) {
// TODO: handle null user
final User user = ImapSessionUtils.getUser(session);
- result = mailboxManagerProvider.getMailboxManagerInstance();
+ result = mailboxManagerProvider.getMailboxManager();
result.createInbox(user);
// TODO: reconsider decision not to sunchronise
// TODO: mailbox creation is ATM an expensive operation
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
Thu Dec 6 06:20:37 2007
@@ -202,7 +202,7 @@
if (mailboxManager!=null) {
mailboxManager.close();
}
- mailboxManager=mailboxManagerProvider.getMailboxManagerInstance();
+ mailboxManager=mailboxManagerProvider.getMailboxManager();
mailboxManagerUser = user;
mailboxManager.createInbox(user);
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
Thu Dec 6 06:20:37 2007
@@ -83,7 +83,7 @@
((LogEnabled)session).enableLogging(new MockLogger());
handler = new ImapRequestHandler();
handler.enableLogging(new MockLogger());
-
mailboxManager=theConfigData.getMailboxManagerProvider().getMailboxManagerInstance();
+
mailboxManager=theConfigData.getMailboxManagerProvider().getMailboxManager();
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
Thu Dec 6 06:20:37 2007
@@ -35,7 +35,7 @@
public void setUp() throws Exception {
super.setUp();
assertEquals(0,MailboxRowPeer.doSelect(new Criteria()).size());
-
mm=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().getMailboxManagerInstance();
+
mm=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().getMailboxManager();
}
public void tearDown() {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
Thu Dec 6 06:20:37 2007
@@ -34,7 +34,7 @@
public void setUp() throws Exception {
TorqueMailboxManagerProviderSingleton.reset();
MailboxManagerProvider
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
- mailboxManager = mailboxManagerProvider.getMailboxManagerInstance();
+ mailboxManager = mailboxManagerProvider.getMailboxManager();
super.setUp();
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
Thu Dec 6 06:20:37 2007
@@ -33,7 +33,7 @@
public void setUp() throws Exception {
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
TorqueMailboxManagerProviderSingleton.reset();
- mailboxManager = mailboxManagerProvider.getMailboxManagerInstance();
+ mailboxManager = mailboxManagerProvider.getMailboxManager();
}
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java?rev=601742&r1=601741&r2=601742&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
Thu Dec 6 06:20:37 2007
@@ -134,7 +134,7 @@
try {
MailboxManager mailboxManager=
TorqueMailboxManagerProviderSingleton
.getTorqueMailboxManagerProviderInstance()
- .getMailboxManagerInstance();
+ .getMailboxManager();
if (!mailboxManager.existsMailbox(TUSER_INBOX)) {
mailboxManager.createMailbox(TUSER_INBOX);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
