From portal-commits at lists.jboss.org Wed Apr  8 03:28:12 2009
Content-Type: multipart/mixed; boundary="===============5263147420131242238=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13180 - in
 branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui:
 dashboard and 1 other directories.
Date: Wed, 08 Apr 2009 03:28:12 -0400
Message-ID: <E1LrSCi-0004OJ-4j@committer01.frg.pub.inap.atl.jboss.com>

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

Author: thomas.heute(a)jboss.com
Date: 2009-04-08 03:28:11 -0400 (Wed, 08 Apr 2009)
New Revision: 13180

Modified:
   branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/InstanceManagerBean.java
   branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/PortalObjectManagerBean.java
   branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/PortletManagerBean.java
   branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/dashboard/DashboardBean.java
   branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/wizard/NewWindowWizard.java
Log:
JBEPP-58: Default portlets store non serializable attributes in the session


Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/j=
boss/portal/core/admin/ui/InstanceManagerBean.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
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/InstanceManagerBean.java	2009-04-08 05:32:21 UTC (rev 1=
3179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/InstanceManagerBean.java	2009-04-08 07:28:11 UTC (rev 1=
3180)
@@ -59,8 +59,9 @@
  * @author <a href=3D"mailto:boleslaw dot dawidowicz at jboss.org">Bolesla=
w Dawidowicz</a>
  * @version $Revision$
  */
-public class InstanceManagerBean
+public class InstanceManagerBean implements Serializable
 {
+   private static final long serialVersionUID =3D 4661096923593747947L;
 =

    /** . */
    private final Mode INTERNAL_EDIT_CONTENT =3D Mode.create("edit_content"=
);
@@ -68,13 +69,13 @@
    // Wired services
 =

    /** . */
-   private InstanceContainer instanceContainer;
+   private transient InstanceContainer instanceContainer;
 =

    /** . */
-   private RoleModule roleModule;
+   private transient RoleModule roleModule;
 =

    /** . */
-   private DomainConfigurator domainConfigurator;
+   private transient DomainConfigurator domainConfigurator;
 =

    // Navigational state of the user
 =

@@ -96,13 +97,13 @@
    // Runtime fields depending on the navigational state
 =

    /** . */
-   private PreferencesBean selectedPrefs;
+   private transient PreferencesBean selectedPrefs;
 =

    /** . */
-   private Instance selectedInstance;
+   private transient Instance selectedInstance;
 =

    /** . */
-   private List<InstanceDefinition> instances;
+   private transient List<InstanceDefinition> instances;
 =

    /** . */
    private AuthorizationBean auth =3D new InstanceAuthorizationBean();

Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/j=
boss/portal/core/admin/ui/PortalObjectManagerBean.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
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/PortalObjectManagerBean.java	2009-04-08 05:32:21 UTC (r=
ev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/PortalObjectManagerBean.java	2009-04-08 07:28:11 UTC (r=
ev 13180)
@@ -126,7 +126,7 @@
    private String selectedContentURI;
 =

    /** . */
-   private Map selectedContentParameters =3D new HashMap();
+//   private Map selectedContentParameters =3D new HashMap();
 =

    /** . */
    private Map<String, String[]> renderParameters;
@@ -137,34 +137,34 @@
    private final AuthorizationBean auth =3D new PortalObjectAuthorizationB=
ean();
 =

    /** . */
-   private List selectedObjectPath;
+   private transient List selectedObjectPath;
 =

    /** . */
-   private PortalObject selectedObject;
+   private transient PortalObject selectedObject;
 =

    /** . */
-   private PortalObject selectedDeletingObject;
+   private transient PortalObject selectedDeletingObject;
 =

    /** . */
-   private PropertiesBean selectedProperties;
+   private transient PropertiesBean selectedProperties;
 =

    /** . */
-   PropertyAction propertyAction;
+   transient PropertyAction propertyAction;
 =

    /** . */
-   private ControlPropertiesBean controlProperties;
+   private transient ControlPropertiesBean controlProperties;
 =

    /** . */
-   private PortletInvoker portletDefinitionInvoker;
+   private transient PortletInvoker portletDefinitionInvoker;
 =

    /** . */
-   private ThemeBean theme;
+   private transient ThemeBean theme;
 =

    /** . */
-   public PageManagerBean pageManager;
+   public transient PageManagerBean pageManager;
 =

    /** . */
-   private Boolean maximizedStateExists;
+   private transient Boolean maximizedStateExists;
 =

    // Wired services
 =

@@ -326,7 +326,7 @@
       this.renderParameters =3D renderParameters;
    }
 =

-   public Map getSelectedContentParameters()
+   /*public Map getSelectedContentParameters()
    {
       return selectedContentParameters;
    }
@@ -334,7 +334,7 @@
    public void setSelectedContentParameters(Map selectedContentParameters)
    {
       this.selectedContentParameters =3D selectedContentParameters;
-   }
+   }*/
 =

    public DomainConfigurator getDomainConfigurator()
    {

Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/j=
boss/portal/core/admin/ui/PortletManagerBean.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
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/PortletManagerBean.java	2009-04-08 05:32:21 UTC (rev 13=
179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/PortletManagerBean.java	2009-04-08 07:28:11 UTC (rev 13=
180)
@@ -1,6 +1,6 @@
 /*************************************************************************=
*****
  * JBoss, a division of Red Hat                                           =
    *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                =
    *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual                =
    *
  * contributors as indicated by the @authors tag. See the                 =
    *
  * copyright.txt in the distribution for a full listing of                =
    *
  * individual contributors.                                               =
    *
@@ -44,6 +44,7 @@
 =

 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -58,8 +59,9 @@
  * @author <a href=3D"mailto:boleslaw dot dawidowicz at jboss.org">Bolesla=
w Dawidowicz</a>
  * @version $Revision$
  */
-public class PortletManagerBean
+public class PortletManagerBean implements Serializable
 {
+   private static final long serialVersionUID =3D -567346587947451954L;
 =

    /** . */
    private static final Logger log =3D Logger.getLogger(PortletManagerBean=
.class);
@@ -77,16 +79,16 @@
    // Wired services
 =

    /** . */
-   private InstanceContainer instanceContainer;
+   private transient InstanceContainer instanceContainer;
 =

    /** . */
-   private AuthorizationDomainRegistry authorizationDomainRegistry;
+   private transient AuthorizationDomainRegistry authorizationDomainRegist=
ry;
 =

    /** . */
-   private RoleModule roleModule;
+   private transient RoleModule roleModule;
 =

    /** . */
-   private FederatingPortletInvoker federatingPortletInvoker;
+   private transient FederatingPortletInvoker federatingPortletInvoker;
 =

    // Navigational state
 =

@@ -108,19 +110,19 @@
    // Runtime state
 =

    /** . */
-   private PreferencesBean selectedPreferences;
+   private transient PreferencesBean selectedPreferences;
 =

    /** . */
-   private Portlet selectedPortlet;
+   private transient Portlet selectedPortlet;
 =

    /** . */
-   private Collection portletInvokerItems;
+   private transient Collection portletInvokerItems;
 =

    /** . */
-   private List portlets;
+   private transient List portlets;
 =

    /** . */
-   private FederatedPortletInvoker selectedPortletInvoker;
+   private transient FederatedPortletInvoker selectedPortletInvoker;
 =

    // Wired services
 =

@@ -241,7 +243,7 @@
    {
       // Get portlet
       Portlet portlet =3D getSelectedPortlet();
-                                                                          =
                                                                       =

+
       //
       if (portlet !=3D null)
       {
@@ -279,9 +281,9 @@
          if (portlets =3D=3D null)
          {
             portlets =3D new ArrayList();
-            =

+
             List tmpPortlets =3D null;
-            =

+
             if (getSelectedPortletInvoker() !=3D null)
             {
                tmpPortlets =3D new ArrayList(getSelectedPortletInvoker().g=
etPortlets());
@@ -363,8 +365,8 @@
    public String selectPortlet()
    {
       FacesContext ctx =3D FacesContext.getCurrentInstance();
-      selectedPortletId =3D (String)ctx.getExternalContext().getRequestPar=
ameterMap().get("id");
-      selectedPlugin =3D (String)ctx.getExternalContext().getRequestParame=
terMap().get("plugin");
+      selectedPortletId =3D ctx.getExternalContext().getRequestParameterMa=
p().get("id");
+      selectedPlugin =3D ctx.getExternalContext().getRequestParameterMap()=
.get("plugin");
       selectedFrom =3D 0;
 =

       if (selectedPortletId !=3D null && selectedPortletId.length() !=3D 0)
@@ -431,7 +433,7 @@
     * A comparator for portlets. Order portlets in the alphabetical order =
of their display name. If there is no display
     * name, fall back to portlet id.
     */
-   final Comparator comparator =3D new Comparator()
+   final transient Comparator comparator =3D new Comparator()
    {
       FacesContext ctx =3D FacesContext.getCurrentInstance();
       Locale locale =3D ctx.getExternalContext().getRequestLocale();

Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/j=
boss/portal/core/admin/ui/dashboard/DashboardBean.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
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/dashboard/DashboardBean.java	2009-04-08 05:32:21 UTC (r=
ev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/dashboard/DashboardBean.java	2009-04-08 07:28:11 UTC (r=
ev 13180)
@@ -20,6 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA     =
    *
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.               =
    *
  *************************************************************************=
*****/
+
 package org.jboss.portal.core.admin.ui.dashboard;
 =

 import org.jboss.portal.common.util.IteratorStatus;
@@ -40,13 +41,14 @@
 =

 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
+import java.io.Serializable;
 import java.util.Collection;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public class DashboardBean implements AddPageAction.Listener
+public class DashboardBean implements Serializable, AddPageAction.Listener
 {
 =

    /** . */
@@ -56,16 +58,16 @@
    // Wired services
 =

    /** . */
-   public PortalObjectContainer portalObjectContainer;
+   public transient PortalObjectContainer portalObjectContainer;
 =

    /** . */
-   public LayoutService layoutService;
+   public transient LayoutService layoutService;
 =

    /** . */
-   public ThemeService themeService;
+   public transient ThemeService themeService;
 =

    /** . */
-   public InstanceContainer instanceContainer;
+   public transient InstanceContainer instanceContainer;
 =

    // Navigational state
 =

@@ -75,22 +77,22 @@
    // Runtime fields
 =

    /** . */
-   public Portal userPortal;
+   public transient Portal userPortal;
 =

    /** . */
-   public String selectedPageTheme;
+   public transient String selectedPageTheme;
 =

    /** . */
-   public String selectedPageLayout;
+   public transient String selectedPageLayout;
 =

    /** . */
-   public PageManagerBean pageManager;
+   public transient PageManagerBean pageManager;
 =

    /** . */
-   public SelectItem[] pageItems;
+   public transient SelectItem[] pageItems;
 =

    /** . */
-   public boolean selectePageIsDefault;
+   public transient boolean selectePageIsDefault;
 =

    //
 =


Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/j=
boss/portal/core/admin/ui/wizard/NewWindowWizard.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
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/wizard/NewWindowWizard.java	2009-04-08 05:32:21 UTC (re=
v 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/p=
ortal/core/admin/ui/wizard/NewWindowWizard.java	2009-04-08 07:28:11 UTC (re=
v 13180)
@@ -1,6 +1,6 @@
 /*************************************************************************=
*****
  * JBoss, a division of Red Hat                                           =
    *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                =
    *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual                =
    *
  * contributors as indicated by the @authors tag. See the                 =
    *
  * copyright.txt in the distribution for a full listing of                =
    *
  * individual contributors.                                               =
    *
@@ -46,6 +46,7 @@
 import org.jboss.portal.theme.ThemeConstants;
 =

 import javax.faces.context.FacesContext;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -56,22 +57,25 @@
  * @author <a href=3D"mailto:theute(a)jboss.org">Thomas Heute</a>
  * @version $Revision$
  */
-public class NewWindowWizard
+public class NewWindowWizard implements Serializable
 {
+   private static final long serialVersionUID =3D -223476489826544201L;
 =

-   private List steps;
+   private transient List steps;
    private int currentStep;
-   private FederatingPortletInvoker federatingPortletInvoker;
    private String selectedPortletId;
    private String selectedPortalId;
    private String selectedPageId;
    private String selectedRegionId;
    private String selectedPortletInvokerId;
+
    private String selectedParentPageId;
-   private PortalObjectContainer portalObjectContainer;
-   private InstanceContainer instanceContainer;
-   private LayoutService layoutService;
-   private AuthorizationDomainRegistry authorizationDomainRegistry;
+   // Injected services
+   private transient PortalObjectContainer portalObjectContainer;
+   private transient FederatingPortletInvoker federatingPortletInvoker;
+   private transient InstanceContainer instanceContainer;
+   private transient LayoutService layoutService;
+   private transient AuthorizationDomainRegistry authorizationDomainRegist=
ry;
 =

    public NewWindowWizard()
    {


--===============5263147420131242238==--