From do-not-reply at jboss.org Tue Nov 30 05:03:05 2010
Content-Type: multipart/mixed; boundary="===============0114433671076342683=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r5382 - in
 exo/portal/branches/standalone:
 web/portal/src/main/webapp/groovy/portal/webui/application and 4 other
 directories.
Date: Tue, 30 Nov 2010 05:03:05 -0500
Message-ID: <201011301003.oAUA35kY025892@svn01.web.mwc.hst.phx2.redhat.com>

--===============0114433671076342683==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: trong.tran
Date: 2010-11-30 05:03:04 -0500 (Tue, 30 Nov 2010)
New Revision: 5382

Modified:
   exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.xml
   exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal/=
webui/application/UIStandaloneAppContainer.gtmpl
   exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform/=
webui/application/WebuiApplication.java
   exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/co=
nfiguration.xml
   exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfor=
m/portal/application/StandaloneAppRequestHandler.java
   exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfor=
m/portal/application/StandaloneApplication.java
   exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfor=
m/portal/webui/workspace/UIStandaloneApplication.java
Log:
Move the standalone webui configuration to its corresponding handler

Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF=
/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.x=
ml	2010-11-30 09:09:44 UTC (rev 5381)
+++ exo/portal/branches/standalone/web/portal/src/main/webapp/WEB-INF/web.x=
ml	2010-11-30 10:03:04 UTC (rev 5382)
@@ -186,10 +186,6 @@
 	  	<param-name>webui.configuration</param-name> =

 	  	<param-value>app:/WEB-INF/webui-configuration.xml</param-value> =

 	  </init-param>
-    <init-param>
-      <param-name>standalone.webui.configuration</param-name>
-      <param-value>app:/WEB-INF/standalone-webui-configuration.xml</param-=
value>
-    </init-param>
 	  <load-on-startup>1</load-on-startup> =

 	</servlet>
  =


Modified: exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/=
portal/webui/application/UIStandaloneAppContainer.gtmpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal=
/webui/application/UIStandaloneAppContainer.gtmpl	2010-11-30 09:09:44 UTC (=
rev 5381)
+++ exo/portal/branches/standalone/web/portal/src/main/webapp/groovy/portal=
/webui/application/UIStandaloneAppContainer.gtmpl	2010-11-30 10:03:04 UTC (=
rev 5382)
@@ -1,4 +1,5 @@
 <div class=3D"UIStandaloneAppContainer" id=3D"<%=3Duicomponent.getId()%>">
+
 <%
 	if (uicomponent.isLossData())	{
 		print("Can not render this gadget</div>");
@@ -8,7 +9,11 @@
 		uicomponent.renderChild(uicomponent.currApp);
 	} else {
 %>
-	<div class=3D"Icon">Not have permission</div>
-	<div class=3D"Icon"><a href=3D"<%=3Duicomponent.url("Logout")%>">Login wi=
th other UserName</a> </div>
+  <div style=3D"text-align: center; padding: 25px 0px; background: #000; b=
order-top: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF; margin-top:=
 30px;">
+  	<div class=3D"Icon" style=3D"color: red; font-size: 20px; margin-bottom=
: 5px;">You have no right to access this application</div>
+  	<div class=3D"Icon"><a href=3D"<%=3Duicomponent.url("Logout")%>" style=
=3D"color: #2C6FBD; font-size: 12px; text-decoration: underline;">Login wit=
h other UserName</a> </div>
+  </div>
 <% 	} %>
 </div>
+
+

Modified: exo/portal/branches/standalone/webui/core/src/main/java/org/exopl=
atform/webui/application/WebuiApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform=
/webui/application/WebuiApplication.java	2010-11-30 09:09:44 UTC (rev 5381)
+++ exo/portal/branches/standalone/webui/core/src/main/java/org/exoplatform=
/webui/application/WebuiApplication.java	2010-11-30 10:03:04 UTC (rev 5382)
@@ -20,7 +20,6 @@
 package org.exoplatform.webui.application;
 =

 import org.exoplatform.web.application.Application;
-import org.exoplatform.web.application.ApplicationLifecycle;
 import org.exoplatform.webui.Util;
 import org.exoplatform.webui.config.Component;
 import org.exoplatform.webui.core.UIComponent;
@@ -68,11 +67,8 @@
       String stateManagerClass =3D configManager_.getApplication().getStat=
eManager();
       StateManager stManager =3D (StateManager)Util.createObject(stateMana=
gerClass, null);
       setStateManager(stManager);
-      List<ApplicationLifecycle> lifecycleListeners =3D
-         configManager_.getApplication().getApplicationLifecycleListeners(=
);
-      setApplicationLifecycle(lifecycleListeners);
-      for (ApplicationLifecycle lifecycle : lifecycleListeners)
-         lifecycle.onInit(this);
+      setApplicationLifecycle(configManager_.getApplication().getApplicati=
onLifecycleListeners());
+      super.onInit();
    }
 =

    public ConfigurationManager getConfigurationManager()

Modified: exo/portal/branches/standalone/webui/portal/src/main/java/conf/po=
rtal/configuration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/c=
onfiguration.xml	2010-11-30 09:09:44 UTC (rev 5381)
+++ exo/portal/branches/standalone/webui/portal/src/main/java/conf/portal/c=
onfiguration.xml	2010-11-30 10:03:04 UTC (rev 5382)
@@ -47,6 +47,12 @@
          <name>StandaloneAppRequestHandler</name>
          <set-method>register</set-method>
          <type>org.exoplatform.portal.application.StandaloneAppRequestHand=
ler</type>
+         <init-params>
+            <value-param>
+               <name>webui.configuration</name>
+               <value>app:/WEB-INF/standalone-webui-configuration.xml</val=
ue>
+            </value-param>
+         </init-params>
       </component-plugin>
    </external-component-plugins>
 </configuration>

Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exo=
platform/portal/application/StandaloneAppRequestHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/application/StandaloneAppRequestHandler.java	2010-11-30 09:09:44 =
UTC (rev 5381)
+++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/application/StandaloneAppRequestHandler.java	2010-11-30 10:03:04 =
UTC (rev 5382)
@@ -23,12 +23,25 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 =

+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
 import org.exoplatform.web.WebAppController;
 =

 =

 public class StandaloneAppRequestHandler extends PortalRequestHandler
 {
+   =

+   private String webuiConfigPath;
 =

+   public StandaloneAppRequestHandler(InitParams params)
+   {
+      ValueParam valueParam =3D params.getValueParam("webui.configuration"=
);
+      if (valueParam !=3D null)
+      {
+         webuiConfigPath =3D valueParam.getValue();
+      }
+   }
+
    private String[] PATHS =3D {"/standalone"};
 =

    public String[] getPath()
@@ -40,6 +53,7 @@
    public void onInit(WebAppController controller, ServletConfig sConfig) =
throws Exception
    {
       StandaloneApplication standaloneApplication =3D new StandaloneApplic=
ation(sConfig);
+      standaloneApplication.setWebUIConfigPath(webuiConfigPath);
       standaloneApplication.onInit();
       controller.addApplication(standaloneApplication);
    }
@@ -51,10 +65,7 @@
 =

       StandaloneApplication app =3D controller.getApplication(StandaloneAp=
plication.STANDALONE_APPLICATION_ID);
       StandaloneAppRequestContext context =3D new StandaloneAppRequestCont=
ext(app, req, res);
-//      if (context.getPortalOwner().length() =3D=3D 0) {
-//         res.sendRedirect(req.getContextPath());
-//         return;
-//      }
+
       processRequest(context, app);
    }     =

 }

Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exo=
platform/portal/application/StandaloneApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/application/StandaloneApplication.java	2010-11-30 09:09:44 UTC (r=
ev 5381)
+++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/application/StandaloneApplication.java	2010-11-30 10:03:04 UTC (r=
ev 5382)
@@ -23,6 +23,7 @@
 =

 public class StandaloneApplication extends PortalApplication
 {
+   private String webuiConfigPath;
 =

    final static public String STANDALONE_APPLICATION_ID =3D "StandaloneApp=
lication";
 =

@@ -31,14 +32,22 @@
       super(config);
    }
 =

+   public void setWebUIConfigPath(String path)
+   {
+      webuiConfigPath =3D path;
+   }
 =

    public String getApplicationId()
    {
       return STANDALONE_APPLICATION_ID;
    }
-   =

+
    public String getApplicationInitParam(String name)
    {
+      if ("webui.configuration".equals(name))
+      {
+         return webuiConfigPath;
+      }
       return getServletConfig().getInitParameter("standalone." + name);
    }
 }

Modified: exo/portal/branches/standalone/webui/portal/src/main/java/org/exo=
platform/portal/webui/workspace/UIStandaloneApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/webui/workspace/UIStandaloneApplication.java	2010-11-30 09:09:44 =
UTC (rev 5381)
+++ exo/portal/branches/standalone/webui/portal/src/main/java/org/exoplatfo=
rm/portal/webui/workspace/UIStandaloneApplication.java	2010-11-30 10:03:04 =
UTC (rev 5382)
@@ -104,25 +104,8 @@
       {
          PortalRequestContext pcontext =3D (PortalRequestContext)context;
 =

-//         if (getUIPopupMessages().hasMessage())
-//         {
-//            pcontext.addUIComponentToUpdateByAjax(getUIPopupMessages());
-//         }         =

-
          Set<UIComponent> list =3D context.getUIComponentToUpdateByAjax();
-//         List<UIPortlet> uiPortlets =3D new ArrayList<UIPortlet>(3);
-//         List<UIComponent> uiDataComponents =3D new ArrayList<UIComponen=
t>(5);
 =

-//         if (list !=3D null)
-//         {
-//            for (UIComponent uicomponent : list)
-//            {
-//               if (uicomponent instanceof UIPortlet)
-//                  uiPortlets.add((UIPortlet)uicomponent);
-//               else
-//                  uiDataComponents.add(uicomponent);
-//            }
-//         }
          w.write("<div class=3D\"PortalResponse\">");
          w.write("<div class=3D\"PortalResponseData\">");
          if (list !=3D null)
@@ -138,31 +121,6 @@
          }
          w.write("</div>");
 =

-//         if (!context.getFullRender())
-//         {
-//            for (UIPortlet uiPortlet : uiPortlets)
-//            {
-//               if (log.isDebugEnabled())
-//                  log.debug("AJAX call: Need to refresh the Portlet " + =
uiPortlet.getId());
-//
-//               w.write("<div class=3D\"PortletResponse\" style=3D\"displ=
ay: none\">");
-//               w.append("<div class=3D\"PortletResponsePortletId\">" + u=
iPortlet.getId() + "</div>");
-//               w.append("<div class=3D\"PortletResponseData\">");
-//
-//               /*
-//                * If the portlet is using our UI framework or supports i=
t then
-//                * it will return a set of block to updates. If there is =
not
-//                * block to update the javascript client will see that as=
 a full
-//                * refresh of the content part
-//                */
-//               uiPortlet.processRender(context);
-//
-//               w.append("</div>");
-//               w.append("<div class=3D\"PortletResponseScript\"></div>");
-//               w.write("</div>");
-//            }
-//         }
-
          w.write("<div class=3D\"PortalResponseScript\">");
          pcontext.getJavascriptManager().writeJavascript(w);
          w.write("eXo.core.Browser.onLoad();\n");
@@ -182,7 +140,6 @@
    {
       SkinService skinService =3D getApplicationComponent(SkinService.clas=
s);
       Collection<Skin> skins =3D new ArrayList<Skin>(skinService.getPortal=
Skins(skin_));
-//      Collection<Skin> skins =3D new ArrayList<Skin>();
       return skins;
    }
 =



--===============0114433671076342683==--