James Moger
2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b
src/com/gitblit/GitBlitServer.java
@@ -161,10 +161,12 @@
      logger.info("");
      logger.info(Constants.BORDER);
      System.setProperty("java.awt.headless", "true");
      String osname = System.getProperty("os.name");
      String osversion = System.getProperty("os.version");
      logger.info("Running on " + osname + " (" + osversion + ")");
      List<Connector> connectors = new ArrayList<Connector>();
      // conditionally configure the http connector
@@ -278,11 +280,11 @@
         if (StringUtils.isEmpty(params.ldapLdifFile) == false) {
            File ldifFile = new File(params.ldapLdifFile);
            if (ldifFile != null && ldifFile.exists()) {
               URI ldapUrl = new URI(settings.getRequiredString(Keys.realm.ldap_server));
               URI ldapUrl = new URI(settings.getRequiredString(Keys.realm.ldap.server));
               String firstLine = new Scanner(ldifFile).nextLine();
               String rootDN = firstLine.substring(4);
               String bindUserName = settings.getString(Keys.realm.ldap_username, "");
               String bindPassword = settings.getString(Keys.realm.ldap_password, "");
               String bindUserName = settings.getString(Keys.realm.ldap.username, "");
               String bindPassword = settings.getString(Keys.realm.ldap.password, "");
               
               // Get the port
               int port = ldapUrl.getPort();