Author: ndkhoiits Date: 2011-04-15 04:11:35 -0400 (Fri, 15 Apr 2011) New Revision: 6236 Modified: portal/trunk/ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.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/PortalData.java portal/trunk/component/portal/src/main/resources/binding.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 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/UIPortalForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java Log: GTNPORTAL-1854 Merge site describility to trunk Property changes on: portal/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 /portal/branches/branch-GTNPORTAL-1832:5993-6105 /portal/branches/wsrp-extraction:5828-6031 + /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 /portal/branches/branch-GTNPORTAL-1832:5993-6105 /portal/branches/site-describability:6171-6235 /portal/branches/wsrp-extraction:5828-6031 Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd =================================================================== --- portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-04-15 08:11:35 UTC (rev 6236) @@ -88,6 +88,8 @@ <xs:complexType name="portalConfigType"> <xs:sequence> <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -36,6 +36,10 @@ private String templateName; private String location; + + private String label; + + private String description; /** * @deprecated use the location instead @@ -52,10 +56,12 @@ this.ownerType = cfg.ownerType; this.templateLocation = cfg.templateLocation; this.location = cfg.location; + this.label = cfg.label; + this.description = cfg.description; this.templateName = cfg.templateName; this.predefinedOwner = new HashSet<String>(cfg.predefinedOwner); } - + public NewPortalConfig(String path) { this.location = path; @@ -126,10 +132,30 @@ this.ownerType = ownerType; } + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } + @Override public String toString() { - return "PortalConfig[predefinedOwner=" + predefinedOwner + ",ownerType=" + ownerType + ",templateName=" + templateName + - "location=" + location + "]"; + return "PortalConfig[predefinedOwner=" + predefinedOwner + ",ownerType=" + ownerType + ",templateName=" + + templateName + ",label=" + label + ",description=" + description + ",location=" + location + "]"; } } 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -50,6 +50,10 @@ private String locale; + private String label; + + private String description; + private String[] accessPermissions; private String editPermission; @@ -95,6 +99,8 @@ this.name = data.getName(); this.type = data.getType(); this.locale = data.getLocale(); + this.label = data.getLabel(); + this.description = data.getDescription(); this.accessPermissions = data.getAccessPermissions().toArray(new String[data.getAccessPermissions().size()]); this.editPermission = data.getEditPermission(); this.properties = new Properties(data.getProperties()); @@ -238,6 +244,26 @@ setProperty(PortalProperties.SESSION_ALIVE, type); } + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + + public void setLabel(String label) + { + this.label = label; + } + + public String getLabel() + { + return label; + } + static public class PortalConfigSet { private ArrayList<PortalConfig> portalConfigs; @@ -281,6 +307,8 @@ name, type, locale, + label, + description, accessPermissions, editPermission, properties, 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -19,6 +19,8 @@ package org.exoplatform.portal.pom.data; +import javassist.runtime.Desc; + import org.exoplatform.portal.config.NoSuchDataException; import org.exoplatform.portal.config.StaleModelException; import org.exoplatform.portal.config.UserACL; @@ -312,6 +314,8 @@ accessPermissions = pr.getAccessPermissions(); editPermission = pr.getEditPermission(); } + + Described described = src.adapt(Described.class); // return new PortalData( @@ -319,6 +323,8 @@ src.getName(), type, attrs.getValue(MappedAttributes.LOCALE), + described.getName(), + described.getDescription(), accessPermissions, editPermission, Collections.unmodifiableMap(properties), @@ -348,6 +354,10 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); pr.setEditPermission(src.getEditPermission()); + + Described described = dst.adapt(Described.class); + described.setName(src.getLabel()); + described.setDescription(src.getDescription()); // org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates"); 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -48,12 +48,18 @@ /** . */ private final ContainerData portalLayout; - + + private final String label; + + private final String description; + public PortalData( String storageId, String name, String type, String locale, + String label, + String description, List<String> accessPermissions, String editPermission, Map<String, String> properties, @@ -65,6 +71,8 @@ // this.key = new PortalKey(type, name); this.locale = locale; + this.label = label; + this.description = description; this.accessPermissions = accessPermissions; this.editPermission = editPermission; this.properties = properties; @@ -116,4 +124,14 @@ { return portalLayout; } + + public String getDescription() + { + return description; + } + + public String getLabel() + { + return label; + } } Modified: portal/trunk/component/portal/src/main/resources/binding.xml =================================================================== --- portal/trunk/component/portal/src/main/resources/binding.xml 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/main/resources/binding.xml 2011-04-15 08:11:35 UTC (rev 6236) @@ -113,7 +113,9 @@ <mapping name="portal-config" class="org.exoplatform.portal.config.model.PortalConfig" ordered="false"> <value name="portal-name" field="name"/> - <value name="locale" field="locale"/> + <value name="label" field="label" default="" /> + <value name="description" field="description" default="" /> + <value name="locale" field="locale" /> <value name="access-permissions" field="accessPermissions" usage="optional"/> <value name="edit-permission" field="editPermission" usage="optional"/> <value name="skin" field="skin" usage="optional"/> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -55,10 +55,10 @@ assertEquals(expected, sb.toString()); } - public void testGateInResources1_0() throws Exception + public void testGateInResources1_x() throws Exception { assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd"); assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd"); - assertHash("a3e06cf2a8c72cd8528e1112415e0b8b", "gatein_objects_1_2.xsd"); + assertHash("616e7a91a5a841009f672af484f4861e", "gatein_objects_1_2.xsd"); } } 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -117,10 +117,14 @@ public void testCreatePortal() throws Exception { + String label = "portal_foo"; + String description = "This is new portal for testing"; PortalConfig portal = new PortalConfig(); portal.setType("portal"); portal.setName("foo"); portal.setLocale("en"); + portal.setLabel(label); + portal.setDescription(description); portal.setAccessPermissions(new String[]{UserACL.EVERYONE}); // @@ -130,6 +134,8 @@ assertNotNull(portal); assertEquals("portal", portal.getType()); assertEquals("foo", portal.getName()); + assertEquals(label, portal.getLabel()); + assertEquals(description, portal.getDescription()); } public void testPortalConfigSave() throws Exception Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -159,6 +159,8 @@ "foo02", "foo03", "foo04", + "foo10", + "foo11", Arrays.asList("foo05"), "foo06", Collections.singletonMap("foo07", "foo08"), 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml 2011-04-15 08:11:35 UTC (rev 6236) @@ -25,6 +25,8 @@ <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> <application> Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -19,6 +19,7 @@ package org.exoplatform.toolbar.webui.component; +import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserPortalConfigService; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PageNode; @@ -52,6 +53,19 @@ UserPortalConfigService dataStorage = getApplicationComponent(UserPortalConfigService.class); return dataStorage.getAllPortalNames(); } + + public String getPortalLabel(String portalName) throws Exception + { + DataStorage storage_ = getApplicationComponent(DataStorage.class); + PortalConfig portalConfig = storage_.getPortalConfig(portalName); + String label = portalConfig.getLabel(); + if (label != null && label.trim().length() > 0) + { + return label; + } + + return portalName; + } public String getCurrentPortal() { Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-04-15 08:11:35 UTC (rev 6236) @@ -35,12 +35,13 @@ if(isCurrent && nodes.size() > 0) clazz = "class='ArrowIcon'"; else clazz = ""; href = uicomponent.getPortalURI(portal); + label = uicomponent.getPortalLabel(portal); EntityEncoder entityEncoder = EntityEncoder.FULL; portal = entityEncoder.encode(portal); print """ <div class="MenuItem portlet-menu-cascade-item"> <div $clazz> - <a href="$href" class="ItemIcon SiteIcon">$portal</a> + <a href="$href" class="ItemIcon SiteIcon">$label</a> </div> """; if(isCurrent) { Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-04-15 08:11:35 UTC (rev 6236) @@ -19,9 +19,20 @@ <tr> <td class="Image"><img src="/exoadmin/skin/navigation/webui/component/background/PlImg.gif" alt=""/></td> <td class="Content"> - <div class="Label"><%=uicomponent.getFieldValue(portalConfig, 'name') %></div> - - </td> + <div class="Label"><%=uicomponent.getFieldValue(portalConfig, 'name') %></div> + <% + def siteLabel = uicomponent.getFieldValue(portalConfig, 'label'); + def siteDescription = uicomponent.getFieldValue(portalConfig, 'description'); + if (siteLabel != null && siteLabel.trim().length() > 0) + { + print """<div>$siteLabel</div>"""; + } + if (siteDescription != null && siteDescription.trim().length() > 0) + { + print """<div>$siteDescription</div>"""; + } + %> + </td> <td class="ActionBlock"> <a href="<%=uicomponent.event("EditPortalLayout", portalConfig.getName());%>" class="EditLayoutIcon"><%=_ctx.appRes("UISiteManagement.label.editLayout")%></a> <a href="<%=uicomponent.event("EditNavigation", portalConfig.getName());%>" class="EditNavIcon"><%=_ctx.appRes("UISiteManagement.label.editNav")%></a> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-04-15 08:11:35 UTC (rev 6236) @@ -355,6 +355,8 @@ UIPortalForm.msg.sameName=This portal name already exists. UIPortalForm.msg.notExistAnymore=This portal is not existed or may be deleted. UIPortalForm.label.name=Portal Name : +UIPortalForm.label.label=Label : +UIPortalForm.label.description=Description : UIPortalForm.label.locale=#{word.locale} : UIPortalForm.label.date=#{word.date} : UIPortalForm.label.factoryId=Portal Types 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-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -89,6 +89,10 @@ private String ownerType; private String locale; + + private String label; + + private String description; private String editPermission; @@ -378,6 +382,26 @@ setProperty(PortalProperties.SESSION_ALIVE, type); } + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } + private void localizePageNavigation(PageNavigation nav,Locale locale) { ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class); 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-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -96,6 +96,10 @@ private static final String FIELD_LOCALE = "locale"; private static final String FIELD_SESSION_ALIVE = "sessionAlive"; + + private static final String FIELD_LABEL = "label"; + + private static final String FIELD_DESCRIPTION = "description"; private String portalOwner_; @@ -181,7 +185,6 @@ setActions(new String[]{"Save", "Close"}); } - @SuppressWarnings("unchecked") private class LanguagesComparator implements Comparator<SelectItemOption> { public int compare(SelectItemOption o1, SelectItemOption o2) @@ -237,7 +240,10 @@ StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class).setEditable(false)) .addUIFormInput( new UIFormSelectBox(FIELD_LOCALE, FIELD_LOCALE, languages).addValidator(MandatoryValidator.class)); - + + uiSettingSet.addUIFormInput(new UIFormStringInput(FIELD_LABEL, FIELD_LABEL, null)); + uiSettingSet.addUIFormInput(new UIFormStringInput(FIELD_DESCRIPTION, FIELD_DESCRIPTION, null)); + List<SelectItemOption<String>> listSkin = new ArrayList<SelectItemOption<String>>(); SkinService skinService = getApplicationComponent(SkinService.class); for (String skin : skinService.getAvailableSkinNames()) @@ -317,6 +323,11 @@ dataService.save(portalConfig); prContext.setAttribute(UserPortalConfig.class, service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser())); uiPortalApp.reloadSkinPortal(prContext); + + // We should use IPC to update some portlets in the future instead of + UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class); + uiWorkingWS.updatePortletsByName("PortalNavigationPortlet"); + uiWorkingWS.updatePortletsByName("UserToolbarSitePortlet"); } else { 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 2011-04-15 07:52:54 UTC (rev 6235) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2011-04-15 08:11:35 UTC (rev 6236) @@ -198,6 +198,8 @@ PortalConfig model = new PortalConfig(uiPortal.getOwnerType(), uiPortal.getName(), uiPortal.getStorageId()); model.setAccessPermissions(uiPortal.getAccessPermissions()); model.setEditPermission(uiPortal.getEditPermission()); + model.setLabel(uiPortal.getLabel()); + model.setDescription(uiPortal.getDescription()); model.setLocale(uiPortal.getLocale()); model.setSkin(uiPortal.getSkin()); model.setModifiable(uiPortal.isModifiable()); @@ -347,6 +349,8 @@ uiPortal.setOwner(model.getName()); uiPortal.setModifiable(model.isModifiable()); + uiPortal.setLabel(model.getLabel()); + uiPortal.setDescription(model.getDescription()); uiPortal.setLocale(model.getLocale()); uiPortal.setSkin(model.getSkin()); uiPortal.setAccessPermissions(model.getAccessPermissions());