Improve relative path determination using Java 7 Paths

James Moger

2014-10-10 a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3

 src/main/java/com/gitblit/servlet/FederationServlet.java

@@ -138,8 +138,11 @@
            return;

         }



         String url = HttpUtils.getGitblitURL(request);

         federationManager.submitFederationProposal(proposal, url);

         String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);

         if (StringUtils.isEmpty(gitblitUrl)) {

            gitblitUrl = HttpUtils.getGitblitURL(request);

         }

         federationManager.submitFederationProposal(proposal, gitblitUrl);

         logger.info(MessageFormat.format(

               "Submitted {0} federation proposal to pull {1} repositories from {2}",

               proposal.tokenType.name(), proposal.repositories.size(), proposal.url));

@@ -161,7 +164,7 @@


         // setup the last and netx pull dates

         results.lastPull = new Date();

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency);

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency, 5);

         results.nextPull = new Date(System.currentTimeMillis() + (mins * 60 * 1000L));



         // acknowledge the receipt of status

@@ -185,7 +188,10 @@


      Object result = null;

      if (FederationRequest.PULL_REPOSITORIES.equals(reqType)) {

         String gitblitUrl = HttpUtils.getGitblitURL(request);

         String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);

         if (StringUtils.isEmpty(gitblitUrl)) {

            gitblitUrl = HttpUtils.getGitblitURL(request);

         }

         result = federationManager.getRepositories(gitblitUrl, token);

      } else {

         if (FederationRequest.PULL_SETTINGS.equals(reqType)) {