create url from current request

scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java

@@ -52,6 +52,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -92,6 +94,33 @@ public class RepositoryUtil
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   *
+   * @param request
+   * @param repositoryManager
+   * @param repository
+   *
+   * @since 1.16
+   */
+  public static void appendUrl(HttpServletRequest request,
+                               RepositoryManager repositoryManager,
+                               Repository repository)
+  {
+    RepositoryHandler handler =
+      repositoryManager.getHandler(repository.getType());
+
+    if (handler != null)
+    {
+      String url = handler.createResourcePath(repository);
+
+      url = HttpUtil.getCompleteUrl(request, url);
+      repository.setUrl(url);
+    }
+  }
+
   /**
    * Method description
    *

scm-core/src/main/java/sonia/scm/util/HttpUtil.java

@@ -293,6 +293,34 @@ public class HttpUtil
 
   //~--- get methods ----------------------------------------------------------
 
+  /**
+   * Returns an absolute url with context path.
+   *
+   *
+   * @param request http client request
+   * @param pathSegments
+   *
+   * @return absolute url with context path
+   * @since 1.16
+   */
+  public static String getCompleteUrl(HttpServletRequest request,
+          String... pathSegments)
+  {
+    String baseUrl =
+      request.getRequestURL().toString().replace(request.getRequestURI(),
+        Util.EMPTY_STRING).concat(request.getContextPath());
+
+    if (Util.isNotEmpty(pathSegments))
+    {
+      for (String ps : pathSegments)
+      {
+        baseUrl = append(baseUrl, ps);
+      }
+    }
+
+    return baseUrl;
+  }
+
   /**
    * Return the complete url of the given path.
    *

scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java

@@ -47,6 +47,7 @@ import sonia.scm.repository.RepositoryUtil;
 import sonia.scm.template.TemplateHandler;
 import sonia.scm.url.UrlProvider;
 import sonia.scm.url.UrlProviderFactory;
+import sonia.scm.util.HttpUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -58,10 +59,13 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 /**
@@ -82,16 +86,13 @@ public class RepositoryRootResource
    *
    *
    *
-   * @param configuration
    * @param templateHandler
    * @param repositoryManager
    */
   @Inject
-  public RepositoryRootResource(ScmConfiguration configuration,
+  public RepositoryRootResource(TemplateHandler templateHandler,
-                                TemplateHandler templateHandler,
                                 RepositoryManager repositoryManager)
   {
-    this.configuration = configuration;
     this.templateHandler = templateHandler;
     this.repositoryManager = repositoryManager;
   }
@@ -102,6 +103,8 @@ public class RepositoryRootResource
    * Method description
    *
    *
+   *
+   * @param request
    * @param type
    *
    * @return
@@ -110,18 +113,19 @@ public class RepositoryRootResource
    */
   @GET
   @Produces(MediaType.TEXT_HTML)
-  public String renderRepositoriesRoot(@PathParam("type") final String type)
+  public String renderRepositoriesRoot(@Context HttpServletRequest request,
+          @PathParam("type") final String type)
           throws IOException
   {
     UrlProvider uiUrlProvider =
-      UrlProviderFactory.createUrlProvider(configuration.getBaseUrl(),
+      UrlProviderFactory.createUrlProvider(HttpUtil.getCompleteUrl(request),
         UrlProviderFactory.TYPE_WUI);
     //J-
     Collection<RepositoryTemplateElement> unsortedRepositories =
       Collections2.transform( 
         Collections2.filter(
             repositoryManager.getAll(), new RepositoryTypePredicate(type))
-        , new RepositoryTransformFunction(configuration, repositoryManager, uiUrlProvider)
+        , new RepositoryTransformFunction(request, repositoryManager, uiUrlProvider)
       );
     
     List<RepositoryTemplateElement> repositories = Ordering.from(
@@ -179,6 +183,18 @@ public class RepositoryRootResource
           repository.getId(), 0, 20);
     }
 
+    /**
+     * Method description
+     *
+     *
+     * @return
+     */
+    public String getDetailUrl()
+    {
+      return urlProvider.getRepositoryUrlProvider().getDetailUrl(
+          repository.getId());
+    }
+
     /**
      * Method description
      *
@@ -213,18 +229,6 @@ public class RepositoryRootResource
           repository.getId(), null, null);
     }
 
-    /**
-     * Method description
-     *
-     *
-     * @return
-     */
-    public String getDetailUrl()
-    {
-      return urlProvider.getRepositoryUrlProvider().getDetailUrl(
-          repository.getId());
-    }
-
     /**
      * Method description
      *
@@ -291,15 +295,16 @@ public class RepositoryRootResource
      *
      *
      *
-     * @param configuration
+     *
+     * @param request
      * @param repositoryManager
      * @param urlProvider
      */
-    public RepositoryTransformFunction(ScmConfiguration configuration,
+    public RepositoryTransformFunction(HttpServletRequest request,
                                        RepositoryManager repositoryManager,
                                        UrlProvider urlProvider)
     {
-      this.configuration = configuration;
+      this.request = request;
       this.repositoryManager = repositoryManager;
       this.urlProvider = urlProvider;
     }
@@ -317,7 +322,7 @@ public class RepositoryRootResource
     @Override
     public RepositoryTemplateElement apply(Repository repository)
     {
-      RepositoryUtil.appendUrl(configuration, repositoryManager, repository);
+      RepositoryUtil.appendUrl(request, repositoryManager, repository);
 
       return new RepositoryTemplateElement(repository, urlProvider);
     }
@@ -325,10 +330,10 @@ public class RepositoryRootResource
     //~--- fields -------------------------------------------------------------
 
     /** Field description */
-    private ScmConfiguration configuration;
+    private RepositoryManager repositoryManager;
 
     /** Field description */
-    private RepositoryManager repositoryManager;
+    private HttpServletRequest request;
 
     /** Field description */
     private UrlProvider urlProvider;
@@ -337,9 +342,6 @@ public class RepositoryRootResource
 
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
-  private ScmConfiguration configuration;
-
   /** Field description */
   private RepositoryManager repositoryManager;