8 a.m.
Author: thomas.heute(a)jboss.com
Date: 2010-10-05 09:00:22 -0400 (Tue, 05 Oct 2010)
New Revision: 4507
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
Log:
JBEPP-533: NotSerializableException with clustered LDAP setting
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java 2010-10-05
11:57:40 UTC (rev 4506)
+++
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java 2010-10-05
13:00:22 UTC (rev 4507)
@@ -19,6 +19,7 @@
package org.exoplatform.applicationregistry.webui.component;
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.core.UIComponent;
@@ -31,6 +32,7 @@
*/
@ComponentConfig(template =
"app:/groovy/applicationregistry/webui/component/UIMessageBoard.gtmpl")
+@Serialized
public class UIMessageBoard extends UIComponent
{
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java 2010-10-05
11:57:40 UTC (rev 4506)
+++
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java 2010-10-05
13:00:22 UTC (rev 4507)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.organization.account;
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.web.application.ApplicationMessage;
@@ -54,6 +55,7 @@
@EventConfig(phase = Phase.DECODE, listeners =
UIGroupSelector.SelectPathActionListener.class)}),
@ComponentConfig(type = UITree.class, id = "UITreeGroupSelector", template =
"system:/groovy/webui/core/UITree.gtmpl", events = @EventConfig(phase =
Phase.DECODE, listeners = UITree.ChangeNodeActionListener.class)),
@ComponentConfig(type = UIBreadcumbs.class, id = "BreadcumbGroupSelector",
template = "system:/groovy/webui/core/UIBreadcumbs.gtmpl", events =
@EventConfig(phase = Phase.DECODE, listeners =
UIBreadcumbs.SelectPathActionListener.class))})
+@Serialized
public class UIGroupSelector extends UIContainer
{
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-05
11:57:40 UTC (rev 4506)
+++
epp/portal/branches/EPP_5_1_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-05
13:00:22 UTC (rev 4507)
@@ -19,8 +19,11 @@
package org.exoplatform.webui.organization.account;
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.exoplatform.commons.utils.ListAccessImpl;
import org.exoplatform.commons.utils.ObjectPageList;
import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.commons.utils.SerializablePageList;
import org.exoplatform.services.organization.MembershipHandler;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.Query;
@@ -70,6 +73,7 @@
@EventConfig(listeners = UIUserSelector.FindGroupActionListener.class, phase =
Phase.DECODE),
@EventConfig(listeners = UIUserSelector.ShowPageActionListener.class, phase =
Phase.DECODE),
@EventConfig(listeners = UIUserSelector.CloseActionListener.class, phase =
Phase.DECODE)})
+@Serialized
public class UIUserSelector extends UIForm implements UIPopupComponent
{
final public static String FIELD_KEYWORD = "Quick Search".intern();
@@ -290,7 +294,7 @@
}
}
}
- ObjectPageList objPageList = new ObjectPageList(results, 10);
+ PageList objPageList = new SerializablePageList(new ListAccessImpl(User.class,
results), 10);
uiIterator_.setPageList(objPageList);
}
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java 2010-10-05
11:57:40 UTC (rev 4506)
+++
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java 2010-10-05
13:00:22 UTC (rev 4507)
@@ -19,10 +19,13 @@
package org.exoplatform.portal.application.replication;
+import org.exoplatform.commons.utils.LazyList;
+import org.exoplatform.commons.utils.ObjectPageList;
import org.exoplatform.services.organization.Query;
import org.exoplatform.commons.serialization.SerializationContext;
import org.exoplatform.commons.serialization.model.TypeDomain;
import org.exoplatform.commons.serialization.model.metadata.DomainMetaData;
+import org.exoplatform.services.organization.impl.UserImpl;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
@@ -46,6 +49,11 @@
// For now we need to mark the Query class as serialized
domainMetaData.addClassType(Query.class, true);
+ // Some other that need to be serialized
+ domainMetaData.addClassType(ObjectPageList.class, true);
+ domainMetaData.addClassType(UserImpl.class, true);
+ domainMetaData.addClassType(LazyList.class, true);
+
// Build domain
TypeDomain domain = new TypeDomain(domainMetaData, true);
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-10-05
11:57:40 UTC (rev 4506)
+++
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-10-05
13:00:22 UTC (rev 4507)
@@ -217,7 +217,7 @@
}
PageNodeEvent<UIPortal> pnevent = new
PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
- }
+ }
}
static public class ShowPortletActionListener extends EventListener<UIPage>