Renamed GitblitUserService, sendMail method, sendmail.groovy, and Repositor...

James Moger

2011-12-20 eb96eab513101783a750c13419de6bdce3d2fa4c

 src/com/gitblit/GitBlit.java

@@ -743,8 +743,8 @@
               "gitblit", null, "preReceiveScript")));

         model.postReceiveScripts = new ArrayList<String>(Arrays.asList(config.getStringList(

               "gitblit", null, "postReceiveScript")));

         model.mailRecipients = new ArrayList<String>(Arrays.asList(config.getStringList(

               "gitblit", null, "mailRecipient")));

         model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(

               "gitblit", null, "mailingList")));

      }

      r.close();

      return model;

@@ -971,8 +971,8 @@
         config.setStringList("gitblit", null, "postReceiveScript",

               repository.postReceiveScripts);

      }

      if (repository.mailRecipients != null) {

         config.setStringList("gitblit", null, "mailRecipient", repository.mailRecipients);

      if (repository.mailingLists != null) {

         config.setStringList("gitblit", null, "mailingList", repository.mailingLists);

      }

      try {

         config.save();

@@ -1485,7 +1485,7 @@
    * @param subject

    * @param message

    */

   public void sendEmailToAdministrators(String subject, String message) {

   public void sendMailToAdministrators(String subject, String message) {

      try {

         Message mail = mailExecutor.createMessageForAdministrators();

         if (mail != null) {

@@ -1505,8 +1505,8 @@
    * @param message

    * @param toAddresses

    */

   public void sendEmail(String subject, String message, ArrayList<String> toAddresses) {

      this.sendEmail(subject, message, toAddresses.toArray(new String[0]));

   public void sendMail(String subject, String message, ArrayList<String> toAddresses) {

      this.sendMail(subject, message, toAddresses.toArray(new String[0]));

   }



   /**

@@ -1516,7 +1516,7 @@
    * @param message

    * @param toAddresses

    */

   public void sendEmail(String subject, String message, String... toAddresses) {

   public void sendMail(String subject, String message, String... toAddresses) {

      try {

         Message mail = mailExecutor.createMessage(toAddresses);

         if (mail != null) {

@@ -1634,11 +1634,7 @@
            loginService = (IUserService) realmClass.newInstance();

         }

      } catch (Throwable t) {

         loginService = new UserServiceWrapper() {

            @Override

            public void setupService(IStoredSettings settings) {

            }

         };

         loginService = new GitblitUserService();

      }

      setUserService(loginService);

      mailExecutor = new MailExecutor(settings);