Fix problem in standalone mode

vstorm83 · Oct 18, 2012 · 5b41037 · 5b41037
1 parent efcc837
commit 5b41037
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 20 deletions.
diff --git a/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl b/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
@@ -8,7 +8,7 @@
 	import org.exoplatform.portal.webui.portal.UIPortal ;
 	import org.exoplatform.portal.config.model.PortalProperties ;
 	import org.json.JSONArray;
-   import org.exoplatform.container.PortalContainer;
+  import org.exoplatform.container.PortalContainer;
 
 	def rcontext = _ctx.getRequestContext() ;
 	String docBase =	rcontext.getRequestContextPath() ;	
@@ -74,7 +74,7 @@
 			else
 			{%>eXo.env.portal.accessMode = "private" ;<%}%>
 			eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ;
-         eXo.env.portal.containerName = "<%=PortalContainer.getInstance().getName()%>" ;
+      eXo.env.portal.containerName = "<%=PortalContainer.getInstance().getName()%>" ;
 			eXo.env.server.context = "<%=docBase%>" ;
 			eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ;
 			eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ;

diff --git a/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIStandaloneApplication.gtmpl b/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIStandaloneApplication.gtmpl
@@ -8,6 +8,7 @@
 	import org.exoplatform.portal.webui.portal.UIPortal ;
 	import org.exoplatform.portal.config.model.PortalProperties ;
 	import org.json.JSONArray;
+	import org.exoplatform.container.PortalContainer;
 
 	def rcontext = _ctx.getRequestContext() ;
 	String docBase =	rcontext.getRequestContextPath() ;	
@@ -73,6 +74,7 @@
 			else
 			{%>eXo.env.portal.accessMode = "private" ;<%}%>
 			eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ;
+			eXo.env.portal.containerName = "<%=PortalContainer.getInstance().getName()%>" ;
 			eXo.env.server.context = "<%=docBase%>" ;
 			eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ;
 			eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ;

diff --git a/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java b/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
@@ -28,7 +28,6 @@
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.portal.config.UserPortalConfig;
 import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.Page;
 import org.exoplatform.portal.mop.SiteKey;
 import org.exoplatform.portal.mop.SiteType;
 import org.exoplatform.portal.mop.page.PageContext;

diff --git a/.../portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java b/.../portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestContext.java
@@ -21,6 +21,9 @@
 
 import java.util.Locale;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.exoplatform.portal.mop.SiteType;
 import org.exoplatform.portal.url.StandaloneAppURLContext;
 import org.exoplatform.portal.webui.application.UIStandaloneAppContainer;
@@ -34,16 +37,16 @@
 
 public class StandaloneAppRequestContext extends PortalRequestContext
 {
-   public StandaloneAppRequestContext(StandaloneApplication app, ControllerContext controllerContext, String siteName, String requestPath)
-            throws Exception
+   public StandaloneAppRequestContext(StandaloneApplication app, ControllerContext controllerContext, String siteName,
+      HttpServletRequest request, HttpServletResponse response, String requestPath) throws Exception
    {
-      super(app, controllerContext, SiteType.USER.name(), siteName, requestPath, null);    
+      super(app, controllerContext, request, response, SiteType.USER.name(), siteName, requestPath, null);    
    }
 
    @Override
    public <R, U extends PortalURL<R, U>> U newURL(ResourceType<R, U> resourceType, URLFactory urlFactory)
    {
-      StandaloneAppURLContext context = new StandaloneAppURLContext(getControllerContext());
+      StandaloneAppURLContext context = new StandaloneAppURLContext(getControllerContext(), request_);
       U url = urlFactory.newURL(resourceType, context);
       if (url != null)
       {

diff --git a/.../portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java b/.../portal/src/main/java/org/exoplatform/portal/application/StandaloneAppRequestHandler.java
@@ -23,9 +23,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.container.xml.ValueParam;
-import org.exoplatform.portal.mop.SiteType;
 import org.exoplatform.web.ControllerContext;
 import org.exoplatform.web.WebAppController;
 
@@ -60,22 +60,20 @@ public void onInit(WebAppController controller, ServletConfig sConfig) throws Ex
    }
 
    @Override
-   public boolean execute(ControllerContext controllerContext) throws Exception
+   public boolean execute(ControllerContext controllerContext, HttpServletRequest request, HttpServletResponse response) throws Exception
    {
-      HttpServletRequest req = controllerContext.getRequest();
-      HttpServletResponse res = controllerContext.getResponse();
-
-      log.debug("Session ID = " + req.getSession().getId());
-      res.setHeader("Cache-Control", "no-cache");
+      log.debug("Session ID = " + request.getSession().getId());
+      response.setHeader("Cache-Control", "no-cache");
 
       //
-      String siteName = req.getRemoteUser();
+      String siteName = request.getRemoteUser();
       String requestPath = controllerContext.getParameter(REQUEST_PATH);
 
-      StandaloneApplication app = controllerContext.getController().getApplication(StandaloneApplication.STANDALONE_APPLICATION_ID);
-      StandaloneAppRequestContext context = new StandaloneAppRequestContext(app, controllerContext, siteName == null ? "" : siteName, requestPath);
+      WebAppController controller = (WebAppController) ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(WebAppController.class);
+      StandaloneApplication app = controller.getApplication(StandaloneApplication.STANDALONE_APPLICATION_ID);
+      StandaloneAppRequestContext context = new StandaloneAppRequestContext(app, controllerContext, siteName == null ? "" : siteName, request, response, requestPath);      
 
-      if (req.getRemoteUser() == null)
+      if (request.getRemoteUser() == null)
       {
          context.requestAuthenticationLogin();
       }

diff --git a/webui/portal/src/main/java/org/exoplatform/portal/url/StandaloneAppURLContext.java b/webui/portal/src/main/java/org/exoplatform/portal/url/StandaloneAppURLContext.java
@@ -47,7 +47,9 @@ public class StandaloneAppURLContext implements URLContext
    /** . */
    private StringBuilder buffer;
 
-   public StandaloneAppURLContext(ControllerContext controllerContext)
+   private HttpServletRequest req;
+
+   public StandaloneAppURLContext(ControllerContext controllerContext, HttpServletRequest request)
    {
       if (controllerContext == null)
       {
@@ -56,6 +58,7 @@ public StandaloneAppURLContext(ControllerContext controllerContext)
 
       //
       this.controllerContext = controllerContext;
+      this.req = request;
    }
 
    public <R, U extends PortalURL<R, U>> String render(U url)
@@ -89,7 +92,6 @@ private <R, U extends PortalURL<R, U>> String _render(U url) throws IOException
       }
 
       //
-      HttpServletRequest req = controllerContext.getRequest();
       if (url.getSchemeUse())
       {
          buffer.append(req.getScheme());