Author: julien_viet Date: 2010-02-26 17:59:06 -0500 (Fri, 26 Feb 2010) New Revision: 1892 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 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 portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.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 Log: remove useless persistence of "decorator" container attribute Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java 2010-02-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Container.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -29,10 +29,7 @@ import java.util.List; /** - * May 13, 2004 - * @author: Tuan Nguyen - * @email: tuan08(a)users.sourceforge.net - * @version: $Id: Container.java,v 1.8 2004/11/03 01:23:55 tuan08 Exp $ + * @author Tuan Nguyen **/ public class Container extends ModelObject { @@ -43,8 +40,6 @@ protected String icon; - protected String decorator; - protected String template; protected String factoryId; @@ -57,6 +52,9 @@ protected String height; + // Here to please jibx binding but not used anymore + protected String decorator; + protected String[] accessPermissions; protected ArrayList<ModelObject> children; @@ -89,7 +87,6 @@ this.id = data.getId(); this.name = data.getName(); this.icon = data.getIcon(); - this.decorator = data.getDecorator(); this.template = data.getTemplate(); this.factoryId = data.getFactoryId(); this.title = data.getTitle(); @@ -160,16 +157,6 @@ this.width = width; } - public String getDecorator() - { - return decorator; - } - - public void setDecorator(String s) - { - decorator = s; - } - public String getDescription() { return description; @@ -220,6 +207,18 @@ this.accessPermissions = accessPermissions; } + public String getDecorator() + { + // Here to please jibx binding but not used anymore + return null; + } + + // Here to please jibx binding but not used anymore + public void setDecorator(String decorator) + { + // Here to please jibx binding but not used anymore + } + @Override public ContainerData build() { @@ -229,7 +228,6 @@ id, name, icon, - decorator, template, factoryId, title, Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java 2010-02-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Dashboard.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -55,7 +55,6 @@ id, name, icon, - decorator, template, factoryId, title, 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -158,7 +158,6 @@ id, name, icon, - decorator, template, factoryId, title, Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2010-02-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ContainerData.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -37,9 +37,6 @@ private final String icon; /** . */ - private final String decorator; - - /** . */ private final String template; /** . */ @@ -68,7 +65,6 @@ String id, String name, String icon, - String decorator, String template, String factoryId, String title, @@ -84,7 +80,6 @@ this.id = id; this.name = name; this.icon = icon; - this.decorator = decorator; this.template = template; this.factoryId = factoryId; this.title = title; @@ -110,11 +105,6 @@ return icon; } - public String getDecorator() - { - return decorator; - } - public String getTemplate() { return template; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2010-02-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/DashboardData.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -34,7 +34,6 @@ String id, String name, String icon, - String decorator, String template, String factoryId, String title, @@ -49,7 +48,6 @@ id, name, icon, - decorator, template, factoryId, title, @@ -73,7 +71,6 @@ null, null, null, - null, "classpath:groovy/dashboard/webui/component/UIContainer.gtmpl", null, null, @@ -90,7 +87,6 @@ null, null, null, - null, "classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl", null, null, 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -50,9 +50,6 @@ public static final Key<String> FACTORY_ID = Key.create("factory-id", ValueType.STRING); /** . */ - public static final Key<String> DECORATOR = Key.create("decorator", ValueType.STRING); - - /** . */ public static final Key<Integer> PRIORITY = Key.create("priority", ValueType.INTEGER); /** . */ 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -384,7 +384,6 @@ name, null, null, - null, attrs.getValue(MappedAttributes.FACTORY_ID), described.getName(), described.getDescription(), @@ -418,7 +417,6 @@ attrs.getValue(MappedAttributes.ID), attrs.getValue(MappedAttributes.NAME), attrs.getValue(MappedAttributes.ICON), - attrs.getValue(MappedAttributes.DECORATOR), attrs.getValue(MappedAttributes.TEMPLATE), attrs.getValue(MappedAttributes.FACTORY_ID), described.getName(), @@ -564,7 +562,6 @@ 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.WIDTH, src.getWidth()); dstAttrs.setValue(MappedAttributes.HEIGHT, src.getHeight()); dstAttrs.setValue(MappedAttributes.NAME, src.getName()); @@ -1082,7 +1079,6 @@ attrs.getValue(MappedAttributes.ID), attrs.getValue(MappedAttributes.NAME), attrs.getValue(MappedAttributes.ICON), - attrs.getValue(MappedAttributes.DECORATOR), attrs.getValue(MappedAttributes.TEMPLATE), attrs.getValue(MappedAttributes.FACTORY_ID), described.getName(), 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageData.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -41,7 +41,6 @@ String id, String name, String icon, - String decorator, String template, String factoryId, String title, @@ -55,7 +54,7 @@ String editPermission, boolean showMaxWindow) { - super(storageId, id, name, icon, decorator, template, factoryId, title, description, width, height, accessPermissions, children); + super(storageId, id, name, icon, template, factoryId, title, description, width, height, accessPermissions, children); // this.key = new PageKey(ownerType, ownerId, name); 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -197,7 +197,6 @@ assertEquals("container_1_template", container1.getTemplate()); assertTrue(Arrays.equals(new String[]{"container_1_access_permissions"}, container1.getAccessPermissions())); assertEquals("container_1_factory_id", container1.getFactoryId()); - assertEquals("container_1_decorator", container1.getDecorator()); assertEquals("container_1_description", container1.getDescription()); assertEquals("container_1_width", container1.getWidth()); assertEquals("container_1_height", container1.getHeight()); 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-26 22:29:58 UTC (rev 1891) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 22:59:06 UTC (rev 1892) @@ -25,7 +25,6 @@ import org.exoplatform.portal.mop.ProtectedResource; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; -import org.exoplatform.test.BasicTestCase; import org.gatein.mop.api.Attributes; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.Navigation; @@ -203,7 +202,6 @@ 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_width", container1Attrs.getString("width")); assertEquals("container_1_height", container1Attrs.getString("height"));