svn commit: r1343830 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services: AbstractRestService.java DefaultManagedRepositoriesService.java

[olamy]

Author: olamy
Date: Tue May 29 16:35:33 2012
New Revision: 1343830

URL: http://svn.apache.org/viewvc?rev=1343830&view=rev
Log:
this is fixed now

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1343830&r1=1343829&r2=1343830&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 Tue May 29 16:35:33 2012
@@ -130,7 +130,7 @@ public abstract class AbstractRestServic
                 : redbackRequestInformation.getUser().getUsername() );
     }
 
-    protected String getBaseUrl( HttpServletRequest req )
+    protected String getBaseUrl()
         throws RepositoryAdminException
     {
         String applicationUrl = 
archivaAdministration.getUiConfiguration().getApplicationUrl();
@@ -138,9 +138,9 @@ public abstract class AbstractRestServic
         {
             return applicationUrl;
         }
-        return req.getScheme() + "://" + req.getServerName() + ( 
req.getServerPort() == 80
-            ? ""
-            : ":" + req.getServerPort() ) + req.getContextPath();
+        return httpServletRequest.getScheme() + "://" + 
httpServletRequest.getServerName() + (
+            httpServletRequest.getServerPort() == 80 ? "" : ":" + 
httpServletRequest.getServerPort() )
+            + httpServletRequest.getContextPath();
     }
 
     protected <T> Map<String, T> getBeansOfType( ApplicationContext 
applicationContext, Class<T> clazz )
@@ -173,8 +173,6 @@ public abstract class AbstractRestServic
     }
 
     /**
-     * TODO add a configuration mechanism to have configured the base archiva 
url
-     *
      * @param artifact
      * @return
      */
@@ -189,7 +187,7 @@ public abstract class AbstractRestServic
                 return null;
             }
 
-            StringBuilder sb = new StringBuilder( getBaseUrl( 
httpServletRequest ) );
+            StringBuilder sb = new StringBuilder( getBaseUrl() );
 
             sb.append( "/repository" );
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java?rev=1343830&r1=1343829&r2=1343830&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
 Tue May 29 16:35:33 2012
@@ -218,7 +218,7 @@ public class DefaultManagedRepositoriesS
             snippet.append( "    <" ).append( distRepoName ).append( ">\n" );
             snippet.append( "      <id>" ).append( repo.getId() ).append( 
"</id>\n" );
             snippet.append( "      <url>" );
-            snippet.append( getBaseUrl( httpServletRequest ) + "/repository" );
+            snippet.append( getBaseUrl(  ) + "/repository" );
             snippet.append( "/" ).append( repo.getId() ).append( "/" ).append( 
"</url>\n" );
 
             if ( !"default".equals( repo.getLayout() ) )
@@ -236,7 +236,7 @@ public class DefaultManagedRepositoriesS
             snippet.append( "      <name>" ).append( repo.getName() ).append( 
"</name>\n" );
 
             snippet.append( "      <url>" );
-            snippet.append( getBaseUrl( httpServletRequest ) + "/repository" );
+            snippet.append( getBaseUrl(  ) + "/repository" );
             snippet.append( "/" ).append( repo.getId() ).append( "/" );
 
             snippet.append( "</url>\n" );
@@ -262,7 +262,7 @@ public class DefaultManagedRepositoriesS
             snippet.append( "      <name>" ).append( repo.getName() ).append( 
"</name>\n" );
 
             snippet.append( "      <url>" );
-            snippet.append( getBaseUrl( httpServletRequest ) + "/repository" );
+            snippet.append( getBaseUrl(  ) + "/repository" );
             snippet.append( "/" ).append( repo.getId() ).append( "/" );
 
             snippet.append( "</url>\n" );