gatein SVN: r1572 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-08 22:26:35 -0500 (Mon, 08 Feb 2010)
New Revision: 1572
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_vi.xml
Log:
GTNPORTAL-481: Translate GateIn in Vietnamese
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_vi.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_vi.xml 2010-02-09 03:21:08 UTC (rev 1571)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/portal/classic_vi.xml 2010-02-09 03:26:35 UTC (rev 1572)
@@ -29,6 +29,7 @@
<webexplorer>Trình duyệt</webexplorer>
<groupnavigation>Group Navigation</groupnavigation>
<portalnavigation>Portal Navigation</portalnavigation>
+ <register>Đăng ký</register>
</classic>
</portal>
14 years, 10 months
- 1
- 0
gatein SVN: r1571 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-08 22:21:08 -0500 (Mon, 08 Feb 2010)
New Revision: 1571
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-481: Translate GateIn in Vietnamese
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-09 03:18:53 UTC (rev 1570)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-09 03:21:08 UTC (rev 1571)
@@ -322,10 +322,10 @@
UIPortalForm.label.date=#{word.date} :
UIPortalForm.label.factoryId=Các kiểu Portal
UIPortalForm.label.skin=Kiểu giao diện :
-UIPortalForm.label.sessionAlive=Keep session alive :
-UIPortalForm.label.option.always=Always
-UIPortalForm.label.option.onDemand=On Demand
-UIPortalForm.label.option.never=Never
+UIPortalForm.label.sessionAlive=Giữ session :
+UIPortalForm.label.option.always=Luôn luôn
+UIPortalForm.label.option.onDemand=Theo yêu cầu
+UIPortalForm.label.option.never=Không bao giờ
UIPortalForm.tab.label.PortalSetting=Cấu hình Portal
UIPortalForm.tab.label.PortalTemplate=Các Portal mẫu
UIPortalForm.tab.label.PermissionSetting=Tùy chọn phân quyền sử dụng
@@ -493,6 +493,8 @@
UIPageNodeForm.tab.label.PageNodeSetting=Cấu hình node
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Tùy chọn trang
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
#############################################################################
@@ -1295,8 +1297,8 @@
############################################################################
UIPopupWindow.Close=Đóng cửa sổ
-UIPopupWindow.title.UIPageNodeForm2=ADD/EDIT PAGE NODE
-UIPopupWindow.title.UINavigationManagement=Qủan lý Navigation
+UIPopupWindow.title.UIPageNodeForm2=THÊM/SỬA PAGE NODE
+UIPopupWindow.title.UINavigationManagement=Quản lý Navigation
UIPopupWindow.title.UIPageNavigationForm=Page Navigation Form
############################################################################
14 years, 10 months
- 1
- 0
gatein SVN: r1570 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-02-08 22:18:53 -0500 (Mon, 08 Feb 2010)
New Revision: 1570
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-481: Translate GateIn in Vietnamese
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 2010-02-09 01:12:39 UTC (rev 1569)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-09 03:18:53 UTC (rev 1570)
@@ -514,6 +514,8 @@
UIPageNodeForm.tab.label.PageNodeSetting=Page Node Setting
UIPageNodeForm.tab.label.Icon=#{word.icon}
UIPageNodeForm.tab.label.UIPageSelector2=Page Selector
+UIPageNodeForm.action.Save=#{word.save}
+UIPageNodeForm.action.Back=#{word.back}
#############################################################################
14 years, 10 months
- 1
- 0
gatein SVN: r1569 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 20:12:39 -0500 (Mon, 08 Feb 2010)
New Revision: 1569
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
- for now disable the root /production as it leads to concurrency issues
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-09 00:13:13 UTC (rev 1568)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2010-02-09 01:12:39 UTC (rev 1569)
@@ -551,8 +551,10 @@
</values-param>
<properties-param>
<name>options</name>
- <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
- <property name="org.chromattic.api.Option.root_node.create" value="true"/>
+ <!--<property name="org.chromattic.api.Option.root_node.path" value="/production"/>-->
+ <!--<property name="org.chromattic.api.Option.root_node.create" value="true"/>-->
+ <property name="org.chromattic.api.Option.root_node.path" value="/"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="false"/>
</properties-param>
</init-params>
</component-plugin>
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-09 00:13:13 UTC (rev 1568)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-09 01:12:39 UTC (rev 1569)
@@ -222,8 +222,10 @@
</values-param>
<properties-param>
<name>options</name>
- <property name="org.chromattic.api.Option.root_node.path" value="/production"/>
- <property name="org.chromattic.api.Option.root_node.create" value="true"/>
+ <!--<property name="org.chromattic.api.Option.root_node.path" value="/production"/>-->
+ <!--<property name="org.chromattic.api.Option.root_node.create" value="true"/>-->
+ <property name="org.chromattic.api.Option.root_node.path" value="/"/>
+ <property name="org.chromattic.api.Option.root_node.create" value="false"/>
</properties-param>
</init-params>
</component-plugin>
14 years, 10 months
- 1
- 0
gatein SVN: r1568 - in portal/trunk: examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 19:13:13 -0500 (Mon, 08 Feb 2010)
New Revision: 1568
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
- fix the datasource name in sample portal repository configuration
- fix lucene index path for wsrp workspace
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08 23:30:06 UTC (rev 1567)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-09 00:13:13 UTC (rev 1568)
@@ -541,7 +541,10 @@
private Application load(ContentDefinition contentDef)
{
- ContentType<?> contentType = contentDef.getCustomization().getType();
+ Customization customization = contentDef.getCustomization();
+
+ //
+ ContentType<?> contentType = customization.getType();
ApplicationType<?> applicationType = ApplicationType.getType(contentType);
//
@@ -556,8 +559,8 @@
application.setAccessPermissions(new ArrayList<String>(contentDef.getAccessPermissions()));
application.setCreatedDate(contentDef.getCreationDate());
application.setModifiedDate(contentDef.getLastModificationDate());
- application.setStorageId(contentDef.getCustomization().getId());
- application.setContentId(contentDef.getCustomization().getContentId());
+ application.setStorageId(customization.getId());
+ application.setContentId(customization.getContentId());
return application;
}
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-08 23:30:06 UTC (rev 1567)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-09 00:13:13 UTC (rev 1568)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="${gatein.jcr.datasource.namee}${container.name.suffix}" />
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08 23:30:06 UTC (rev 1567)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-09 00:13:13 UTC (rev 1568)
@@ -276,7 +276,7 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system{container.name.suffix}"/>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
<property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />
14 years, 10 months
- 1
- 0
gatein SVN: r1567 - in portal/trunk/component/portal/src/main/java: org/exoplatform/portal/pom/spi/gadget and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 18:30:06 -0500 (Mon, 08 Feb 2010)
New Revision: 1567
Modified:
portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java
Log:
use mop prefix for mop state name and properties
Modified: portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 22:58:06 UTC (rev 1566)
+++ portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 23:30:06 UTC (rev 1567)
@@ -40,10 +40,10 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="mop:value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -54,7 +54,7 @@
<supertype>mop:customizationstate</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -65,13 +65,13 @@
<supertype>mop:customizationstate</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="portletid" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:portletid" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:state" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="cloned" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:cloned" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-08 22:58:06 UTC (rev 1566)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-08 23:30:06 UTC (rev 1567)
@@ -31,7 +31,7 @@
{
static final String MOP_NODE_NAME = "mop:gadget";
- @Property(name = "prefs")
+ @Property(name = "mop:prefs")
public abstract String getUserPrefs();
public abstract void setUserPrefs(String userPrefs);
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-08 22:58:06 UTC (rev 1566)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-08 23:30:06 UTC (rev 1567)
@@ -19,11 +19,8 @@
package org.exoplatform.portal.pom.spi.portlet;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.*;
+import org.gatein.mop.core.api.MOPFormatter;
import org.gatein.mop.core.api.workspace.content.AbstractCustomization;
import java.util.Map;
@@ -33,6 +30,7 @@
* @version $Revision$
*/
@PrimaryType(name = PortletState.MOP_NODE_NAME)
+(a)FormattedBy(MOPFormatter.class)
public abstract class PortletState
{
@@ -47,7 +45,7 @@
public abstract PreferenceState create();
@OneToOne
- @RelatedMappedBy("state")
+ @RelatedMappedBy("mop:state")
public abstract AbstractCustomization getCustomization();
private void setPayload(Portlet payload)
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-02-08 22:58:06 UTC (rev 1566)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-02-08 23:30:06 UTC (rev 1567)
@@ -40,17 +40,17 @@
@Name
public abstract String getName();
- @Property(name = "value")
+ @Property(name = "mop:value")
public abstract List<String> getValue();
public abstract void setValue(List<String> value);
- @Property(name = "value")
+ @Property(name = "mop:value")
public abstract List<String> getValues();
public abstract void setValues(List<String> value);
- @Property(name = "readonly")
+ @Property(name = "mop:readonly")
public abstract boolean getReadOnly();
public abstract void setReadOnly(boolean readOnly);
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-08 22:58:06 UTC (rev 1566)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-08 23:30:06 UTC (rev 1567)
@@ -36,17 +36,17 @@
{
static final String MOP_NODE_NAME = "mop:wsrpstate";
- @Property(name = "portletid")
+ @Property(name = "mop:portletid")
public abstract String getPortletId();
public abstract void setPortletId(String portletHandle);
- @Property(name = "state")
+ @Property(name = "mop:state")
public abstract InputStream getState();
public abstract void setState(InputStream state);
- @Property(name = "cloned")
+ @Property(name = "mop:cloned")
public abstract boolean getCloned();
public abstract void setCloned(boolean cloned);
14 years, 10 months
- 1
- 0
gatein SVN: r1566 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 17:58:06 -0500 (Mon, 08 Feb 2010)
New Revision: 1566
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
Log:
remove the useless properties
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-08 22:49:36 UTC (rev 1565)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-08 22:58:06 UTC (rev 1566)
@@ -47,36 +47,15 @@
public static final Key<Boolean> SHOW_MAX_WINDOW = Key.create("show-max-window", ValueType.BOOLEAN);
/** . */
- public static final Key<String> TITLE = Key.create("title", ValueType.STRING);
-
- /** . */
public static final Key<String> FACTORY_ID = Key.create("factory-id", ValueType.STRING);
/** . */
- public static final Key<String> ACCESS_PERMISSIONS = Key.create("access-permissions", ValueType.STRING);
-
- /** . */
- public static final Key<String> EDIT_PERMISSION = Key.create("edit-permissions", ValueType.STRING);
-
- /** . */
- public static final Key<String> CREATOR = Key.create("creator", ValueType.STRING);
-
- /** . */
- public static final Key<String> MODIFIER = Key.create("modifier", ValueType.STRING);
-
- /** . */
- public static final Key<String> DESCRIPTION = Key.create("description", ValueType.STRING);
-
- /** . */
public static final Key<String> DECORATOR = Key.create("decorator", ValueType.STRING);
/** . */
public static final Key<Integer> PRIORITY = Key.create("priority", ValueType.INTEGER);
/** . */
- public static final Key<String> LABEL = Key.create("label", ValueType.STRING);
-
- /** . */
public static final Key<String> ICON = Key.create("icon", ValueType.STRING);
/** . */
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 22:49:36 UTC (rev 1565)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 22:58:06 UTC (rev 1566)
@@ -73,29 +73,22 @@
/** . */
private static final Set<String> propertiesBlackList = Tools.set(
"jcr:uuid",
- "jcr:primaryType",
- MappedAttributes.ACCESS_PERMISSIONS.getName(),
- MappedAttributes.EDIT_PERMISSION.getName());
+ "jcr:primaryType");
/** . */
private static final Set<String> portalPropertiesBlackList =
Tools.set(
MappedAttributes.LOCALE.getName(),
- MappedAttributes.SKIN.getName(),
- MappedAttributes.TITLE.getName(),
- MappedAttributes.CREATOR.getName(),
- MappedAttributes.MODIFIER.getName());
+ MappedAttributes.SKIN.getName());
/** . */
private static final Set<String> windowPropertiesBlackList =
Tools.set(
MappedAttributes.TYPE.getName(),
MappedAttributes.THEME.getName(),
- MappedAttributes.TITLE.getName(),
MappedAttributes.SHOW_INFO_BAR.getName(),
MappedAttributes.SHOW_STATE.getName(),
MappedAttributes.SHOW_MODE.getName(),
- MappedAttributes.DESCRIPTION.getName(),
MappedAttributes.ICON.getName(),
MappedAttributes.WIDTH.getName(),
MappedAttributes.HEIGHT.getName());
14 years, 10 months
- 1
- 0
gatein SVN: r1565 - in portal/trunk/component/portal/src: test/java/org/exoplatform/portal/config and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-08 17:49:36 -0500 (Mon, 08 Feb 2010)
New Revision: 1565
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
Log:
converted navigation to use gtn:described mixin instead of label
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 22:30:40 UTC (rev 1564)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-08 22:49:36 UTC (rev 1565)
@@ -156,10 +156,15 @@
pageReference = getOwnerType(siteType) + "::" + site.getName() + "::" + target.getName();
}
}
+
+ //
+ Described described = src.adapt(Described.class);
+
+ //
NavigationNodeData dstNode = new NavigationNodeData(
src.getObjectId(),
attrs.getValue(MappedAttributes.URI),
- attrs.getValue(MappedAttributes.LABEL),
+ described.getName(),
attrs.getValue(MappedAttributes.ICON),
src.getName(),
attrs.getValue(MappedAttributes.START_PUBLICATION_DATE),
@@ -204,9 +209,12 @@
}
//
+ Described described = dst.adapt(Described.class);
+ described.setName(node.getLabel());
+
+ //
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.URI, node.getURI());
- attrs.setValue(MappedAttributes.LABEL, node.getLabel());
attrs.setValue(MappedAttributes.ICON, node.getIcon());
attrs.setValue(MappedAttributes.START_PUBLICATION_DATE, node.getStartPublicationDate());
attrs.setValue(MappedAttributes.END_PUBLICATION_DATE, node.getEndPublicationDate());
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 22:30:40 UTC (rev 1564)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-08 22:49:36 UTC (rev 1565)
@@ -108,9 +108,10 @@
assertNotNull(nodeNavigation);
assertEquals(0, nodeNavigation.getChildren().size());
assertEquals("node_name", nodeNavigation.getName());
+ Described nodeDescribed = nodeNavigation.adapt(Described.class);
+ assertEquals("node_label", nodeDescribed.getName());
Attributes nodeAttrs = nodeNavigation.getAttributes();
assertEquals("node_uri", nodeAttrs.getString("uri"));
- assertEquals("node_label", nodeAttrs.getString("label"));
assertEquals("node_icon", nodeAttrs.getString("icon"));
GregorianCalendar start = new GregorianCalendar(2000, 2, 21, 1, 33, 0);
start.setTimeZone(TimeZone.getTimeZone("UTC"));
14 years, 10 months
- 1
- 0
gatein SVN: r1564 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/data and 28 other directories.
by do-not-reply＠jboss.org
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());
14 years, 10 months
- 1
- 0
gatein SVN: r1563 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/config and 9 other directories.
by do-not-reply＠jboss.org
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());
14 years, 10 months
- 1
- 0