Author: hoang_to Date: 2011-09-23 05:45:45 -0400 (Fri, 23 Sep 2011) New Revision: 7497 Added: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/portal/ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/portal/RefreshCurrentUserPortal.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/portal/ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/portal/TestRefreshCurrentUserPortal.java portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/group.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/pages.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/navigation.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/pages.xml portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/portal.xml Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfig.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserNavigation.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortal.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/SimpleUserPortalContext.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/TestUserPortal.java portal/trunk/component/web/controller/pom.xml portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/RequestContext.java portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java Log: GTNPORTAL-2120: Cache UserPortal instance in request scope and provide invalidation infrastructure Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfig.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfig.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -40,6 +40,8 @@ /** . */ private UserPortalContext userPortalContext; + private UserPortal userPortal; + public UserPortalConfig() { this.portal = null; @@ -60,8 +62,17 @@ public UserPortal getUserPortal() { - return new UserPortalImpl(service, portalName, portal, accessUser, userPortalContext); + return getUserPortal(false); } + + public UserPortal getUserPortal(boolean isNewlyCreated) + { + if (isNewlyCreated || userPortal == null) + { + userPortal = new UserPortalImpl(service, portalName, portal, accessUser, userPortalContext); + } + return userPortal; + } public PortalConfig getPortalConfig() { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserNavigation.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserNavigation.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserNavigation.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -89,4 +89,10 @@ { return modifiable; } + + @Override + public String toString() + { + return "UserNavigation[key=" + navigation.getKey() + "]"; + } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortal.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortal.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortal.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -65,6 +65,11 @@ UserNavigation getNavigation(SiteKey key) throws NullPointerException, UserPortalException, NavigationServiceException; + /** + * Refresh the current user portal. + */ + void refresh(); + /** * Load a user node from a specified user navigation with a custom scope. * The returned node is the root node of the navigation. Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -194,7 +194,12 @@ return null; } - public UserNode getNode( + public void refresh() + { + navigations = null; + } + + public UserNode getNode( UserNavigation userNavigation, Scope scope, UserNodeFilterConfig filterConfig, Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/SimpleUserPortalContext.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/SimpleUserPortalContext.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/SimpleUserPortalContext.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -31,7 +31,7 @@ * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */ -class SimpleUserPortalContext implements UserPortalContext +public class SimpleUserPortalContext implements UserPortalContext { /** . */ Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/TestUserPortal.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/TestUserPortal.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/mop/user/TestUserPortal.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -32,6 +32,9 @@ import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteKey; import org.exoplatform.portal.mop.Visibility; +import org.exoplatform.portal.mop.navigation.NavigationContext; +import org.exoplatform.portal.mop.navigation.NavigationServiceImpl; +import org.exoplatform.portal.mop.navigation.NavigationState; import org.exoplatform.portal.mop.navigation.Scope; import org.exoplatform.portal.mop.user.UserNodeFilterConfig.Builder; import org.exoplatform.portal.pom.config.POMDataStorage; @@ -226,6 +229,40 @@ test.execute(); } + public void testRefreshNavigations() + { + UnitTest test = new UnitTest() + { + public void doExecute() throws Exception + { + + // + UserPortalConfig userPortalCfg = userPortalConfigSer_.getUserPortalConfig("classic", getUserId()); + UserPortal portal = userPortalCfg.getUserPortal(); + + // + NavigationServiceImpl service = new NavigationServiceImpl(mgr); + SiteKey navKey = SiteKey.group("/organization/management"); + NavigationContext nav = new NavigationContext(navKey, new NavigationState(1)); + + // + NavigationContext got = service.loadNavigation(navKey); + assertEquals(null, got); + assertEquals(null, portal.getNavigation(navKey)); + + // + service.saveNavigation(nav); + assertEquals(null, portal.getNavigation(navKey)); + portal.refresh(); + assertNotNull(portal.getNavigation(navKey)); + + } + }; + + // + test.execute("root"); + } + public void testFilterWithVisibility() { class Test extends UnitTest Modified: portal/trunk/component/web/controller/pom.xml =================================================================== --- portal/trunk/component/web/controller/pom.xml 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/web/controller/pom.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -75,6 +75,32 @@ </dependency> <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>net.sourceforge.jregex</groupId> <artifactId>jregex</artifactId> <version>1.2_01</version> Modified: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/RequestContext.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/RequestContext.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/RequestContext.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -19,6 +19,8 @@ package org.exoplatform.web.application; +import org.exoplatform.portal.config.UserPortalConfig; +import org.exoplatform.portal.mop.user.UserPortal; import org.exoplatform.services.resources.Orientation; import org.exoplatform.web.url.URLFactory; import org.exoplatform.web.url.PortalURL; @@ -191,6 +193,8 @@ return parentAppRequestContext_; } + public abstract UserPortal getUserPortal(); + @SuppressWarnings("unchecked") public static <T extends RequestContext> T getCurrentInstance() { Added: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/portal/RefreshCurrentUserPortal.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/portal/RefreshCurrentUserPortal.java (rev 0) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/portal/RefreshCurrentUserPortal.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.portal; + +import org.exoplatform.portal.mop.SiteKey; +import org.exoplatform.portal.mop.navigation.NavigationService; +import org.exoplatform.portal.mop.user.UserPortal; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; +import org.exoplatform.web.application.RequestContext; + +/** + * This listener attempts to find the {@link UserPortal} associated with the current request + * and invalidate it when the navigation service emits an event for a navigation modification. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + */ +public class RefreshCurrentUserPortal extends Listener<NavigationService, SiteKey> +{ + + @Override + public void onEvent(Event<NavigationService, SiteKey> event) throws Exception + { + RequestContext ctx = RequestContext.getCurrentInstance(); + if (ctx != null) + { + UserPortal userPortal = ctx.getUserPortal(); + if (userPortal != null) + { + userPortal.refresh(); + } + } + } +} Added: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/portal/TestRefreshCurrentUserPortal.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/portal/TestRefreshCurrentUserPortal.java (rev 0) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/portal/TestRefreshCurrentUserPortal.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.portal; + +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.portal.AbstractPortalTest; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.UserPortalConfig; +import org.exoplatform.portal.config.UserPortalConfigService; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.mop.SiteKey; +import org.exoplatform.portal.mop.navigation.NavigationContext; +import org.exoplatform.portal.mop.navigation.NavigationService; +import org.exoplatform.portal.mop.navigation.NavigationState; +import org.exoplatform.portal.mop.navigation.NodeContext; +import org.exoplatform.portal.mop.navigation.NodeModel; +import org.exoplatform.portal.mop.navigation.Scope; +import org.exoplatform.portal.mop.user.SimpleUserPortalContext; +import org.exoplatform.portal.mop.user.UserNavigation; +import org.exoplatform.portal.mop.user.UserPortal; +import org.exoplatform.services.resources.Orientation; +import org.exoplatform.web.application.RequestContext; +import org.exoplatform.web.application.URLBuilder; +import org.exoplatform.web.url.PortalURL; +import org.exoplatform.web.url.ResourceType; +import org.exoplatform.web.url.URLFactory; + +import java.util.List; +import java.util.Locale; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + */ +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.identity-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/web/portal/configuration.xml") +}) +public class TestRefreshCurrentUserPortal extends AbstractPortalTest +{ + + /** . */ + private RequestContext requestContext; + + /** . */ + private UserPortal userPortal; + + @Override + protected void setUp() throws Exception + { + begin(); + + UserPortalConfigService upcs = (UserPortalConfigService)getContainer().getComponentInstanceOfType(UserPortalConfigService.class); + UserPortalConfig upc = upcs.getUserPortalConfig("classic", "root", new SimpleUserPortalContext(Locale.ENGLISH)); + final UserPortal userPortal = upc.getUserPortal(); + + // + RequestContext requestContext = new RequestContext(null) + { + @Override + public URLFactory getURLFactory() + { + throw new UnsupportedOperationException(); + } + + @Override + public <R, U extends PortalURL<R, U>> U newURL(ResourceType<R, U> resourceType, URLFactory urlFactory) + { + throw new UnsupportedOperationException(); + } + + @Override + public Orientation getOrientation() + { + throw new UnsupportedOperationException(); + } + + @Override + public String getRequestParameter(String name) + { + throw new UnsupportedOperationException(); + } + + @Override + public String[] getRequestParameterValues(String name) + { + throw new UnsupportedOperationException(); + } + + @Override + public URLBuilder<?> getURLBuilder() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean useAjax() + { + throw new UnsupportedOperationException(); + } + + @Override + public UserPortal getUserPortal() + { + return userPortal; + } + }; + + // + this.userPortal = userPortal; + this.requestContext = requestContext; + } + + @Override + protected void tearDown() throws Exception + { + end(); + } + + public void testCreate() throws Exception + { + List<UserNavigation> navs = userPortal.getNavigations(); + assertEquals(2, navs.size()); + RequestContext.setCurrentInstance(requestContext); + NavigationService ns = (NavigationService)getContainer().getComponentInstanceOfType(NavigationService.class); + ns.saveNavigation(new NavigationContext(SiteKey.group("/platform"), new NavigationState(1))); + navs = userPortal.getNavigations(); + assertEquals(3, navs.size()); + RequestContext.setCurrentInstance(null); + } + + public void testUpdate() throws Exception + { + List<UserNavigation> navs = userPortal.getNavigations(); + assertEquals(2, navs.size()); + NavigationService ns = (NavigationService)getContainer().getComponentInstanceOfType(NavigationService.class); + NavigationContext nav = new NavigationContext(SiteKey.group("/platform"), new NavigationState(1)); + ns.saveNavigation(nav); + navs = userPortal.getNavigations(); + assertEquals(2, navs.size()); + RequestContext.setCurrentInstance(requestContext); + NodeContext root = ns.loadNode(NodeModel.SELF_MODEL, nav, Scope.ALL, null); + root.add(null, "foo"); + ns.saveNode(root, null); + navs = userPortal.getNavigations(); + assertEquals(3, navs.size()); + RequestContext.setCurrentInstance(null); + } + + public void testDestroy() throws Exception + { + NavigationService ns = (NavigationService)getContainer().getComponentInstanceOfType(NavigationService.class); + NavigationContext nav = new NavigationContext(SiteKey.group("/platform"), new NavigationState(1)); + ns.saveNavigation(nav); + List<UserNavigation> navs = userPortal.getNavigations(); + assertEquals(3, navs.size()); + RequestContext.setCurrentInstance(requestContext); + ns.destroyNavigation(nav); + navs = userPortal.getNavigations(); + assertEquals(2, navs.size()); + RequestContext.setCurrentInstance(null); + } +} Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/configuration.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <init-params> + <value-param> + <name>default.portal</name> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/org/exoplatform/web/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>/platform</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/org/exoplatform/web/portal</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <value>true</value> + </value-param> + <object-param> + <name>configuration</name> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>member</string></field> + <field name="description"><string>member membership type</string></field> + </object> + </value> + </collection> + </field> + + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + </collection> + </field> + + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Root</string></field> + <field name="lastName"><string>Root</string></field> + <field name="email"><string>root@localhost</string></field> + <field name="groups"><string>member:/platform</string></field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.listener.ListenerService</target-component> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_created</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_updated</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_destroyed</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + </external-component-plugins> + +</configuration> Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/group.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/group.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/group.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<portal-config> + <portal-name>platform</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <label>Foo</label> + <description>This is platform portal for testing</description> + <portal-layout> + </portal-layout> +</portal-config> Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/pages.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/pages.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/group/platform/pages.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<page-set> +</page-set> Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/navigation.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/navigation.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<node-navigation> +</node-navigation> Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/pages.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/pages.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<page-set> +</page-set> Added: portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/portal.xml =================================================================== --- portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/portal.xml (rev 0) +++ portal/trunk/component/web/controller/src/test/resources/org/exoplatform/web/portal/portal/classic/portal.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2011 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<portal-config> + <portal-name>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <label>Classic</label> + <description>This is classic portal for testing</description> + <portal-layout> + </portal-layout> +</portal-config> Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java =================================================================== --- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -182,8 +182,8 @@ private UserPortal getUserPortal() { - UIPortalApplication uiApp = Util.getUIPortalApplication(); - return uiApp.getUserPortalConfig().getUserPortal(); + PortalRequestContext prc = Util.getPortalRequestContext(); + return prc.getUserPortalConfig().getUserPortal(); } /** Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -97,7 +97,7 @@ public void loadNavigations() throws Exception { - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); List<UserNavigation> allNavs = userPortal.getNavigations(); List<UserNavigation> groupNav = new ArrayList<UserNavigation>(); @@ -154,7 +154,7 @@ { public void execute(Event<UIGroupNavigationManagement> event) throws Exception { - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); UIGroupNavigationManagement uicomp = event.getSource(); WebuiRequestContext context = event.getRequestContext(); UIApplication uiApplication = context.getUIApplication(); @@ -192,7 +192,7 @@ @Override protected void doEdit(UserNavigation nav, Event<UIGroupNavigationManagement> event) throws Exception { - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); UIGroupNavigationManagement uicomp = event.getSource(); SiteKey siteKey = nav.getKey(); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -28,6 +28,7 @@ import javax.portlet.ResourceRequest; import javax.portlet.ResourceURL; +import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.mop.SiteKey; import org.exoplatform.portal.mop.navigation.GenericScope; import org.exoplatform.portal.mop.navigation.NodeChange; @@ -193,8 +194,8 @@ protected UserPortal getUserPortal() { - UIPortalApplication uiApp = Util.getUIPortalApplication(); - return uiApp.getUserPortalConfig().getUserPortal(); + PortalRequestContext prc = Util.getPortalRequestContext(); + return prc.getUserPortalConfig().getUserPortal(); } protected UserNode getSelectedNode() throws Exception Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-09-23 09:45:45 UTC (rev 7497) @@ -470,4 +470,23 @@ </component-plugin> </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.listener.ListenerService</target-component> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_created</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_updated</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + <component-plugin> + <name>org.exoplatform.portal.mop.navigation.navigation_destroyed</name> + <set-method>addListener</set-method> + <type>org.exoplatform.web.portal.RefreshCurrentUserPortal</type> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -33,6 +33,7 @@ import org.exoplatform.portal.mop.SiteType; import org.exoplatform.portal.mop.user.UserNavigation; import org.exoplatform.portal.mop.user.UserNode; +import org.exoplatform.portal.mop.user.UserPortal; import org.exoplatform.portal.mop.user.UserPortalContext; import org.exoplatform.web.url.navigation.NodeURL; import org.exoplatform.web.url.navigation.NavigationResource; @@ -266,6 +267,19 @@ return url; } + public UserPortal getUserPortal() + { + UserPortalConfig upc = getUserPortalConfig(); + if (upc != null) + { + return upc.getUserPortal(); + } + else + { + return null; + } + } + public UserPortalConfig getUserPortalConfig() { if (userPortalConfig == null) Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -147,7 +147,7 @@ // Check existed PortalRequestContext prContext = Util.getPortalRequestContext(); - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = prContext.getUserPortalConfig().getUserPortal(); userNav = userPortal.getNavigation(userNav.getKey()); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -55,7 +55,7 @@ uiTree.setBeanIconField("icon"); uiTree.setBeanChildCountField("childrenCount"); - userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); } public void configure(UserNode node) throws Exception Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -19,11 +19,6 @@ package org.exoplatform.portal.webui.navigation; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteType; import org.exoplatform.portal.mop.Visibility; import org.exoplatform.portal.mop.navigation.NodeChange; @@ -33,16 +28,17 @@ import org.exoplatform.portal.mop.user.UserNode; import org.exoplatform.portal.mop.user.UserNodeFilterConfig; import org.exoplatform.portal.mop.user.UserPortal; -import org.exoplatform.portal.webui.portal.PageNodeEvent; import org.exoplatform.portal.webui.portal.UIPortal; import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; /** * Created by The eXo Platform SARL Author : Dang Van Minh minhdv81(a)yahoo.com @@ -134,7 +130,7 @@ } else { - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); List<UserNavigation> navigations = userPortal.getNavigations(); for (UserNavigation userNav : navigations) { @@ -157,7 +153,7 @@ { treeNode_ = new TreeNode(); - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); List<UserNavigation> listNavigations = userPortal.getNavigations(); List<UserNode> childNodes = new LinkedList<UserNode>(); @@ -186,7 +182,7 @@ public UserNode resolvePath(String path) throws Exception { WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); UserNode node; if (context.getRemoteUser() != null) @@ -212,7 +208,7 @@ { return null; } - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); NodeChangeQueue<UserNode> queue = new NodeChangeQueue<UserNode>(); userPortal.updateNode(node, navigationScope, queue); for (NodeChange<UserNode> change : queue) @@ -300,7 +296,7 @@ private UserNode getCurrentNavigation() throws Exception { - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); UserNavigation userNavigation = Util.getUIPortal().getUserNavigation(); try { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -59,10 +59,10 @@ { public void execute(Event<UIPortalApplication> event) throws Exception { + PortalRequestContext pcontext = PortalRequestContext.getCurrentInstance(); + UserPortal userPortal = pcontext.getUserPortalConfig().getUserPortal(); UIPortalApplication uiPortalApp = event.getSource(); - UserPortal userPortal = uiPortalApp.getUserPortalConfig().getUserPortal(); UIPortal showedUIPortal = uiPortalApp.getCurrentSite(); - PortalRequestContext pcontext = PortalRequestContext.getCurrentInstance(); UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder(); builder.withReadCheck(); @@ -144,14 +144,14 @@ DataStorage storageService = uiPortalApp.getApplicationComponent(DataStorage.class); PortalConfig associatedPortalConfig = storageService.getPortalConfig(targetNav.getKey().getTypeName(), targetNav.getKey().getName()); - UserPortalConfig userPortalConfig = uiPortalApp.getUserPortalConfig(); + UserPortalConfig userPortalConfig = pcontext.getUserPortalConfig(); //Update layout-related data on UserPortalConfig userPortalConfig.setPortalConfig(associatedPortalConfig); } else { - showedUIPortal = buildUIPortal(targetNav.getKey(), uiPortalApp, uiPortalApp.getUserPortalConfig()); + showedUIPortal = buildUIPortal(targetNav.getKey(), uiPortalApp, pcontext.getUserPortalConfig()); if(showedUIPortal == null) { return; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -341,8 +341,8 @@ */ private void removePageNode(Page page, Event<UIPageBrowser> event) throws Exception { - UIPortalApplication portalApplication = Util.getUIPortalApplication(); - UserPortal userPortal = portalApplication.getUserPortalConfig().getUserPortal(); + PortalRequestContext prc = Util.getPortalRequestContext(); + UserPortal userPortal = prc.getUserPortalConfig().getUserPortal(); UserNavigation userNav = userPortal.getNavigation(SiteKey.user(event.getRequestContext().getRemoteUser())); UserNode rootNode = userPortal.getNode(userNav, Scope.CHILDREN, null, null); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -111,7 +111,7 @@ DataStorage dataService = getApplicationComponent(DataStorage.class); dataService.create(page); - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); userPortal.saveNode(selectedNode, null); DescriptionService descriptionService = getApplicationComponent(DescriptionService.class); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -168,8 +168,8 @@ { if (navPath == null) { - UIPortalApplication uiApp = Util.getUIPortalApplication(); - navPath = uiApp.getUserPortalConfig().getUserPortal().getDefaultPath(null); + PortalRequestContext prc = Util.getPortalRequestContext(); + navPath = prc.getUserPortalConfig().getUserPortal().getDefaultPath(null); } return navPath; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -212,7 +212,7 @@ //caught in the ApplicationLifecycle rebuildUIPortal(uiPortalApp, editPortal, dataStorage); } - uiPortalApp.getUserPortalConfig().setPortalConfig(portalConfig); + prContext.getUserPortalConfig().setPortalConfig(portalConfig); PortalConfig pConfig = dataStorage.getPortalConfig(portalName); if (pConfig != null) { @@ -254,7 +254,7 @@ private void rebuildUIPortal(UIPortalApplication uiPortalApp, UIPortal uiPortal, DataStorage storage) throws Exception { PortalConfig portalConfig = storage.getPortalConfig(uiPortal.getSiteType().getName(), uiPortal.getName()); - UserPortalConfig userPortalConfig = uiPortalApp.getUserPortalConfig(); + UserPortalConfig userPortalConfig = Util.getPortalRequestContext().getUserPortalConfig(); userPortalConfig.setPortalConfig(portalConfig); uiPortal.getChildren().clear(); PortalDataMapper.toUIPortal(uiPortal, userPortalConfig.getPortalConfig()); @@ -479,10 +479,10 @@ storage.getPortalConfig(uiPortal.getSiteKey().getTypeName(), uiPortal.getSiteKey().getName()); if (pConfig != null) { - uiPortalApp.getUserPortalConfig().setPortalConfig(pConfig); + prContext.getUserPortalConfig().setPortalConfig(pConfig); } uiPortal.getChildren().clear(); - PortalDataMapper.toUIPortal(uiPortal, uiPortalApp.getUserPortalConfig().getPortalConfig()); + PortalDataMapper.toUIPortal(uiPortal, prContext.getUserPortalConfig().getPortalConfig()); //Update the cache of UIPortal from UIPortalApplication uiPortalApp.putCachedUIPortal(uiPortal); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -331,7 +331,7 @@ UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class); if (prContext.getPortalOwner().equals(uiForm.getPortalOwner())) { - uiPortalApp.setUserPortalConfig(service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser(), PortalRequestContext.USER_PORTAL_CONTEXT)); + prContext.setUserPortalConfig(service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser(), PortalRequestContext.USER_PORTAL_CONTEXT)); uiPortalApp.reloadPortalProperties(); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -169,7 +169,7 @@ private UserNode resolveNode(UserNode selectedNode, UserNodeFilterConfig filterConfig) throws Exception { UserNavigation currNav = selectedNode.getNavigation(); - UserPortal userPortal = Util.getUIPortalApplication().getUserPortalConfig().getUserPortal(); + UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal(); if (currNav.getKey().getType().equals(SiteType.USER)) { return userPortal.getNode(currNav, Scope.CHILDREN, filterConfig, null); Modified: portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java =================================================================== --- portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2011-09-23 09:21:37 UTC (rev 7496) +++ portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2011-09-23 09:45:45 UTC (rev 7497) @@ -20,6 +20,7 @@ package org.exoplatform.webui.application.portlet; import org.exoplatform.commons.utils.WriterPrinter; +import org.exoplatform.portal.mop.user.UserPortal; import org.exoplatform.services.resources.Orientation; import org.exoplatform.web.application.RequestContext; import org.exoplatform.web.application.URLBuilder; @@ -211,6 +212,12 @@ ((ActionResponse)response_).sendRedirect(url); } + @Override + public UserPortal getUserPortal() + { + return getParentAppRequestContext().getUserPortal(); + } + public boolean hasProcessAction() { return hasProcessAction_;