upd: rename sendmail to sendMail

Change-Id: Ibd6448de53e03f4f9ccb322b47a6e49aca7d1a7f

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index b66ba3f9aa71bcc88f7b1b6247a55063d3070d05..ed61aeca2f6cf3ddab0c35f43c7a1e25ebb04031 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -25,7 +25,7 @@ import org.cacert.gigi.util.DNSUtil;
 
 public abstract class EmailProvider {
 
-    public abstract void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException;
+    public abstract void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException;
 
     private static EmailProvider instance;
 
@@ -99,7 +99,7 @@ public abstract class EmailProvider {
                     BufferedReader br = br0;
                     PrintWriter pw = pw0;
                     String line;
-                    if ( !Sendmail.readSMTPResponse(br, 220)) {
+                    if ( !SendMail.readSMTPResponse(br, 220)) {
                         continue;
                     }
 
@@ -120,7 +120,7 @@ public abstract class EmailProvider {
                     if (starttls) {
                         pw.print("STARTTLS\r\n");
                         pw.flush();
-                        if ( !Sendmail.readSMTPResponse(br, 220)) {
+                        if ( !SendMail.readSMTPResponse(br, 220)) {
                             continue;
                         }
                         Socket s1 = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(s, host, 25, true);
@@ -128,7 +128,7 @@ public abstract class EmailProvider {
                         pw = new PrintWriter(new OutputStreamWriter(s1.getOutputStream(), "UTF-8"));
                         pw.print("EHLO www.cacert.org\r\n");
                         pw.flush();
-                        if ( !Sendmail.readSMTPResponse(br, 250)) {
+                        if ( !SendMail.readSMTPResponse(br, 250)) {
                             continue;
                         }
                     }
@@ -136,18 +136,18 @@ public abstract class EmailProvider {
                     pw.print("MAIL FROM: <returns@cacert.org>\r\n");
                     pw.flush();
 
-                    if ( !Sendmail.readSMTPResponse(br, 250)) {
+                    if ( !SendMail.readSMTPResponse(br, 250)) {
                         continue;
                     }
                     pw.print("RCPT TO: <" + address + ">\r\n");
                     pw.flush();
 
-                    if ( !Sendmail.readSMTPResponse(br, 250)) {
+                    if ( !SendMail.readSMTPResponse(br, 250)) {
                         continue;
                     }
                     pw.print("QUIT\r\n");
                     pw.flush();
-                    if ( !Sendmail.readSMTPResponse(br, 221)) {
+                    if ( !SendMail.readSMTPResponse(br, 221)) {
                         continue;
                     }
 

diff --git a/src/org/cacert/gigi/email/MailProbe.java b/src/org/cacert/gigi/email/MailProbe.java
index 41fc99a5d3f5b72cd7509270bf45be5beb79a02f..987c036ef5203b85ddd9e471730bcd131052dbe9 100644 (file)
--- a/src/org/cacert/gigi/email/MailProbe.java
+++ b/src/org/cacert/gigi/email/MailProbe.java
@@ -22,7 +22,7 @@ public class MailProbe {
         body.append(l.getTranslation("Best regards"));
         body.append("\n");
         body.append(l.getTranslation("SomeCA.org Support!"));
-        EmailProvider.getInstance().sendmail(address, "[SomeCA.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false);
+        EmailProvider.getInstance().sendMail(address, "[SomeCA.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false);
     }
 
 }

diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/SendMail.java
similarity index 96%
rename from src/org/cacert/gigi/email/Sendmail.java
rename to src/org/cacert/gigi/email/SendMail.java
index a65b13262d659c9ba98218f6010d8f6284751d3d..43c07e8ae593f2841d46051d834f6cb4ef0d88d2 100644 (file)
--- a/src/org/cacert/gigi/email/Sendmail.java
+++ b/src/org/cacert/gigi/email/SendMail.java
@@ -17,13 +17,13 @@ import java.util.regex.Pattern;
 import org.cacert.gigi.util.PEM;
 import org.cacert.gigi.util.ServerConstants;
 
-public class Sendmail extends EmailProvider {
+public class SendMail extends EmailProvider {
 
     private final String targetHost;
 
     private final int targetPort;
 
-    protected Sendmail(Properties props) {
+    protected SendMail(Properties props) {
         targetHost = props.getProperty("emailProvider.smtpHost", "localhost");
         targetPort = Integer.parseInt(props.getProperty("emailProvider.smtpPort", "25"));
     }
@@ -31,7 +31,7 @@ public class Sendmail extends EmailProvider {
     private static final Pattern NON_ASCII = Pattern.compile("[^a-zA-Z0-9 .-\\[\\]!_@]");
 
     @Override
-    public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+    public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
 
         String[] bits = from.split(",");
 

diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java
index 496c0e1e7d2d9e9305c49a630dce85c453ee06c5..7ba5d73c15d9599d4d3b390af2e96bf7d317519c 100644 (file)
--- a/src/org/cacert/gigi/pages/PasswordResetPage.java
+++ b/src/org/cacert/gigi/pages/PasswordResetPage.java
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.email.Sendmail;
+import org.cacert.gigi.email.SendMail;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.SprintfCommand;
@@ -137,7 +137,7 @@ public class PasswordResetPage extends Page {
             outMail.print("\n");
             outMail.print(l.getTranslation("SomeCA.org Support!"));
             outMail.close();
-            Sendmail.getInstance().sendmail(Page.getUser(req).getEmail(), "[SomeCA.org] " + subject, sw.toString(), "support@cacert.org", null, null, null, null, false);
+            SendMail.getInstance().sendMail(Page.getUser(req).getEmail(), "[SomeCA.org] " + subject, sw.toString(), "support@cacert.org", null, null, null, null, false);
             out.println(Page.getLanguage(req).getTranslation("Password reset successful."));
         } catch (IOException e) {
             e.printStackTrace();

diff --git a/tests/org/cacert/gigi/email/TestEmailProviderClass.java b/tests/org/cacert/gigi/email/TestEmailProviderClass.java
index 3b38bc2646730cbc5fab25d5949e5c42a5edd0b8..1ebb8117dd0b9775f5407bc95ffc52e56b79b790 100644 (file)
--- a/tests/org/cacert/gigi/email/TestEmailProviderClass.java
+++ b/tests/org/cacert/gigi/email/TestEmailProviderClass.java
@@ -47,7 +47,7 @@ public class TestEmailProviderClass extends ConfiguredTest {
     @BeforeClass
     public static void initMailsystem() throws NoSuchAlgorithmException, KeyManagementException {
         Properties prop = new Properties();
-        prop.setProperty("emailProvider", "org.cacert.gigi.email.Sendmail");
+        prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail");
         EmailProvider.initSystem(prop, null, null);
         SSLContext c = SSLContext.getInstance("TLS");
         c.init(null, new TrustManager[] {

diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java
index f918e3fe11dbeb6698966cdc9ab200df92e8b453..5ddd75080fe318da796e0bec0fa706352ac18d78 100644 (file)
--- a/tests/org/cacert/gigi/email/TestSendmail.java
+++ b/tests/org/cacert/gigi/email/TestSendmail.java
@@ -55,7 +55,7 @@ public class TestSendmail extends ConfiguredTest {
 
         String subj = "subj-" + createUniqueName();
         String msg = "msg-" + createUniqueName();
-        EmailProvider.getInstance().sendmail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false);
+        EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false);
 
         try (Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);//
                 PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);//
@@ -110,7 +110,7 @@ public class TestSendmail extends ConfiguredTest {
     private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException {
         assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort"));
         Properties prop = new Properties();
-        prop.setProperty("emailProvider", "org.cacert.gigi.email.Sendmail");
+        prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail");
         prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost"));
         prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort"));
         KeyPair kp = generateKeypair();

diff --git a/tests/org/cacert/gigi/testUtils/BusinessTest.java b/tests/org/cacert/gigi/testUtils/BusinessTest.java
index 408b518bb50d0ee02de31561f34c64a3fbb93f41..c014e2b3a22c427ab811ec9c9304eb360da5993a 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/BusinessTest.java
+++ b/tests/org/cacert/gigi/testUtils/BusinessTest.java
@@ -38,7 +38,7 @@ public abstract class BusinessTest extends ConfiguredTest {
         }
 
         @Override
-        public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+        public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
             TestMail tm = new TestEmailReceiver.TestMail(to, subject, message, fromname, replyto) {
 
                 @Override

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index d7818312ec0a6829ec3c33a80fa355bbe8c03bce..27b166f9667c35109839d9a4fccd404f117831fb 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
@@ -273,7 +273,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable,
     }
 
     @Override
-    public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+    public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
         mails.add(new TestMail(to, subject, message, from, replyto));
     }
 

diff --git a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java b/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
index 108dd646fc1ab376c50b1feda643a1416a25569c..e23f47588fa553014b262659517b33b32ce8015f 100644 (file)
--- a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
+++ b/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
@@ -8,7 +8,7 @@ public class CommandlineEmailProvider extends EmailProvider {
     public CommandlineEmailProvider(Properties p) {}
 
     @Override
-    public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+    public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
         synchronized (System.out) {
             System.out.println("== MAIL ==");
             System.out.println("To: " + to);

diff --git a/util-testing/org/cacert/gigi/email/TestEmailProvider.java b/util-testing/org/cacert/gigi/email/TestEmailProvider.java
index bee64f4bc3f1b6a4458eb73babfc8257cf558305..740120271a0f3e57edc00265bb2298c3eac66ae4 100644 (file)
--- a/util-testing/org/cacert/gigi/email/TestEmailProvider.java
+++ b/util-testing/org/cacert/gigi/email/TestEmailProvider.java
@@ -45,10 +45,10 @@ public class TestEmailProvider extends EmailProvider {
     }
 
     @Override
-    public synchronized void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+    public synchronized void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
         while (true) {
             if ( !assureLocalConnection() && target != null) {
-                target.sendmail(to, subject, message, from, replyto, toname, fromname, errorsto, extra);
+                target.sendMail(to, subject, message, from, replyto, toname, fromname, errorsto, extra);
                 return;
             }
             try {

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 6a3f4196e028a25194b89ba37113462ff945883c..dfa4b5a4ee85a7902264e98c0d7170862fa641a9 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -148,7 +148,7 @@ public class Manager extends Page {
         }
 
         @Override
-        public synchronized void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+        public synchronized void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
             HashMap<String, LinkedList<String>> mails = Manager.getInstance().emails;
             LinkedList<String> hismails = mails.get(to);
             if (hismails == null) {