Issue #1258 - Part 1: Import mailnews, ldap, and mork from comm-esr52.9.1

5 files changed, 264 insertions, 0 deletions

diff --git a/mailnews/base/ispdata/README b/mailnews/base/ispdata/README
new file mode 100644
index 000000000..a4848db9f
--- /dev/null
+++ b/mailnews/base/ispdata/README
@@ -0,0 +1,3 @@
+gmail.rdf is up to date and is a good example to use for POP3 
+movemail.rdf is new, from pkw@us.ibm.com
+aol.rdf is a bad example, it was used by Netscape 7.x
diff --git a/mailnews/base/ispdata/aol.rdf b/mailnews/base/ispdata/aol.rdf
new file mode 100644
index 000000000..901b234b8
--- /dev/null
+++ b/mailnews/base/ispdata/aol.rdf
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<!DOCTYPE RDF 
+ [
+  <!ENTITY aol.wizardLongName         "AOL account (For example, jsmith@aol.com)">
+  <!ENTITY aol.emailIDFieldTitle      "Screen Name:">
+  <!ENTITY aol.emailIDDescription     "screen name">
+  <!ENTITY aol.prettyName     "AOL Mail">
+ ]
+>
+
+<RDF:RDF
+    xmlns:NC="http://home.netscape.com/NC-rdf#"
+    xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <RDF:Description about="NC:ispinfo">
+    <NC:providers>
+      <NC:nsIMsgAccount about="domain:aol.com">
+
+        <!-- server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:prettyName>&aol.prettyName;</NC:prettyName>
+            <NC:hostName>imap.mail.aol.com</NC:hostName>
+            <NC:type>imap
+            <NC:ServerType-imap>                                                
+              <NC:nsIImapIncomingServer>                                        
+                <NC:deleteModel>2</NC:deleteModel>                              
+              </NC:nsIImapIncomingServer>                                       
+            </NC:ServerType-imap>                                               
+            </NC:type>
+            <NC:offlineSupportLevel>0</NC:offlineSupportLevel>
+            <NC:defaultCopiesAndFoldersPrefsToServer>false</NC:defaultCopiesAndFoldersPrefsToServer>
+            <NC:canCreateFoldersOnServer>false</NC:canCreateFoldersOnServer>
+            <NC:canCompactFoldersOnServer>false</NC:canCompactFoldersOnServer>
+            <NC:canUndoDeleteOnServer>false</NC:canUndoDeleteOnServer>
+            <NC:canSearchMessages>false</NC:canSearchMessages>
+            <NC:canFileMessagesOnServer>false</NC:canFileMessagesOnServer>
+            <NC:canEmptyTrashOnExit>false</NC:canEmptyTrashOnExit>
+            <NC:isSecureServer>false</NC:isSecureServer>
+            <NC:canSearchMessages>false</NC:canSearchMessages>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+            <NC:composeHtml>true</NC:composeHtml>
+            <NC:doFcc>false</NC:doFcc>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+
+        <NC:smtp>
+          <NC:nsISmtpServer>
+            <NC:hostname>smtp.aol.com</NC:hostname>
+          </NC:nsISmtpServer>
+        </NC:smtp>
+
+        <!-- other options... see http://www.mozilla.org/mailnews/?? -->
+
+        <NC:smtpRequiresUsername>true</NC:smtpRequiresUsername>
+        <NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
+        <NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
+
+        <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
+        <NC:wizardShortName>AOL</NC:wizardShortName>
+        <NC:wizardLongName>&aol.wizardLongName;</NC:wizardLongName>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:emailProviderName>AOL</NC:emailProviderName>
+        <NC:sampleEmail>screenname@aol.com</NC:sampleEmail>
+        <NC:sampleUserName>screenname</NC:sampleUserName>
+        <NC:emailIDDescription>&aol.emailIDDescription;</NC:emailIDDescription>
+        <NC:emailIDFieldTitle>&aol.emailIDFieldTitle;</NC:emailIDFieldTitle>
+        <NC:showServerDetailsOnWizardSummary>false</NC:showServerDetailsOnWizardSummary>
+      </NC:nsIMsgAccount>
+    </NC:providers>
+  </RDF:Description>
+
+</RDF:RDF>
diff --git a/mailnews/base/ispdata/gmail.rdf b/mailnews/base/ispdata/gmail.rdf
new file mode 100644
index 000000000..97a5d244d
--- /dev/null
+++ b/mailnews/base/ispdata/gmail.rdf
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE RDF>
+<RDF:RDF
+    xmlns:NC="http://home.netscape.com/NC-rdf#"
+    xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <RDF:Description about="NC:ispinfo">
+    <NC:providers>
+      <!-- Gmail IMAP access -->
+      <NC:nsIMsgAccount about="domain:gmail.com?type=imap">
+        <!-- IMAP server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:prettyName>Gmail</NC:prettyName>
+            <NC:hostName>imap.gmail.com</NC:hostName>
+            <NC:type>imap</NC:type>
+            <NC:ServerType-imap>
+              <NC:nsIImapIncomingServer>
+                <NC:usingSubscription>false</NC:usingSubscription>
+                <!-- IMAP delete model: "remove it immediately". -->
+                <NC:deleteModel>2</NC:deleteModel>
+                <NC:trashFolderName>[Gmail]/Trash</NC:trashFolderName>
+              </NC:nsIImapIncomingServer>
+            </NC:ServerType-imap>
+            <NC:loginAtStartUp>true</NC:loginAtStartUp>
+            <NC:port>993</NC:port>
+            <NC:socketType>3</NC:socketType>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- SMTP server info -->
+        <NC:smtp>
+          <NC:nsISmtpServer>
+            <NC:hostname>smtp.gmail.com</NC:hostname>
+            <NC:port>587</NC:port>
+            <NC:trySSL>2</NC:trySSL>
+            <NC:description>Gmail SMTP</NC:description>
+          </NC:nsISmtpServer>
+        </NC:smtp>
+        <NC:smtpRequiresUsername>true</NC:smtpRequiresUsername>
+        <NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
+        <NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+            <!-- Don't store sent mail in a Sent folder, as Gmail will show it
+                 in [Gmail]/Sent Mail anyway. -->
+            <NC:doFcc>false</NC:doFcc>
+            <NC:FccFolder>[Gmail]/Sent Mail</NC:FccFolder>
+            <NC:DraftFolder>[Gmail]/Drafts</NC:DraftFolder>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+
+        <!-- other options -->
+        <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
+        <NC:wizardShortName>Gmail</NC:wizardShortName>
+        <NC:wizardLongName>Gmail IMAP</NC:wizardLongName>
+        <NC:wizardLongNameAccesskey>M</NC:wizardLongNameAccesskey>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:emailProviderName>Gmail</NC:emailProviderName>
+        <NC:sampleEmail>example@gmail.com</NC:sampleEmail>
+        <NC:sampleUserName>example</NC:sampleUserName>
+        <NC:emailIDDescription>Gmail Username:</NC:emailIDDescription>
+        <NC:showServerDetailsOnWizardSummary>true</NC:showServerDetailsOnWizardSummary>
+      </NC:nsIMsgAccount>
+
+      <NC:nsIMsgAccount about="domain:gmail.com?type=pop3">
+        <!-- pop3 server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:prettyName>Gmail</NC:prettyName>
+            <NC:hostName>pop.gmail.com</NC:hostName>
+            <NC:type>pop3</NC:type>
+            <NC:ServerType-pop3>
+              <NC:nsIPopIncomingServer>
+                <NC:leaveMessagesOnServer>true</NC:leaveMessagesOnServer>
+                <NC:deleteMailLeftOnServer>false</NC:deleteMailLeftOnServer>
+              </NC:nsIPopIncomingServer>
+            </NC:ServerType-pop3>
+            <NC:loginAtStartUp>true</NC:loginAtStartUp>
+            <NC:downloadOnBiff>true</NC:downloadOnBiff>
+            <NC:port>995</NC:port>
+            <NC:socketType>3</NC:socketType>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- smtp server info -->
+        <NC:smtp>
+          <NC:nsISmtpServer>
+            <NC:hostname>smtp.gmail.com</NC:hostname>
+            <NC:port>587</NC:port>
+            <NC:trySSL>2</NC:trySSL>
+            <NC:description>Gmail</NC:description>
+          </NC:nsISmtpServer>
+        </NC:smtp>
+        <NC:smtpRequiresUsername>true</NC:smtpRequiresUsername>
+        <NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
+        <NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+
+        <!-- other options -->
+        <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
+        <NC:wizardShortName>Gmail</NC:wizardShortName>
+        <NC:wizardLongName>Gmail POP</NC:wizardLongName>
+        <NC:wizardLongNameAccesskey>G</NC:wizardLongNameAccesskey>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:emailProviderName>Gmail</NC:emailProviderName>
+        <NC:sampleEmail>example@gmail.com</NC:sampleEmail>
+        <NC:sampleUserName>example</NC:sampleUserName>
+        <NC:emailIDDescription>Gmail Username:</NC:emailIDDescription>
+        <NC:showServerDetailsOnWizardSummary>true</NC:showServerDetailsOnWizardSummary>
+      </NC:nsIMsgAccount>
+    </NC:providers>
+  </RDF:Description>
+</RDF:RDF>
diff --git a/mailnews/base/ispdata/movemail.rdf b/mailnews/base/ispdata/movemail.rdf
new file mode 100644
index 000000000..554bc6ccb
--- /dev/null
+++ b/mailnews/base/ispdata/movemail.rdf
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RDF:RDF
+    xmlns:NC="http://home.netscape.com/NC-rdf#"
+    xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <RDF:Description about="NC:ispinfo">
+    <NC:providers>
+      <NC:nsIMsgAccount about="domain:">
+
+        <!-- server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:hostName>localhost</NC:hostName>
+            <NC:type>movemail</NC:type>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+            <NC:composeHtml>false</NC:composeHtml>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+
+        <NC:wizardHideIncoming>true</NC:wizardHideIncoming>
+        <NC:wizardSkipPanels>incomingpage</NC:wizardSkipPanels>
+        <NC:wizardShortName>Movemail</NC:wizardShortName>
+        <NC:wizardLongName>Unix Mailspool (Movemail)</NC:wizardLongName>
+        <NC:wizardLongNameAccesskey>U</NC:wizardLongNameAccesskey>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:emailProviderName>Movemail</NC:emailProviderName>
+
+        <NC:showServerDetailsOnWizardSummary>true</NC:showServerDetailsOnWizardSummary> 
+      </NC:nsIMsgAccount>
+    </NC:providers>
+  </RDF:Description>
+
+</RDF:RDF>
diff --git a/mailnews/base/ispdata/moz.build b/mailnews/base/ispdata/moz.build
new file mode 100644
index 000000000..7d3f82e91
--- /dev/null
+++ b/mailnews/base/ispdata/moz.build
@@ -0,0 +1,8 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Disable movemail for Thunderbird on OSX
+if CONFIG['MOZ_MOVEMAIL'] and not (CONFIG['MOZ_THUNDERBIRD'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa'):
+    FINAL_TARGET_FILES.isp += ['movemail.rdf']