Author: julien_viet Date: 2010-02-08 17:30:40 -0500 (Mon, 08 Feb 2010) New Revision: 1564 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 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/data/Mapper.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.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/org/exoplatform/portal/config/TestDataStorage.java 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/java/org/exoplatform/portal/config/TestUserPortalConfigService.java portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board/group.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/group.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/group.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/group.xml portal/trunk/component/portal/src/test/resources/portal/group/platform/users/group.xml portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml portal/trunk/component/portal/src/test/resources/portal/portal/template/classic/portal.xml portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml portal/trunk/component/portal/src/test/resources/portal/portal/test/pages.xml portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml portal/trunk/component/portal/src/test/resources/portal/user/demo/user.xml portal/trunk/component/portal/src/test/resources/portal/user/john/user.xml portal/trunk/component/portal/src/test/resources/portal/user/mary/user.xml portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout/user.xml portal/trunk/component/portal/src/test/resources/portal/user/root/user.xml portal/trunk/component/portal/src/test/resources/portal/user/template/user/user.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/user.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.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/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/page/UIPageForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.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/util/PortalDataMapper.java Log: remove creator and modifier from data model that were used **nowhere** Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -44,10 +44,6 @@ private boolean showMaxWindow = false; - private String creator; - - private String modifier; - private transient boolean modifiable; public Page() @@ -63,8 +59,6 @@ this.ownerId = data.getOwnerId(); this.editPermission = data.getEditPermission(); this.showMaxWindow = data.isShowMaxWindow(); - this.creator = data.getCreator(); - this.modifier = data.getModifier(); } public Page(String storageId) @@ -155,26 +149,6 @@ modifiable = b; } - public String getCreator() - { - return creator; - } - - public void setCreator(String s) - { - creator = s; - } - - public String getModifier() - { - return modifier; - } - - public void setModifier(String s) - { - modifier = s; - } - @Override public PageData build() { @@ -196,9 +170,7 @@ ownerType, ownerId, editPermission, - showMaxWindow, - creator, - modifier); + showMaxWindow); } static public class PageSet Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -36,10 +36,6 @@ private transient boolean modifiable; - private String creator; - - private String modifier; - private ArrayList<PageNode> pageNodes; private int priority = 1; @@ -71,8 +67,6 @@ // this.ownerType = nav.getOwnerType(); this.ownerId = nav.getOwnerId(); - this.creator = nav.getCreator(); - this.modifier = nav.getModifier(); this.priority = nav.getPriority(); this.pageNodes = children; } @@ -122,26 +116,6 @@ priority = i; } - public String getCreator() - { - return creator; - } - - public void setCreator(String s) - { - creator = s; - } - - public String getModifier() - { - return modifier; - } - - public void setModifier(String s) - { - modifier = s; - } - public String getOwner() { return ownerType + "::" + ownerId; @@ -180,12 +154,7 @@ newNav.setOwnerId(ownerId); newNav.setOwnerType(ownerType); newNav.setPriority(priority); - // newNav.setAccessPermissions(accessPermissions); - // newNav.setEditPermission(editPermission); newNav.setModifiable(modifiable); - // newNav.setDescription(description); - newNav.setCreator(creator); - newNav.setModifier(modifier); if (pageNodes == null || pageNodes.isEmpty()) return newNav; @@ -206,10 +175,6 @@ setPriority(nav.priority); if (!modifiable) setModifiable(nav.modifiable); - if (creator == null) - setCreator(nav.creator); - if (modifier == null) - setModifier(nav.modifier); if (nav.pageNodes == null || nav.pageNodes.isEmpty()) { @@ -245,6 +210,6 @@ public NavigationData build() { List<NavigationNodeData> children = buildNavigationChildren(); - return new NavigationData(storageId, ownerType, ownerId, creator, modifier, priority, children); + return new NavigationData(storageId, ownerType, ownerId, priority, children); } } \ No newline at end of file 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -60,10 +60,6 @@ private Container portalLayout; - private String creator; - - private String modifier; - private transient boolean modifiable; public PortalConfig() @@ -101,8 +97,6 @@ this.properties = new Properties(data.getProperties()); this.skin = data.getSkin(); this.portalLayout = new Container(data.getPortalLayout()); - this.creator = data.getCreator(); - this.modifier = data.getModifier(); } PortalConfig(String storageId, String type) @@ -195,26 +189,6 @@ modifiable = b; } - public String getCreator() - { - return creator; - } - - public void setCreator(String s) - { - creator = s; - } - - public String getModifier() - { - return modifier; - } - - public void setModifier(String s) - { - modifier = s; - } - public Properties getProperties() { return properties; @@ -316,8 +290,6 @@ editPermission, properties, skin, - portalLayout.build(), - creator, - modifier); + portalLayout.build()); } } 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -136,8 +136,6 @@ src.getObjectId(), ownerType, ownerId, - attrs.getValue(MappedAttributes.CREATOR), - attrs.getValue(MappedAttributes.MODIFIER), attrs.getValue(MappedAttributes.PRIORITY, 1), children); dst = (T)dstNav; @@ -222,8 +220,6 @@ // Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.PRIORITY, pageNav.getPriority()); - attrs.setValue(MappedAttributes.CREATOR, pageNav.getCreator()); - attrs.setValue(MappedAttributes.MODIFIER, pageNav.getModifier()); } else { @@ -316,9 +312,7 @@ editPermission, Collections.unmodifiableMap(properties), attrs.getValue(MappedAttributes.SKIN), - layout, - attrs.getValue(MappedAttributes.CREATOR), - attrs.getValue(MappedAttributes.MODIFIER)); + layout); } public void save(PortalData src, Site dst) @@ -335,8 +329,6 @@ Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.LOCALE, src.getLocale()); attrs.setValue(MappedAttributes.SKIN, src.getSkin()); - attrs.setValue(MappedAttributes.CREATOR, src.getCreator()); - attrs.setValue(MappedAttributes.MODIFIER, src.getModifier()); if (src.getProperties() != null) { save(src.getProperties(), attrs, portalPropertiesBlackList); @@ -406,9 +398,7 @@ ownerType, ownerId, editPermission, - attrs.getValue(MappedAttributes.SHOW_MAX_WINDOW, false), - attrs.getValue(MappedAttributes.CREATOR), - attrs.getValue(MappedAttributes.MODIFIER) + attrs.getValue(MappedAttributes.SHOW_MAX_WINDOW, false) ); } @@ -549,8 +539,6 @@ Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId()); attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow()); - attrs.setValue(MappedAttributes.CREATOR, src.getCreator()); - attrs.setValue(MappedAttributes.MODIFIER, src.getModifier()); // UIContainer rootContainer = dst.getRootComponent(); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -31,12 +31,6 @@ private final NavigationKey key; /** . */ - private final String creator; - - /** . */ - private final String modifier; - - /** . */ private final int priority; public NavigationData( @@ -47,15 +41,13 @@ Integer priority, List<NavigationNodeData> children) { - this(null, ownerType, ownerId, creator, modifier, priority, children); + this(null, ownerType, ownerId, priority, children); } public NavigationData( String storageId, String ownerType, String ownerId, - String creator, - String modifier, Integer priority, List<NavigationNodeData> children) { @@ -73,8 +65,6 @@ // this.key = new NavigationKey(ownerType, ownerId); - this.creator = creator; - this.modifier = modifier; this.priority = priority != null ? priority : 1; } @@ -93,16 +83,6 @@ return key.getId(); } - public String getCreator() - { - return creator; - } - - public String getModifier() - { - return modifier; - } - public int getPriority() { return priority; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -36,12 +36,6 @@ /** . */ private final boolean showMaxWindow; - /** . */ - private final String creator; - - /** . */ - private final String modifier; - public PageData( String storageId, String id, @@ -59,9 +53,7 @@ String ownerType, String ownerId, String editPermission, - boolean showMaxWindow, - String creator, - String modifier) + boolean showMaxWindow) { super(storageId, id, name, icon, decorator, template, factoryId, title, description, width, height, accessPermissions, children); @@ -69,8 +61,6 @@ this.key = new PageKey(ownerType, ownerId, name); this.editPermission = editPermission; this.showMaxWindow = showMaxWindow; - this.creator = creator; - this.modifier = modifier; } public PageKey getKey() @@ -97,14 +87,4 @@ { return showMaxWindow; } - - public String getCreator() - { - return creator; - } - - public String getModifier() - { - return modifier; - } } 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -49,12 +49,6 @@ /** . */ private final ContainerData portalLayout; - /** . */ - private final String creator; - - /** . */ - private final String modifier; - public PortalData( String storageId, String name, @@ -64,9 +58,7 @@ String editPermission, Map<String, String> properties, String skin, - ContainerData portalLayout, - String creator, - String modifier) + ContainerData portalLayout) { super(storageId, null); @@ -78,8 +70,6 @@ this.properties = properties; this.skin = skin; this.portalLayout = portalLayout; - this.creator = creator; - this.modifier = modifier; } public PortalKey getKey() @@ -126,14 +116,4 @@ { return portalLayout; } - - public String getCreator() - { - return creator; - } - - public String getModifier() - { - return modifier; - } } Modified: portal/trunk/component/portal/src/main/resources/binding.xml =================================================================== --- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -80,8 +80,6 @@ <value name="access-permissions" field="accessPermissions" usage="optional"/> <value name="edit-permission" field="editPermission" usage="optional"/> <value name="show-max-window" field="showMaxWindow" usage="optional"/> - <value name="creator" field="creator" usage="optional"/> - <value name="modifier" field="modifier" usage="optional"/> <collection field="children" ordered="false"> <structure map-as="org.exoplatform.portal.config.model.Container" usage="optional"/> <structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/> @@ -109,8 +107,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="creator" field="creator" usage="optional"/> - <value name="modifier" field="modifier" usage="optional"/> <structure field="properties" usage="optional"/> <structure name="portal-layout" using="container" field="portalLayout" usage="optional"/> </mapping> @@ -123,8 +119,6 @@ <structure name="owner-type" usage="optional"/> <structure name="owner-id" usage="optional"/> <value name="priority" field="priority" usage="optional"/> - <value name="creator" field="creator" usage="optional"/> - <value name="modifier" field="modifier" usage="optional"/> <collection name="page-nodes" field="pageNodes" usage="optional" item-type="org.exoplatform.portal.config.model.PageNode"/> </mapping> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -330,13 +330,11 @@ assertNotNull(pageNavi); // - pageNavi.setModifier("trong.tran"); storage_.save(pageNavi); assertEquals(1, events.size()); // PageNavigation newPageNavi = storage_.getPageNavigation(pageNavi.getOwnerType(), pageNavi.getOwnerId()); - assertEquals("trong.tran", newPageNavi.getModifier()); } public void testRemoveNavigation() throws Exception 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -129,8 +129,6 @@ // assertEquals(1, nav.getPriority()); - assertEquals("navigation_creator", nav.getCreator()); - assertEquals("navigation_modifier", nav.getModifier()); // assertEquals(2, nav.getNodes().size()); @@ -162,8 +160,6 @@ assertTrue(Arrays.equals(new String[]{"test_access_permissions"}, portal.getAccessPermissions())); assertEquals("test_edit_permission", portal.getEditPermission()); assertEquals("test_skin", portal.getSkin()); - assertEquals("test_creator", portal.getCreator()); - assertEquals("test_modifier", portal.getModifier()); assertEquals("test_prop_value", portal.getProperty("prop_key")); } @@ -188,8 +184,6 @@ assertTrue(Arrays.equals(new String[]{"test_access_permissions"}, page.getAccessPermissions())); assertEquals("test_edit_permission", page.getEditPermission()); assertEquals(true, page.isShowMaxWindow()); - assertEquals("test_creator", page.getCreator()); - assertEquals("test_modifier", page.getModifier()); // List<ModelObject> children = page.getChildren(); 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -95,8 +95,6 @@ // Attributes defaultAttrs = defaultNav.getAttributes(); assertEquals(1, (int)defaultAttrs.getInteger("priority")); - assertEquals("navigation_creator", defaultAttrs.getString("creator")); - assertEquals("navigation_modifier", defaultAttrs.getString("modifier")); // Collection<? extends Navigation> childrenNavigations = defaultNav.getChildren(); @@ -144,8 +142,6 @@ Attributes attrs = portal.getAttributes(); assertEquals("en", attrs.getString("locale")); assertEquals("test_skin", attrs.getString("skin")); - assertEquals("test_creator", attrs.getString("creator")); - assertEquals("test_modifier", attrs.getString("modifier")); assertEquals("test_prop_value", attrs.getString("prop_key")); // @@ -186,8 +182,6 @@ Attributes testPageAttrs = testPage.getAttributes(); assertEquals("test_factory_id", testPageAttrs.getString("factory-id")); assertEquals(true, (boolean)testPageAttrs.getBoolean("show-max-window")); - assertEquals("test_creator", testPageAttrs.getString("creator")); - assertEquals("test_modifier", testPageAttrs.getString("modifier")); // UIContainer c = testPage.getRootComponent(); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -517,7 +517,6 @@ page.setOwnerType("group"); page.setOwnerId("/platform/administrators"); page.setName("newAccount"); - page.setCreator("someone"); page.setShowMaxWindow(true); page.setTitle("newAccount title"); assertTrue(events.isEmpty()); @@ -529,7 +528,6 @@ assertEquals("group", p.getOwnerType()); assertEquals("/platform/administrators", p.getOwnerId()); assertEquals("newAccount", p.getName()); - assertEquals("someone", p.getCreator()); assertEquals("newAccount title", p.getTitle()); assertTrue(p.isShowMaxWindow()); @@ -554,7 +552,6 @@ assertEquals("group", p2.getOwnerType()); assertEquals("/platform/administrators", p2.getOwnerId()); assertEquals("newAccount", p2.getName()); - assertEquals("someone", p2.getCreator()); // assertFalse(p2.isShowMaxWindow()); p2.setTitle("newAccount title 1"); p2.setShowMaxWindow(true); Modified: portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/organization/management/executive-board/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/guests/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/legacy/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <page-body> </page-body> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/test/normalized/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <page-body> </page-body> Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/users/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/platform/users/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/platform/users/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -23,7 +23,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <properties> <entry key="sessionAlive">onDemand</entry> </properties> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/template/classic/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/template/classic/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/template/classic/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -26,7 +26,6 @@ <!--<factory-id>office</factory-id>--> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/template/test/navigation.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -24,8 +24,6 @@ <owner-type>portal</owner-type> <owner-id>@owner@</owner-id> <priority>1</priority> - <creator>creator</creator> - <modifier>modifier</modifier> <page-nodes> <node> 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/template/test/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -26,8 +26,6 @@ <access-permissions>access_permission</access-permissions> <edit-permission>edit_permission</edit-permission> <skin>skin</skin> - <creator>creator</creator> - <modifier>modifier</modifier> <properties> <entry key="prop_key">test_prop_value</entry> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -24,8 +24,6 @@ <owner-type>portal</owner-type> <owner-id>test</owner-id> <priority>1</priority> - <creator>navigation_creator</creator> - <modifier>navigation_modifier</modifier> <page-nodes> <node> Modified: portal/trunk/component/portal/src/test/resources/portal/portal/test/pages.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/portal/test/pages.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/test/pages.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -32,8 +32,6 @@ <access-permissions>test_access_permissions</access-permissions> <edit-permission>test_edit_permission</edit-permission> <show-max-window>true</show-max-window> - <creator>test_creator</creator> - <modifier>test_modifier</modifier> <container template="container_1_template" decorator="container_1_decorator" 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 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/portal/test/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -26,8 +26,6 @@ <access-permissions>test_access_permissions</access-permissions> <edit-permission>test_edit_permission</edit-permission> <skin>test_skin</skin> - <creator>test_creator</creator> - <modifier>test_modifier</modifier> <properties> <entry key="prop_key">test_prop_value</entry> Modified: portal/trunk/component/portal/src/test/resources/portal/user/demo/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/demo/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/demo/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/user/john/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/john/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/john/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/user/mary/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/mary/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/mary/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,8 +25,7 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> - + <portal-layout> <application> <instance-id>portal#classic:/web/BannerPortlet/banner</instance-id> Modified: portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/overwritelayout/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <page-body> </page-body> Modified: portal/trunk/component/portal/src/test/resources/portal/user/root/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/root/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/root/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <portal-layout> <application> Modified: portal/trunk/component/portal/src/test/resources/portal/user/template/user/user.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/portal/user/template/user/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/component/portal/src/test/resources/portal/user/template/user/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>@owner@</creator> <portal-layout> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <properties> <entry key="sessionAlive">onDemand</entry> </properties> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <properties> <entry key="sessionAlive">onDemand</entry> </properties> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <creator>root</creator> <properties> <entry key="sessionAlive">onDemand</entry> </properties> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/user.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/user.xml 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/user.xml 2010-02-08 22:30:40 UTC (rev 1564) @@ -25,7 +25,6 @@ <locale>en</locale> <access-permissions>Everyone</access-permissions> <edit-permission>@owner@</edit-permission> - <creator>@owner@</creator> <properties> <entry key="sessionAlive">onDemand</entry> </properties> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -51,10 +51,6 @@ protected String description; - protected String creator; - - protected String modifier; - public UIContainer() { } @@ -69,26 +65,6 @@ this.storageId = storageId; } - public String getCreator() - { - return creator; - } - - public void setCreator(String s) - { - creator = s; - } - - public String getModifier() - { - return modifier; - } - - public void setModifier(String s) - { - modifier = s; - } - public String getIcon() { return icon; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -133,7 +133,6 @@ // set properties for navigation pageNav.setPriority(1); pageNav.setModifiable(true); - pageNav.setCreator(ctx.getRemoteUser()); pageNav.setOwnerId(ownerId); pageNav.setOwnerType(PortalConfig.GROUP_TYPE); //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -489,7 +489,6 @@ UIPage uiPage = (UIPage)uiToolPanel.getUIComponent(); WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - selectPage.setModifier(context.getRemoteUser()); if(selectPage.getTitle() == null) selectPage.setTitle(selectedPageNode.getLabel()); 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 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -93,7 +93,7 @@ setPageNav(pageNavigation); invokeGetBindingBean(pageNavigation); removeChildById("ownerId"); - getUIStringInput("creator").setValue(pageNavigation.getCreator()); + // getUIStringInput("creator").setValue(pageNavigation.getCreator()); UIFormStringInput ownerId = new UIFormStringInput("ownerId", "ownerId", pageNavigation.getOwnerId()); ownerId.setEditable(false); ownerId.setParent(this); @@ -187,7 +187,6 @@ UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority"); int priority = Integer.parseInt(uiSelectBox.getValue()); pageNav.setPriority(priority); - pageNav.setModifier(pcontext.getRemoteUser()); // update navigation service.update(pageNav); @@ -209,7 +208,6 @@ int priority = Integer.parseInt(uiSelectBox.getValue()); pageNav.setPriority(priority); pageNav.setModifiable(true); - pageNav.setCreator(pcontext.getRemoteUser()); pageNav.setOwnerId(uiOwnerId.getValue()); pageNav.setOwnerType(uiOwnerType.getValue()); //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class); 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 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -414,7 +414,6 @@ pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; } - page.setCreator(pcontext.getRemoteUser()); page.setModifiable(true); if (page.getChildren() == null) page.setChildren(new ArrayList<ModelObject>()); @@ -437,7 +436,6 @@ page.setShowMaxWindow(false); uiPage.getChildren().clear(); page.setChildren(applications); - page.setModifier(pcontext.getRemoteUser()); PortalDataMapper.toUIPage(uiPage, page); // if (page.getTemplate() == null) // page.setTemplate(uiPage.getTemplate()); @@ -461,7 +459,6 @@ page.setChildren(children); uiPage.getChildren().clear(); - page.setModifier(pcontext.getRemoteUser()); PortalDataMapper.toUIPage(uiPage, page); // if (page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()); if (page.getChildren() == 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 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -127,7 +127,6 @@ { pageNav.addNode(pageNode); } - pageNav.setModifier(RequestContext.<WebuiRequestContext> getCurrentInstance().getRemoteUser()); uiNodeSelector.selectPageNodeByUri(pageNode.getUri()); service.create(page); @@ -315,7 +314,6 @@ PageNode pageNode = uiPageInfo.getPageNode(); Page page = uiPageTemplateOptions.createPageFromSelectedOption(ownerType, ownerId); - page.setCreator(context.getRemoteUser()); page.setName("page" + page.hashCode()); String pageId = pageNavi.getOwnerType() + "::" + pageNavi.getOwnerId() + "::" + page.getName(); DataStorage storage = uiWizard.getApplicationComponent(DataStorage.class); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -299,7 +299,6 @@ uiPage.getChildren().clear(); page.setChildren(applications); - page.setModifier(pcontext.getRemoteUser()); PortalDataMapper.toUIPage(uiPage, page); // if(page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()) ; if (page.getChildren() == null) @@ -322,7 +321,6 @@ uiPage.getChildren().clear(); page.setChildren(applications); - page.setModifier(pcontext.getRemoteUser()); PortalDataMapper.toUIPage(uiPage, page); // if(page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()) ; if (page.getChildren() == null) @@ -354,7 +352,6 @@ page.setChildren(children); uiPage.getChildren().clear(); - page.setModifier(pcontext.getRemoteUser()); PortalDataMapper.toUIPage(uiPage, page); uiPage.setStorageId(storageId); // if(page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()) ; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -262,7 +262,6 @@ if (selectedParent instanceof PageNavigation) { pageNav = (PageNavigation)selectedParent; - pageNav.setModifier(remoteUser); pageNode.setUri(pageNode.getName()); if (!pageNav.getNodes().contains(pageNode)) { @@ -406,7 +405,6 @@ userACL.hasPermission(page); - page.setCreator(pcontext.getRemoteUser()); page.setModifiable(true); if (page.getChildren() == null) page.setChildren(new ArrayList<ModelObject>()); 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 2010-02-08 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -335,8 +335,6 @@ PortalConfig pconfig = userPortalConfig.getPortalConfig(); uiForm.invokeSetBindingBean(pconfig); PageNavigation navigation = service.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName); - navigation.setCreator(pcontext.getRemoteUser()); - pconfig.setCreator(pcontext.getRemoteUser()); service.update(pconfig); service.update(navigation); UIPortalApplication uiPortalApp = event.getSource().getAncestorOfType(UIPortalApplication.class); 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 21:52:31 UTC (rev 1563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2010-02-08 22:30:40 UTC (rev 1564) @@ -178,8 +178,6 @@ { Page model = new Page(uiPage.getStorageId()); toContainer(model, uiPage); - model.setCreator(uiPage.getCreator()); - model.setModifier(uiPage.getModifier()); model.setOwnerId(uiPage.getOwnerId()); model.setOwnerType(uiPage.getOwnerType()); model.setIcon(uiPage.getIcon()); @@ -196,8 +194,6 @@ static private PortalConfig toPortal(UIPortal uiPortal) { PortalConfig model = new PortalConfig(uiPortal.getOwnerType(), uiPortal.getName(), uiPortal.getStorageId()); - model.setCreator(uiPortal.getCreator()); - model.setModifier(uiPortal.getModifier()); model.setAccessPermissions(uiPortal.getAccessPermissions()); model.setEditPermission(uiPortal.getEditPermission()); model.setLocale(uiPortal.getLocale()); @@ -318,8 +314,6 @@ static public void toUIPage(UIPage uiPage, Page model) throws Exception { toUIContainer(uiPage, model); - uiPage.setCreator(model.getCreator()); - uiPage.setModifier(model.getModifier()); uiPage.setOwnerId(model.getOwnerId()); uiPage.setOwnerType(model.getOwnerType()); uiPage.setIcon(model.getIcon()); @@ -347,8 +341,6 @@ uiPortal.setStorageId(model.getStorageId()); uiPortal.setName(model.getName()); uiPortal.setId("UIPortal"); - uiPortal.setCreator(model.getCreator()); - uiPortal.setModifier(model.getModifier()); // uiPortal.setFactoryId(model.getFactoryId()); uiPortal.setOwner(model.getName()); uiPortal.setModifiable(model.isModifiable());