Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -100,6 +100,7 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
private int port = 143;
private int securePort = 993;
private boolean imapsEnabled = false;
private boolean imapEnabled = true;
private String host = "0.0.0.0";
@@ -198,12 +199,15 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
}
};
serverImpl = new ImapServer(new ServerSetup(port, host, ServerSetup.PROTOCOL_IMAP), imapManagers);
serverImpl.startService(null);
if (logger.isInfoEnabled())
if(isImapEnabled())
{
logger.info("IMAP service started on host:port " + host + ":" + this.port);
serverImpl = new ImapServer(new ServerSetup(port, host, ServerSetup.PROTOCOL_IMAP), imapManagers);
serverImpl.startService(null);
if (logger.isInfoEnabled())
{
logger.info("IMAP service started on host:port " + host + ":" + this.port);
}
}
if(isImapsEnabled())
{
@@ -255,4 +259,14 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
{
return imapsEnabled;
}
public void setImapEnabled(boolean imapEnabled)
{
this.imapEnabled = imapEnabled;
}
public boolean isImapEnabled()
{
return imapEnabled;
}
}