Author: bdaw Date: 2010-10-04 14:51:28 -0400 (Mon, 04 Oct 2010) New Revision: 4483 Modified: portal/trunk/pom.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java Log: GTNPORTAL-1527 Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/pom.xml 2010-10-04 18:51:28 UTC (rev 4483) @@ -47,7 +47,7 @@ <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> <org.gatein.pc.version>2.2.0-Beta04</org.gatein.pc.version> - <org.picketlink.idm>1.1.5.GA</org.picketlink.idm> + <org.picketlink.idm>1.1.6.GA</org.picketlink.idm> <org.gatein.wsrp.version>2.0.0-Alpha03</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIMessageBoard.java 2010-10-04 18:51:28 UTC (rev 4483) @@ -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: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIGroupSelector.java 2010-10-04 18:51:28 UTC (rev 4483) @@ -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: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-04 18:51:28 UTC (rev 4483) @@ -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: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/SerializationContextSingleton.java 2010-10-04 18:51:28 UTC (rev 4483) @@ -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: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-10-04 15:05:09 UTC (rev 4482) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-10-04 18:51:28 UTC (rev 4483) @@ -19,6 +19,7 @@ package org.exoplatform.portal.webui.page; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.model.ModelObject; import org.exoplatform.portal.config.model.Page; @@ -62,6 +63,7 @@ @EventConfig(listeners = UIDesktopPage.ShowAddNewApplicationActionListener.class), @EventConfig(listeners = UIDesktopPage.ChangePageActionListener.class), @EventConfig(listeners = UIDesktopPage.ShowPortletActionListener.class)}) +@Serialized public class UIDesktopPage extends UIPage {