svn commit: r1244257 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services: api/DefaultRuntimeInfoService.java model/ApplicationRuntimeInfo.java

[ol...@apache.org]

Author: olamy
Date: Tue Feb 14 22:59:13 2012
New Revision: 1244257

URL: http://svn.apache.org/viewvc?rev=1244257&view=rev
Log:
service to retrieve baseUrl

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java?rev=1244257&r1=1244256&r2=1244257&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java Tue Feb 14 22:59:13 2012
@@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
 
 /**
  * @author Olivier Lamy
@@ -38,6 +40,9 @@ public class DefaultRuntimeInfoService
 
     private ArchivaRuntimeInfo archivaRuntimeInfo;
 
+    @Context
+    protected HttpServletRequest httpServletRequest;
+
     @Inject
     public DefaultRuntimeInfoService( ArchivaRuntimeInfo archivaRuntimeInfo )
     {
@@ -51,9 +56,17 @@ public class DefaultRuntimeInfoService
         applicationRuntimeInfo.setBuildNumber( this.archivaRuntimeInfo.getBuildNumber() );
         applicationRuntimeInfo.setTimestamp( this.archivaRuntimeInfo.getTimestamp() );
         applicationRuntimeInfo.setVersion( this.archivaRuntimeInfo.getVersion() );
+        applicationRuntimeInfo.setBaseUrl( getBaseUrl( httpServletRequest ) );
         return applicationRuntimeInfo;
     }
 
+    protected String getBaseUrl( HttpServletRequest req )
+    {
+        return req.getScheme() + "://" + req.getServerName() + ( req.getServerPort() == 80
+            ? ""
+            : ":" + req.getServerPort() ) + req.getContextPath();
+    }
+
     public Boolean logMissingI18n( String key )
     {
         i18nLogger.info( "missing i18n key : '{}'", key );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java?rev=1244257&r1=1244256&r2=1244257&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java Tue Feb 14 22:59:13 2012
@@ -42,6 +42,8 @@ public class ApplicationRuntimeInfo
 
     private boolean logMissingI18n;
 
+    private String baseUrl;
+
 
     public ApplicationRuntimeInfo()
     {
@@ -124,6 +126,16 @@ public class ApplicationRuntimeInfo
         this.logMissingI18n = logMissingI18n;
     }
 
+    public String getBaseUrl()
+    {
+        return baseUrl;
+    }
+
+    public void setBaseUrl( String baseUrl )
+    {
+        this.baseUrl = baseUrl;
+    }
+
     @Override
     public String toString()
     {
@@ -136,6 +148,7 @@ public class ApplicationRuntimeInfo
         sb.append( ", timestamp=" ).append( timestamp );
         sb.append( ", copyrightRange='" ).append( copyrightRange ).append( '\'' );
         sb.append( ", logMissingI18n=" ).append( logMissingI18n );
+        sb.append( ", baseUrl='" ).append( baseUrl ).append( '\'' );
         sb.append( '}' );
         return sb.toString();
     }