Author: julien_viet Date: 2010-02-08 16:52:31 -0500 (Mon, 08 Feb 2010) New Revision: 1563 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java portal/trunk/component/portal/src/main/resources/binding.xml portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java Log: - sanitizing unused state in the model chain Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -58,8 +58,6 @@ private String skin; - private String title; - private Container portalLayout; private String creator; @@ -102,7 +100,6 @@ this.editPermission = data.getEditPermission(); this.properties = new Properties(data.getProperties()); this.skin = data.getSkin(); - this.title = data.getTitle(); this.portalLayout = new Container(data.getPortalLayout()); this.creator = data.getCreator(); this.modifier = data.getModifier(); @@ -218,16 +215,6 @@ modifier = s; } - public String getTitle() - { - return title; - } - - public void setTitle(String value) - { - title = value; - } - public Properties getProperties() { return properties; @@ -329,7 +316,6 @@ editPermission, properties, skin, - title, portalLayout.build(), creator, modifier); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -306,7 +306,7 @@ { statement = "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk - + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND mop:title='" + title + "'"; + + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND gtn:name='" + title + "'"; } else { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -20,6 +20,7 @@ package org.exoplatform.portal.pom.config.tasks; import org.exoplatform.portal.config.NoSuchDataException; +import org.exoplatform.portal.mop.Described; import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.config.cache.DataAccessMode; import org.exoplatform.portal.pom.config.cache.CacheableDataTask; @@ -148,8 +149,7 @@ // org.gatein.mop.api.workspace.Page dstPage = dstPages.addChild(cloneName); - // - + // Copy all attributes Attributes srcAttrs = srcPage.getAttributes(); Attributes dstAttrs = dstPage.getAttributes(); for (String key : srcAttrs.getKeys()) @@ -157,7 +157,13 @@ Object value = srcAttrs.getObject(key); dstAttrs.setObject(key, value); } - + + // Copy described + Described srcDescribed = srcPage.adapt(Described.class); + Described dstDescribed = dstPage.adapt(Described.class); + dstDescribed.setName(srcDescribed.getName()); + dstDescribed.setDescription(srcDescribed.getDescription()); + copy(srcPage, dstPage, srcPage.getRootComponent(), dstPage.getRootComponent()); // Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -24,6 +24,7 @@ import org.exoplatform.portal.config.model.ApplicationState; import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.CloneApplicationState; +import org.exoplatform.portal.mop.Described; import org.exoplatform.portal.mop.ProtectedResource; import org.exoplatform.portal.config.model.PersistentApplicationState; import org.exoplatform.portal.config.model.PortalConfig; @@ -315,7 +316,6 @@ editPermission, Collections.unmodifiableMap(properties), attrs.getValue(MappedAttributes.SKIN), - attrs.getValue(MappedAttributes.TITLE), layout, attrs.getValue(MappedAttributes.CREATOR), attrs.getValue(MappedAttributes.MODIFIER)); @@ -335,7 +335,6 @@ Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.LOCALE, src.getLocale()); attrs.setValue(MappedAttributes.SKIN, src.getSkin()); - attrs.setValue(MappedAttributes.TITLE, src.getTitle()); attrs.setValue(MappedAttributes.CREATOR, src.getCreator()); attrs.setValue(MappedAttributes.MODIFIER, src.getModifier()); if (src.getProperties() != null) @@ -387,6 +386,9 @@ } // + Described described = src.adapt(Described.class); + + // return new PageData( src.getObjectId(), null, @@ -395,10 +397,10 @@ null, null, attrs.getValue(MappedAttributes.FACTORY_ID), - attrs.getValue(MappedAttributes.TITLE), + described.getName(), + described.getDescription(), null, null, - null, Utils.safeImmutableList(accessPermissions), children, ownerType, @@ -412,7 +414,7 @@ private ContainerData load(UIContainer src, List<ComponentData> children) { - + // List<String> accessPermissions = Collections.emptyList(); if (src.isAdapted(ProtectedResource.class)) { @@ -420,6 +422,9 @@ accessPermissions = pr.getAccessPermissions(); } + // + Described described = src.adapt(Described.class); + Attributes attrs = src.getAttributes(); return new ContainerData( src.getObjectId(), @@ -429,8 +434,8 @@ attrs.getValue(MappedAttributes.DECORATOR), attrs.getValue(MappedAttributes.TEMPLATE), attrs.getValue(MappedAttributes.FACTORY_ID), - attrs.getValue(MappedAttributes.TITLE), - attrs.getValue(MappedAttributes.DESCRIPTION), + described.getName(), + described.getDescription(), attrs.getValue(MappedAttributes.WIDTH), attrs.getValue(MappedAttributes.HEIGHT), Utils.safeImmutableList(accessPermissions), @@ -536,8 +541,12 @@ pr.setEditPermission(src.getEditPermission()); // + Described described = dst.adapt(Described.class); + described.setName(src.getTitle()); + described.setDescription(src.getDescription()); + + // Attributes attrs = dst.getAttributes(); - attrs.setValue(MappedAttributes.TITLE, src.getTitle()); attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId()); attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow()); attrs.setValue(MappedAttributes.CREATOR, src.getCreator()); @@ -560,15 +569,17 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); + Described described = dst.adapt(Described.class); + described.setName(src.getTitle()); + described.setDescription(src.getDescription()); + Attributes dstAttrs = dst.getAttributes(); dstAttrs.setValue(MappedAttributes.ID, src.getId()); dstAttrs.setValue(MappedAttributes.TYPE, src instanceof DashboardData ? "dashboard" : null); - dstAttrs.setValue(MappedAttributes.TITLE, src.getTitle()); dstAttrs.setValue(MappedAttributes.ICON, src.getIcon()); dstAttrs.setValue(MappedAttributes.TEMPLATE, src.getTemplate()); dstAttrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId()); dstAttrs.setValue(MappedAttributes.DECORATOR, src.getDecorator()); - dstAttrs.setValue(MappedAttributes.DESCRIPTION, src.getDescription()); dstAttrs.setValue(MappedAttributes.WIDTH, src.getWidth()); dstAttrs.setValue(MappedAttributes.HEIGHT, src.getHeight()); dstAttrs.setValue(MappedAttributes.NAME, src.getName()); @@ -851,15 +862,18 @@ } // + Described described = src.adapt(Described.class); + + // return new ApplicationData<S>( src.getObjectId(), src.getName(), type, instanceState, null, - attrs.getValue(MappedAttributes.TITLE), + described.getName(), attrs.getValue(MappedAttributes.ICON), - attrs.getValue(MappedAttributes.DESCRIPTION), + described.getDescription(), attrs.getValue(MappedAttributes.SHOW_INFO_BAR), attrs.getValue(MappedAttributes.SHOW_STATE), attrs.getValue(MappedAttributes.SHOW_MODE), @@ -877,13 +891,15 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); + Described described = dst.adapt(Described.class); + described.setName(src.getTitle()); + described.setDescription(src.getDescription()); + Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.THEME, src.getTheme()); - attrs.setValue(MappedAttributes.TITLE, src.getTitle()); attrs.setValue(MappedAttributes.SHOW_INFO_BAR, src.isShowInfoBar()); attrs.setValue(MappedAttributes.SHOW_STATE, src.isShowApplicationState()); attrs.setValue(MappedAttributes.SHOW_MODE, src.isShowApplicationMode()); - attrs.setValue(MappedAttributes.DESCRIPTION, src.getDescription()); attrs.setValue(MappedAttributes.ICON, src.getIcon()); attrs.setValue(MappedAttributes.WIDTH, src.getWidth()); attrs.setValue(MappedAttributes.HEIGHT, src.getHeight()); @@ -1054,6 +1070,9 @@ } // + Described described = container.adapt(Described.class); + + // Attributes attrs = container.getAttributes(); List<ComponentData> children = loadChildren(container); return new DashboardData( @@ -1064,8 +1083,8 @@ attrs.getValue(MappedAttributes.DECORATOR), attrs.getValue(MappedAttributes.TEMPLATE), attrs.getValue(MappedAttributes.FACTORY_ID), - attrs.getValue(MappedAttributes.TITLE), - attrs.getValue(MappedAttributes.DESCRIPTION), + described.getName(), + described.getDescription(), attrs.getValue(MappedAttributes.WIDTH), attrs.getValue(MappedAttributes.HEIGHT), Utils.safeImmutableList(accessPermissions), Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -47,9 +47,6 @@ private final String skin; /** . */ - private final String title; - - /** . */ private final ContainerData portalLayout; /** . */ @@ -67,7 +64,6 @@ String editPermission, Map<String, String> properties, String skin, - String title, ContainerData portalLayout, String creator, String modifier) @@ -81,7 +77,6 @@ this.editPermission = editPermission; this.properties = properties; this.skin = skin; - this.title = title; this.portalLayout = portalLayout; this.creator = creator; this.modifier = modifier; @@ -127,11 +122,6 @@ return skin; } - public String getTitle() - { - return title; - } - public ContainerData getPortalLayout() { return portalLayout; Modified: portal/trunk/component/portal/src/main/resources/binding.xml =================================================================== --- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 21:52:31 UTC (rev 1563) @@ -34,28 +34,6 @@ class="org.exoplatform.portal.config.model.Application" marshaller="org.exoplatform.portal.config.serialize.ApplicationHandler" unmarshaller="org.exoplatform.portal.config.serialize.ApplicationHandler"> -<!-- - <value name="instance-id" - field="instanceState" - deserializer="org.exoplatform.portal.config.serialize.JiBX.unserializePortletState" - serializer="org.exoplatform.portal.config.serialize.JiBX.serializePortletState" - usage="optional"/> ---> -<!-- - <value name="id" usage="optional" field="id" style="attribute"/> - <structure name="application-type" usage="optional"/> - <value name="theme" usage="optional" field="theme"/> - <value name="title" usage="optional" field="title"/> - <value name="access-permissions" field="accessPermissions" usage="optional"/> - <value name="show-info-bar" field="showInfoBar" usage="optional" /> - <value name="show-application-state" field="showApplicationState" usage="optional" /> - <value name="show-application-mode" field="showApplicationMode" usage="optional" /> - <value name="description" field="description" usage="optional"/> - <value name="icon" field="icon" usage="optional"/> - <value name="width" usage="optional" field="width" /> - <value name="height" usage="optional" field="height" /> - <structure field="properties" usage="optional"/> ---> </mapping> <mapping name="portlet-application" @@ -63,49 +41,8 @@ class="org.exoplatform.portal.config.serialize.PortletApplication" marshaller="org.exoplatform.portal.config.serialize.PortletApplicationHandler" unmarshaller="org.exoplatform.portal.config.serialize.PortletApplicationHandler"> -<!-- - <structure - get-method="getInstanceState" - set-method="setInstanceState"> - </structure> - <value name="theme" usage="optional" get-method="getTheme" set-method="setTheme"/> - <value name="title" usage="optional" get-method="getTitle" set-method="setTitle"/> - <value name="access-permissions" get-method="getAccessPermissions" set-method="setAccessPermissions" usage="optional"/> - <value name="show-info-bar" get-method="getShowInfoBar" set-method="setShowInfoBar" usage="optional"/> - <value name="show-application-state" get-method="getShowApplicationState" set-method="setShowApplicationState" usage="optional"/> - <value name="show-application-mode" get-method="getShowApplicationMode" set-method="setShowApplicationMode" usage="optional" /> - <value name="description" get-method="getDescription" set-method="setDescription" usage="optional"/> - <value name="icon" get-method="getIcon" set-method="setIcon" usage="optional"/> - <value name="width" get-method="getWidth" set-method="setWidth" usage="optional"/> - <value name="height" get-method="getHeight" set-method="setHeight" usage="optional"/> - <structure get-method="getProperties" set-method="setProperties" usage="optional"/> ---> </mapping> -<!-- - <mapping - abstract="true" - class="org.exoplatform.portal.config.model.ApplicationState"> - <value name="application-ref" get-method="getApplicationName" set-method="setApplicationName"/> - <value name="portlet-ref" get-method="getPortletName" set-method="setPortletName"/> - </mapping> - - <mapping - name="portlet" - class="org.exoplatform.portal.config.model.TransientApplicationState" - extends="org.exoplatform.portal.config.model.ApplicationState" - factory="org.exoplatform.portal.config.serialize.JiBX.createTransientApplicationState"> - <structure map-as="org.exoplatform.portal.config.model.ApplicationState"/> - <structure - name="preferences" - get-method="getState" - set-method="setState" - marshaller="org.exoplatform.portal.config.serialize.PreferencesHandler" - unmarshaller="org.exoplatform.portal.config.serialize.PreferencesHandler" - usage="optional"/> - </mapping> ---> - <mapping name="page-body" label="pageBody" class="org.exoplatform.portal.config.model.PageBody"> </mapping> @@ -172,7 +109,6 @@ <value name="access-permissions" field="accessPermissions" usage="optional"/> <value name="edit-permission" field="editPermission" usage="optional"/> <value name="skin" field="skin" usage="optional"/> - <value name="title" field="title" usage="optional"/> <value name="creator" field="creator" usage="optional"/> <value name="modifier" field="modifier" usage="optional"/> <structure field="properties" usage="optional"/> Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-02-08 21:52:31 UTC (rev 1563) @@ -179,6 +179,7 @@ <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> <value>org.exoplatform.portal.mop.ProtectedResource</value> + <value>org.exoplatform.portal.mop.Described</value> </values-param> </init-params> </component-plugin> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -162,7 +162,6 @@ assertTrue(Arrays.equals(new String[]{"test_access_permissions"}, portal.getAccessPermissions())); assertEquals("test_edit_permission", portal.getEditPermission()); assertEquals("test_skin", portal.getSkin()); - assertEquals("test_title", portal.getTitle()); assertEquals("test_creator", portal.getCreator()); assertEquals("test_modifier", portal.getModifier()); assertEquals("test_prop_value", portal.getProperty("prop_key")); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -20,6 +20,7 @@ package org.exoplatform.portal.config; import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.mop.Described; import org.exoplatform.portal.mop.ProtectedResource; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; @@ -143,7 +144,6 @@ Attributes attrs = portal.getAttributes(); assertEquals("en", attrs.getString("locale")); assertEquals("test_skin", attrs.getString("skin")); - assertEquals("test_title", attrs.getString("title")); assertEquals("test_creator", attrs.getString("creator")); assertEquals("test_modifier", attrs.getString("modifier")); assertEquals("test_prop_value", attrs.getString("prop_key")); @@ -178,8 +178,12 @@ assertEquals("test_edit_permission", pr.getEditPermission()); // + Described testPageDescribed = testPage.adapt(Described.class); + assertEquals("test_title", testPageDescribed.getName()); + assertEquals(null, testPageDescribed.getDescription()); + + // Attributes testPageAttrs = testPage.getAttributes(); - assertEquals("test_title", testPageAttrs.getString("title")); assertEquals("test_factory_id", testPageAttrs.getString("factory-id")); assertEquals(true, (boolean)testPageAttrs.getBoolean("show-max-window")); assertEquals("test_creator", testPageAttrs.getString("creator")); @@ -196,14 +200,15 @@ assertTrue(container1.isAdapted(ProtectedResource.class)); ProtectedResource container1PR = container1.adapt(ProtectedResource.class); assertEquals(Collections.singletonList("container_1_access_permissions"), container1PR.getAccessPermissions()); + Described container1Described = container1.adapt(Described.class); + assertEquals("container_1_title", container1Described.getName()); + assertEquals("container_1_description", container1Described.getDescription()); Attributes container1Attrs = container1.getAttributes(); assertEquals("container_1", container1Attrs.getString("name")); - assertEquals("container_1_title", container1Attrs.getString("title")); assertEquals("container_1_icon", container1Attrs.getString("icon")); assertEquals("container_1_template", container1Attrs.getString("template")); assertEquals("container_1_factory_id", container1Attrs.getString("factory-id")); assertEquals("container_1_decorator", container1Attrs.getString("decorator")); - assertEquals("container_1_description", container1Attrs.getString("description")); assertEquals("container_1_width", container1Attrs.getString("width")); assertEquals("container_1_height", container1Attrs.getString("height")); @@ -212,13 +217,14 @@ assertTrue(application1.isAdapted(ProtectedResource.class)); ProtectedResource application1PR = application1.adapt(ProtectedResource.class); assertEquals(Collections.singletonList("application_1_access_permissions"), application1PR.getAccessPermissions()); + Described application1Described = application1.adapt(Described.class); + assertEquals("application_1_title", application1Described.getName()); + assertEquals("application_1_description", application1Described.getDescription()); Attributes application1Attrs = application1.getAttributes(); assertEquals("application_1_theme", application1Attrs.getString("theme")); - assertEquals("application_1_title", application1Attrs.getString("title")); assertEquals(true, (boolean)application1Attrs.getBoolean("show-info-bar")); assertEquals(true, (boolean)application1Attrs.getBoolean("show-state")); assertEquals(true, (boolean)application1Attrs.getBoolean("show-mode")); - assertEquals("application_1_description", application1Attrs.getString("description")); assertEquals("application_1_icon", application1Attrs.getString("icon")); assertEquals("application_1_width", application1Attrs.getString("width")); assertEquals("application_1_height", application1Attrs.getString("height")); Modified: portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) @@ -26,7 +26,6 @@ <access-permissions>access_permission</access-permissions> <edit-permission>edit_permission</edit-permission> <skin>skin</skin> - <title>title</title> <creator>creator</creator> <modifier>modifier</modifier> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) @@ -26,7 +26,6 @@ <access-permissions>test_access_permissions</access-permissions> <edit-permission>test_edit_permission</edit-permission> <skin>test_skin</skin> - <title>test_title</title> <creator>test_creator</creator> <modifier>test_modifier</modifier> 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 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-08 21:52:31 UTC (rev 1563) @@ -218,6 +218,7 @@ <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> <value>org.exoplatform.portal.mop.ProtectedResource</value> + <value>org.exoplatform.portal.mop.Described</value> </values-param> <properties-param> <name>options</name> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2010-02-08 19:54:59 UTC (rev 1562) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2010-02-08 21:52:31 UTC (rev 1563) @@ -202,7 +202,6 @@ model.setEditPermission(uiPortal.getEditPermission()); model.setLocale(uiPortal.getLocale()); model.setSkin(uiPortal.getSkin()); - model.setTitle(uiPortal.getTitle()); model.setModifiable(uiPortal.isModifiable()); model.setProperties(uiPortal.getProperties()); @@ -352,7 +351,6 @@ uiPortal.setModifier(model.getModifier()); // uiPortal.setFactoryId(model.getFactoryId()); uiPortal.setOwner(model.getName()); - uiPortal.setTitle(model.getTitle()); uiPortal.setModifiable(model.isModifiable()); uiPortal.setLocale(model.getLocale());