Author: theute Date: 2011-10-03 18:45:45 -0400 (Mon, 03 Oct 2011) New Revision: 7635 Added: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PageImporter.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PortalConfigImporter.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml Removed: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml Log: JBEPP-1249: A site should not be overwritten when the workspace import marker is not present Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331-7334,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555,7598 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7598 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-10-03 21:53:54 UTC (rev 7634) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-10-03 22:45:45 UTC (rev 7635) @@ -20,6 +20,8 @@ package org.exoplatform.portal.config; import java.util.HashSet; +import java.util.Map; +import java.util.Set; /** * Author : Nhu Dinh Thuan @@ -43,6 +45,8 @@ private String importMode; + final Set<String> createdOwners = new HashSet<String>(); + /** * @deprecated use the location instead */ Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-10-03 21:53:54 UTC (rev 7634) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-10-03 22:45:45 UTC (rev 7635) @@ -433,7 +433,10 @@ { for (String owner : config.getPredefinedOwner()) { - createPortalConfig(config, owner); + if (createPortalConfig(config, owner)) + { + config.createdOwners.add(owner); + } } } @@ -441,7 +444,10 @@ { for (String owner : config.getPredefinedOwner()) { - createPage(config, owner); + if (config.createdOwners.contains(owner)) + { + createPage(config, owner); + } } } @@ -464,50 +470,48 @@ } } - public void createPortalConfig(NewPortalConfig config, String owner) throws Exception + public boolean createPortalConfig(NewPortalConfig config, String owner) throws Exception { - try + String type = config.getOwnerType(); + PortalConfig currentPortalConfig = dataStorage_.getPortalConfig(type, owner); + if (currentPortalConfig == null) { - String type = config.getOwnerType(); - UnmarshalledObject<PortalConfig> obj = getConfig(config, owner, type, PortalConfig.class); + try + { + UnmarshalledObject<PortalConfig> obj = getConfig(config, owner, type, PortalConfig.class); - if (obj == null) - { - // Ensure that the PortalConfig has been defined - // The PortalConfig could be empty if the related PortalConfigListener - // has been launched after starting this service - PortalConfig cfg = dataStorage_.getPortalConfig(type, owner); - if (cfg == null) + if (obj == null) { - cfg = new PortalConfig(type); - cfg.setPortalLayout(new Container()); - cfg.setName(owner); - dataStorage_.create(cfg); + // Ensure that the PortalConfig has been defined + // The PortalConfig could be empty if the related PortalConfigListener + // has been launched after starting this service + PortalConfig cfg = dataStorage_.getPortalConfig(type, owner); + if (cfg == null) + { + cfg = new PortalConfig(type); + cfg.setPortalLayout(new Container()); + cfg.setName(owner); + dataStorage_.create(cfg); + return true; + } } - return; + else + { + PortalConfig pconfig = obj.getObject(); + // We use that owner value because it may have been fixed for group names + owner = pconfig.getName(); + dataStorage_.create(pconfig); + return true; + } } - - // - PortalConfig pconfig = obj.getObject(); - - // We use that owner value because it may have been fixed for group names - owner = pconfig.getName(); - - // - PortalConfig currentPortalConfig = dataStorage_.getPortalConfig(type, owner); - if (currentPortalConfig == null) + catch (IOException e) { - dataStorage_.create(pconfig); + log.error("Could not load portal configuration", e); } - else - { - dataStorage_.save(pconfig); - } } - catch (IOException e) - { - log.error("Could not load portal configuration", e); - } + + // + return false; } public void createPage(NewPortalConfig config, String owner) throws Exception Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PageImporter.java (from rev 7450, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PageImporter.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PageImporter.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PageImporter.java 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.mop.importer; + +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.model.Page; + +/** + * @author <a href=&quot;trongtt(a)gmail.com&quot;&gt;Trong Tran</a> + * @version $Revision$ + */ +public class PageImporter +{ + /** . */ + private final Page src; + + /** . */ + private final DataStorage service; + + /** . */ + private final ImportMode mode; + + public PageImporter(ImportMode importMode, Page page, DataStorage dataStorage_) + { + this.mode = importMode; + this.src = page; + this.service = dataStorage_; + } + + public void perform() throws Exception + { + Page existingPage = service.getPage(src.getPageId()); + Page dst; + + // + switch (mode) + { + case CONSERVE: + dst = null; + break; + case INSERT: + if (existingPage == null) + { + dst = src; + } + else + { + dst = null; + } + break; + case MERGE: + case OVERWRITE: + dst = src; + break; + default: + throw new AssertionError(); + } + + if (dst != null) + { + service.create(dst); + } + } +} Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PortalConfigImporter.java (from rev 7450, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PortalConfigImporter.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PortalConfigImporter.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/importer/PortalConfigImporter.java 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.mop.importer; + +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.model.PortalConfig; + +/** + * @author <a href=&quot;trongtt(a)gmail.com&quot;&gt;Trong Tran</a> + * @version $Revision$ + */ +public class PortalConfigImporter +{ + /** . */ + private final PortalConfig src; + + /** . */ + private final DataStorage service; + + /** . */ + private final ImportMode mode; + + public PortalConfigImporter(ImportMode importMode, PortalConfig portal, DataStorage dataStorage_) + { + this.mode = importMode; + this.src = portal; + this.service = dataStorage_; + } + + public void perform() throws Exception + { + PortalConfig existingPortalConfig = service.getPortalConfig(src.getType(), src.getName()); + PortalConfig dst = null; + + // + switch (mode) + { + case CONSERVE: + dst = null; + break; + case INSERT: + if (existingPortalConfig == null) + { + dst = src; + } + else + { + dst = null; + } + break; + case MERGE: + case OVERWRITE: + dst = src; + break; + default: + throw new AssertionError(); + } + + if (dst != null) + { + if (existingPortalConfig == null) + { + service.create(dst); + } + else + { + service.save(dst); + } + } + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java 2011-10-03 21:53:54 UTC (rev 7634) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java 2011-10-03 22:45:45 UTC (rev 7635) @@ -24,6 +24,11 @@ import org.exoplatform.component.test.KernelBootstrap; import org.exoplatform.container.PortalContainer; import org.exoplatform.container.component.RequestLifeCycle; +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteKey; import org.exoplatform.portal.mop.importer.Imported; import org.exoplatform.portal.mop.navigation.NavigationContext; @@ -32,6 +37,7 @@ import org.exoplatform.portal.mop.navigation.NodeContext; import org.exoplatform.portal.mop.navigation.Scope; import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.gatein.mop.api.workspace.Workspace; import java.io.File; @@ -99,4 +105,70 @@ RequestLifeCycle.end(); bootstrap.dispose(); } + + public void testNoMixin() throws Exception + { + KernelBootstrap bootstrap = new KernelBootstrap(); + bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.test.jcr-configuration.xml"); + bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.identity-configuration.xml"); + bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.portal-configuration.xml"); + bootstrap.addConfiguration(ContainerScope.PORTAL, "org/exoplatform/portal/config/TestImport1-configuration.xml"); + + // + System.setProperty("override.1", "false"); + System.setProperty("import.mode.1", "conserve"); + System.setProperty("import.portal.1", "site1"); + + // + bootstrap.boot(); + PortalContainer container = bootstrap.getContainer(); + DataStorage service = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + RequestLifeCycle.begin(container); + POMSessionManager mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); + Workspace workspace = mgr.getSession().getWorkspace(); + assertTrue(workspace.isAdapted(Imported.class)); + long when1 = workspace.adapt(Imported.class).getCreationDate().getTime(); + PortalConfig portal = service.getPortalConfig("classic"); + Container layout = portal.getPortalLayout(); + assertEquals(1, layout.getChildren().size()); + Application<Portlet> layoutPortlet = (Application<Portlet>)layout.getChildren().get(0); + assertEquals("site1/layout", service.getId(layoutPortlet.getState())); + Page page1 = service.getPage("portal::classic::page1"); + assertEquals(1, page1.getChildren().size()); + Application<Portlet> page1Portlet = (Application<Portlet>)page1.getChildren().get(0); + assertEquals("site1/page1", service.getId(page1Portlet.getState())); + workspace.removeAdapter(Imported.class); + mgr.getSession().save(); + RequestLifeCycle.end(); + bootstrap.dispose(); + + // + System.setProperty("override.1", "false"); + System.setProperty("import.mode.1", "conserve"); + System.setProperty("import.portal.1", "site2"); + + // + bootstrap.boot(); + container = bootstrap.getContainer(); + service = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); + RequestLifeCycle.begin(container); + mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); + workspace = mgr.getSession().getWorkspace(); + assertTrue(workspace.isAdapted(Imported.class)); + long when2 = workspace.adapt(Imported.class).getCreationDate().getTime(); + assertTrue(when2 > when1); + portal = service.getPortalConfig("classic"); + layout = portal.getPortalLayout(); + assertEquals(1, layout.getChildren().size()); + layoutPortlet = (Application<Portlet>)layout.getChildren().get(0); + assertEquals("site1/layout", service.getId(layoutPortlet.getState())); + page1 = service.getPage("portal::classic::page1"); + assertEquals(1, page1.getChildren().size()); + page1Portlet = (Application<Portlet>)page1.getChildren().get(0); + assertEquals("site1/page1", service.getId(page1Portlet.getState())); + Page page2 = service.getPage("portal::classic::page2"); + assertNull(page2); + RequestLifeCycle.end(); + bootstrap.dispose(); + } } Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml 2011-10-03 21:53:54 UTC (rev 7634) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/conf/configuration.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -130,6 +130,7 @@ </field> </object> </object-param> +<!-- <object-param> <name>user.configuration</name> <object type="org.exoplatform.portal.config.NewPortalConfig"> @@ -148,6 +149,7 @@ </field> </object> </object-param> +--> </init-params> </component-plugin> </external-component-plugins> @@ -298,6 +300,18 @@ </field> </object> </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>overwritelayout</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Overwrite</string></field> + <field name="lastName"><string>Layout</string></field> + <field name="email"><string>overwrite@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> </collection> </field> </object> Deleted: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml 2011-09-07 13:54:58 UTC (rev 7330) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<page-set - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> - - <page> - <name>page1</name> - <portlet-application> - <portlet> - <application-ref>site1</application-ref> - <portlet-ref>page1</portlet-ref> - </portlet> - <access-permissions>Everyone</access-permissions> - <show-info-bar>true</show-info-bar> - </portlet-application> - </page> - -</page-set> Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml (from rev 7330, portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/pages.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> + + <page> + <name>page1</name> + <portlet-application> + <portlet> + <application-ref>site1</application-ref> + <portlet-ref>page1</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>true</show-info-bar> + </portlet-application> + </page> + +</page-set> Deleted: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml 2011-09-07 13:54:58 UTC (rev 7330) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2011 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portal-config - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> - <portal-name>classic</portal-name> - <locale>en</locale> - <access-permissions>Everyone</access-permissions> - <edit-permission>*:/platform/administrators</edit-permission> - <portal-layout> - <portlet-application> - <portlet> - <application-ref>site1</application-ref> - <portlet-ref>layout</portlet-ref> - </portlet> - <access-permissions>Everyone</access-permissions> - <show-info-bar>true</show-info-bar> - </portlet-application> - </portal-layout> -</portal-config> Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml (from rev 7330, portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site1-conf/portal/classic/portal.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2011 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<portal-config + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> + <portal-name>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <portal-layout> + <portlet-application> + <portlet> + <application-ref>site1</application-ref> + <portlet-ref>layout</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>true</show-info-bar> + </portlet-application> + </portal-layout> +</portal-config> Deleted: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml 2011-09-07 13:54:58 UTC (rev 7330) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<page-set - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> - - <page> - <name>page1</name> - <portlet-application> - <portlet> - <application-ref>site2</application-ref> - <portlet-ref>page1</portlet-ref> - </portlet> - <access-permissions>Everyone</access-permissions> - <show-info-bar>true</show-info-bar> - </portlet-application> - </page> - - <page> - <name>page2</name> - <portlet-application> - <portlet> - <application-ref>site2</application-ref> - <portlet-ref>page2</portlet-ref> - </portlet> - <access-permissions>Everyone</access-permissions> - <show-info-bar>true</show-info-bar> - </portlet-application> - </page> - -</page-set> Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml (from rev 7330, portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/pages.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> + + <page> + <name>page1</name> + <portlet-application> + <portlet> + <application-ref>site2</application-ref> + <portlet-ref>page1</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>true</show-info-bar> + </portlet-application> + </page> + + <page> + <name>page2</name> + <portlet-application> + <portlet> + <application-ref>site2</application-ref> + <portlet-ref>page2</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>true</show-info-bar> + </portlet-application> + </page> + +</page-set> Deleted: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml =================================================================== --- portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml 2011-09-07 13:54:58 UTC (rev 7330) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2011 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portal-config - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> - <portal-name>classic</portal-name> - <locale>en</locale> - <access-permissions>Everyone</access-permissions> - <edit-permission>*:/platform/administrators</edit-permission> - <portal-layout> - <portlet-application> - <portlet> - <application-ref>site2</application-ref> - <portlet-ref>layout</portlet-ref> - </portlet> - <access-permissions>Everyone</access-permissions> - <show-info-bar>true</show-info-bar> - </portlet-application> - </portal-layout> -</portal-config> Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml (from rev 7330, portal/trunk/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/org/exoplatform/portal/config/site2-conf/portal/classic/portal.xml 2011-10-03 22:45:45 UTC (rev 7635) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2011 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<portal-config + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> + <portal-name>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <portal-layout> + <portlet-application> + <portlet> + <application-ref>site2</application-ref> + <portlet-ref>layout</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>true</show-info-bar> + </portlet-application> + </portal-layout> +</portal-config>