Elevate the public key manager to a top-level manager

James Moger

2014-03-17 245836904ba5cecdc31773cf7c9616396c8ad8c0

 src/test/java/com/gitblit/tests/GitBlitSuite.java

@@ -61,7 +61,7 @@
      MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,

      DiffUtilsTest.class, MetricUtilsTest.class, X509UtilsTest.class,

      GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,

      GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class, SshDaemonTest.class,

      SshDaemonTest.class, GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class,

      FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdAuthenticationTest.class,

      ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,
      BranchTicketServiceTest.class, RedisTicketServiceTest.class, AuthenticationManagerTest.class })
@@ -78,20 +78,12 @@
   static int port = 8280;

   static int gitPort = 8300;

   static int shutdownPort = 8281;

   static int sshPort = 29418;



// Overriding of keys doesn't seem to work

//   static {

//      try {

//         sshPort = SshUtils.getFreePort();

//      } catch (Exception e) {

//         e.printStackTrace();

//      }

//   }

   static int sshPort = 39418;



   public static String url = "http://localhost:" + port;

   public static String gitServletUrl = "http://localhost:" + port + "/git";

   public static String gitDaemonUrl = "git://localhost:" + gitPort;

   public static String sshDaemonUrl = "ssh://admin@localhost:" + sshPort;

   public static String account = "admin";

   public static String password = "admin";



@@ -149,9 +141,7 @@
                  "" + shutdownPort, "--gitPort", "" + gitPort, "--repositoriesFolder",

                  "\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",

                  GitBlitSuite.USERSCONF.getAbsolutePath(), "--settings", GitBlitSuite.SETTINGS.getAbsolutePath(),

                  "--baseFolder", "data");

            // doesn't work

            //, "--sshPort", "" + sshPort);

                  "--baseFolder", "data", "--sshPort", "" + sshPort);

         }

      });