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/portal/core/admin/ui/InstanceManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/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/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-08
05:32:21 UTC (rev 13179)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-08
07:28:11 UTC (rev 13180)
@@ -59,8 +59,9 @@
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw
Dawidowicz</a>
* @version $Revision$
*/
-public class InstanceManagerBean
+public class InstanceManagerBean implements Serializable
{
+ private static final long serialVersionUID = 4661096923593747947L;
/** . */
private final Mode INTERNAL_EDIT_CONTENT = 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 = new InstanceAuthorizationBean();
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-08
05:32:21 UTC (rev 13179)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-08
07:28:11 UTC (rev 13180)
@@ -126,7 +126,7 @@
private String selectedContentURI;
/** . */
- private Map selectedContentParameters = new HashMap();
+// private Map selectedContentParameters = new HashMap();
/** . */
private Map<String, String[]> renderParameters;
@@ -137,34 +137,34 @@
private final AuthorizationBean auth = new PortalObjectAuthorizationBean();
/** . */
- 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 = renderParameters;
}
- public Map getSelectedContentParameters()
+ /*public Map getSelectedContentParameters()
{
return selectedContentParameters;
}
@@ -334,7 +334,7 @@
public void setSelectedContentParameters(Map selectedContentParameters)
{
this.selectedContentParameters = selectedContentParameters;
- }
+ }*/
public DomainConfigurator getDomainConfigurator()
{
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-04-08
05:32:21 UTC (rev 13179)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-04-08
07:28:11 UTC (rev 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. *
@@ -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="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw
Dawidowicz</a>
* @version $Revision$
*/
-public class PortletManagerBean
+public class PortletManagerBean implements Serializable
{
+ private static final long serialVersionUID = -567346587947451954L;
/** . */
private static final Logger log = Logger.getLogger(PortletManagerBean.class);
@@ -77,16 +79,16 @@
// Wired services
/** . */
- private InstanceContainer instanceContainer;
+ private transient InstanceContainer instanceContainer;
/** . */
- private AuthorizationDomainRegistry authorizationDomainRegistry;
+ private transient AuthorizationDomainRegistry authorizationDomainRegistry;
/** . */
- 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 = getSelectedPortlet();
-
+
//
if (portlet != null)
{
@@ -279,9 +281,9 @@
if (portlets == null)
{
portlets = new ArrayList();
-
+
List tmpPortlets = null;
-
+
if (getSelectedPortletInvoker() != null)
{
tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
@@ -363,8 +365,8 @@
public String selectPortlet()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- selectedPortletId =
(String)ctx.getExternalContext().getRequestParameterMap().get("id");
- selectedPlugin =
(String)ctx.getExternalContext().getRequestParameterMap().get("plugin");
+ selectedPortletId =
ctx.getExternalContext().getRequestParameterMap().get("id");
+ selectedPlugin =
ctx.getExternalContext().getRequestParameterMap().get("plugin");
selectedFrom = 0;
if (selectedPortletId != null && selectedPortletId.length() != 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 = new Comparator()
+ final transient Comparator comparator = new Comparator()
{
FacesContext ctx = FacesContext.getCurrentInstance();
Locale locale = ctx.getExternalContext().getRequestLocale();
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-08
05:32:21 UTC (rev 13179)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-08
07:28:11 UTC (rev 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="mailto:julien@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/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2009-04-08
05:32:21 UTC (rev 13179)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2009-04-08
07:28:11 UTC (rev 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="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
-public class NewWindowWizard
+public class NewWindowWizard implements Serializable
{
+ private static final long serialVersionUID = -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 authorizationDomainRegistry;
public NewWindowWizard()
{