Author: kwright
Date: Fri Dec 13 14:42:19 2013
New Revision: 1550742
URL: http://svn.apache.org/r1550742
Log:
Add support for IMAP-SSL and POP3-SSL
Modified:
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
Modified:
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java?rev=1550742&r1=1550741&r2=1550742&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
(original)
+++
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
Fri Dec 13 14:42:19 2013
@@ -53,7 +53,16 @@ public class EmailConfig {
*/
public static final String PROPERTIES_PARAM = "properties";
- public static final String PROTOCOL_DEFAULT_VALUE = "imap";
+ public static final String PROTOCOL_IMAP = "IMAP";
+ public static final String PROTOCOL_IMAP_PROVIDER = "imap";
+ public static final String PROTOCOL_IMAPS = "IMAP-SSL";
+ public static final String PROTOCOL_IMAPS_PROVIDER = "imaps";
+ public static final String PROTOCOL_POP3 = "POP3";
+ public static final String PROTOCOL_POP3_PROVIDER = "pop3";
+ public static final String PROTOCOL_POP3S = "POP3-SSL";
+ public static final String PROTOCOL_POP3S_PROVIDER = "pop3s";
+
+ public static final String PROTOCOL_DEFAULT_VALUE = "IMAP";
public static final String PORT_DEFAULT_VALUE = "25";
@@ -71,10 +80,6 @@ public class EmailConfig {
public static final String RELATIONSHIP_CHILD = "child";
- public static final String PROTOCOL_IMAP = "imap";
- public static final String PROTOCOL_IMAP_PROVIDER = "imaps";
- public static final String PROTOCOL_POP3 = "POP3";
- public static final String PROTOCOL_POP3_PROVIDER = "pop3";
public static final String FOLDER_INBOX = "INBOX";
public static final String EMAIL_SUBJECT = "subject";
public static final String EMAIL_FROM = "from";
Modified:
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1550742&r1=1550741&r2=1550742&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Fri Dec 13 14:42:19 2013
@@ -85,7 +85,9 @@ public class EmailConnector extends org.
{
providerMap = new HashMap<String,String>();
providerMap.put(EmailConfig.PROTOCOL_POP3,
EmailConfig.PROTOCOL_POP3_PROVIDER);
+ providerMap.put(EmailConfig.PROTOCOL_POP3S,
EmailConfig.PROTOCOL_POP3S_PROVIDER);
providerMap.put(EmailConfig.PROTOCOL_IMAP,
EmailConfig.PROTOCOL_IMAP_PROVIDER);
+ providerMap.put(EmailConfig.PROTOCOL_IMAPS,
EmailConfig.PROTOCOL_IMAPS_PROVIDER);
}
//////////////////////////////////Start of Basic Connector
Methods/////////////////////////
Modified:
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html?rev=1550742&r1=1550741&r2=1550742&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
(original)
+++
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
Fri Dec 13 14:42:19 2013
@@ -30,11 +30,21 @@ limitations under the License.
#else
<option value="IMAP">IMAP</option>
#end
+ #if($PROTOCOL == 'IMAP-SSL')
+ <option value="IMAP-SSL" selected="selected">IMAP-SSL</option>
+ #else
+ <option value="IMAP-SSL">IMAP-SSL</option>
+ #end
#if($PROTOCOL == 'POP3')
<option value="POP3" selected="selected">POP3</option>
#else
<option value="POP3">POP3</option>
#end
+ #if($PROTOCOL == 'POP3-SSL')
+ <option value="POP3-SSL" selected="selected">POP3-SSL</option>
+ #else
+ <option value="POP3-SSL">POP3-SSL</option>
+ #end
</select>
</td>
</tr>
