Author: julien_viet Date: 2009-12-11 06:39:06 -0500 (Fri, 11 Dec 2009) New Revision: 991 Added: portal/trunk/component/portal/src/test/java/conf/test-configuration.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java portal/trunk/component/portal/src/test/resources/portal/group/template/ portal/trunk/component/portal/src/test/resources/portal/group/template/group/ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml Removed: portal/trunk/component/portal/src/test/java/conf/portal/ Modified: portal/trunk/component/portal/pom.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.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/TestOrganization.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.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/java/org/exoplatform/portal/config/TestWSRP.java portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/ConfiguredBy.java Log: first attempt to migrate component.portal to the component test framework Modified: portal/trunk/component/portal/pom.xml =================================================================== --- portal/trunk/component/portal/pom.xml 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/pom.xml 2009-12-11 11:39:06 UTC (rev 991) @@ -107,6 +107,27 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> <build> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 11:39:06 UTC (rev 991) @@ -129,7 +129,7 @@ // Create the portal from the template portalConfigService.createUserPortalConfig(PortalConfig.GROUP_TYPE, groupId, "group"); - // Need to insert the corresponding user site + // Need to insert the corresponding group site PortalConfig cfg = dataStorage.getPortalConfig(PortalConfig.GROUP_TYPE, groupId); if (cfg == null) { Added: portal/trunk/component/portal/src/test/java/conf/test-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/test-configuration.xml (rev 0) +++ portal/trunk/component/portal/src/test/java/conf/test-configuration.xml 2009-12-11 11:39:06 UTC (rev 991) @@ -0,0 +1,924 @@ +<?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. + +--> + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.cache.CacheService</key> + <jmx-name>cache:type=CacheService</jmx-name> + <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> + <init-params> + <object-param> + <name>cache.config.default</name> + <description>The default cache configuration</description> + <object type="org.exoplatform.services.cache.ExoCacheConfig"> + <field name="name"><string>default</string></field> + <field name="maxSize"><int>300</int></field> + <field name="liveTime"><long>6000</long></field> + <field name="distributed"><boolean>false</boolean></field> + <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.security.Authenticator</key> + <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> + </component> + + <component> + <key>org.exoplatform.services.listener.ListenerService</key> + <type>org.exoplatform.services.listener.ListenerService</type> + </component> + + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> + + <component> + <key>org.exoplatform.portal.pom.config.POMSessionManager</key> + <type>org.exoplatform.portal.pom.config.POMSessionManager</type> + </component> + + <component> + <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> + <type>org.exoplatform.portal.pom.config.POMDataStorage</type> + </component> + + <component> + <key>org.exoplatform.portal.config.DataStorage</key> + <type>org.exoplatform.portal.config.DataStorageImpl</type> + </component> + + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> + + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>platform/test/legacy</string> + </value> + <value> + <string>platform/test/normalized</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>overwritelayout</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>classpath:/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/mop-nodetypes.xml</value> + <value>jar:/conf/content-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> + <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> + <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <description>this listener populate organization data for the first launch</description> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <description>check database</description> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <description>Print information init database</description> + <value>true</value> + </value-param> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>manager</string></field> + <field name="description"><string>manager membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>member</string></field> + <field name="description"><string>member membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>validator</string></field> + <field name="description"><string>validator membership type</string></field> + </object> + </value> + </collection> + </field> + + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>administrators</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/administrators group</string></field> + <field name="label"><string>Administrators</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>guests</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/guests group</string></field> + <field name="label"><string>Guests</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>organization</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the organization group</string></field> + <field name="label"><string>Organization</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>management</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/management group</string></field> + <field name="label"><string>Management</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>executive-board</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/executive-board group</string></field> + <field name="label"><string>Executive Board</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>human-resources</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/human-resource group</string></field> + <field name="label"><string>Human Resources</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>communication</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/communication group</string></field> + <field name="label"><string>Communication</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>marketing</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/marketing group</string></field> + <field name="label"><string>Marketing</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>press-and-media</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/press-and-media group</string></field> + <field name="label"><string>Press and Media</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>operations</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/operations and media group</string></field> + <field name="label"><string>Operations</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>sales</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/sales group</string></field> + <field name="label"><string>Sales</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>finances</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/finances group</string></field> + <field name="label"><string>Finances</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>customers</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /customers group</string></field> + <field name="label"><string>Customers</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>partners</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /partners group</string></field> + <field name="label"><string>Partners</string></field> + </object> + </value> + </collection> + </field> + + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Root</string></field> + <field name="lastName"><string>Root</string></field> + <field name="email"><string>root@localhost</string></field> + <field name="groups"> + <string> + manager:/platform/administrators,member:/platform/users, + member:/organization/management/executive-board + </string> + </field> + </object> + </value> + + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>john</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>John</string></field> + <field name="lastName"><string>Anthony</string></field> + <field name="email"><string>john@localhost</string></field> + <field name="groups"> + <string> + member:/platform/administrators,member:/platform/users, + manager:/organization/management/executive-board + </string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>mary</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Mary</string></field> + <field name="lastName"><string>Kelly</string></field> + <field name="email"><string>mary@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>demo</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Demo</string></field> + <field name="lastName"><string>gtn</string></field> + <field name="email"><string>demo@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests,member:/platform/users</string> + </field> + </object> + </value> + + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>overwritelayout</string></field> + <field name="password"><string>whatever</string></field> + <field name="firstName"><string>whatever</string></field> + <field name="lastName"><string>whatever</string></field> + <field name="email"><string>whatever@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests</string> + </field> + </object> + </value> + + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"><string>/platform/users</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>mary</string></value> + <value><string>demo</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>user.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.UserPortalConfigListener</type> + </component-plugin> + + <component-plugin> + <name>group.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.GroupPortalConfigListener</type> + </component-plugin> + + </external-component-plugins> + + <!-- + + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + </init-params> + </component> + <component> + <key>org.exoplatform.services.portletcontainer.bundle.ResourceBundleDelegate</key> + <type>org.exoplatform.portal.application.ResourceBundleDelegateImpl</type> + </component> + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>platform/test/legacy</string> + </value> + <value> + <string>platform/test/normalized</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>overwritelayout</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>classpath:/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> + </component> + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> + <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> + <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcexo</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal" /> + <property name="username" value="sa" /> + <property name="password" value="" /> + </properties-param> + </init-params> + </component-plugin> + </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> + <component-plugin> + <name>addPaths</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.AddPathPlugin</type> + <init-params> + <object-param> + <name>cms.configuration</name> + <description>configuration for the cms path</description> + <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig"> + <field name="repository"> + <string>repository</string> + </field> + <field name="workspaces"> + <collection type="java.util.ArrayList"> + <value> + <string>portal-system</string> + </value> + </collection> + </field> + <field name="jcrPaths"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath"> + <field name="alias"> + <string>usersPath</string> + </field> + <field name="path"> + <string>/Users</string> + </field> + <field name="permissions"> + <collection type="java.util.ArrayList"> + <value> + <object + type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission"> + <field name="identity"> + <string>*:/platform/administrators</string> + </field> + <field name="read"> + <string>true</string> + </field> + <field name="addNode"> + <string>true</string> + </field> + <field name="setProperty"> + <string>true</string> + </field> + <field name="remove"> + <string>true</string> + </field> + </object> + </value> + <value> + <object + type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission"> + <field name="identity"> + <string>*:/platform/users</string> + </field> + <field name="read"> + <string>true</string> + </field> + <field name="addNode"> + <string>false</string> + </field> + <field name="setProperty"> + <string>true</string> + </field> + <field name="remove"> + <string>false</string> + </field> + </object> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> +--> +</configuration> Added: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java (rev 0) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2009-12-11 11:39:06 UTC (rev 991) @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.exoplatform.portal.config; + +import org.exoplatform.component.test.AbstractGateInTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/organization/organization-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml") +}) +public abstract class AbstractPortalTest extends AbstractGateInTest +{ + + public AbstractPortalTest() + { + } + + public AbstractPortalTest(String name) + { + super(name); + } +} Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2009-12-11 11:39:06 UTC (rev 991) @@ -30,7 +30,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestCache extends BasicTestCase +public class TestCache extends AbstractPortalTest { /** . */ Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-11 11:39:06 UTC (rev 991) @@ -27,7 +27,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestContentRegistry extends BasicTestCase +public class TestContentRegistry extends AbstractPortalTest { /** . */ 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 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-12-11 11:39:06 UTC (rev 991) @@ -40,7 +40,6 @@ import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; -import org.exoplatform.test.BasicTestCase; import java.util.ArrayList; import java.util.Collections; @@ -50,7 +49,7 @@ * Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov * 13, 2007 */ -public class TestDataStorage extends BasicTestCase +public class TestDataStorage extends AbstractPortalTest { private final String testPortal = "testPortal"; Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-11 11:39:06 UTC (rev 991) @@ -26,13 +26,12 @@ import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.gadget.Gadget; -import org.exoplatform.test.BasicTestCase; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestGadget extends BasicTestCase +public class TestGadget extends AbstractPortalTest { /** . */ @@ -62,7 +61,6 @@ public void testBilto() throws Exception { - Gadget gadget = new Gadget(); gadget.setUserPref("user_pref"); TransientApplicationState<Gadget> state = new TransientApplicationState<Gadget>("bar", gadget); 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 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2009-12-11 11:39:06 UTC (rev 991) @@ -43,7 +43,7 @@ * Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov * 13, 2007 */ -public class TestLoadedPOM extends BasicTestCase +public class TestLoadedPOM extends AbstractPortalTest { /** . */ Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestOrganization.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestOrganization.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestOrganization.java 2009-12-11 11:39:06 UTC (rev 991) @@ -35,7 +35,7 @@ * Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov * 13, 2007 */ -public class TestOrganization extends BasicTestCase +public class TestOrganization extends AbstractPortalTest { private OrganizationService organizationService; Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2009-12-11 11:39:06 UTC (rev 991) @@ -29,12 +29,11 @@ import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.UserHandler; -import org.exoplatform.test.BasicTestCase; /** * Author : TrongTT */ -public class TestPortalConfig extends BasicTestCase +public class TestPortalConfig extends AbstractPortalTest { private DataStorage storage; @@ -115,7 +114,7 @@ PortalConfig pConfig = storage.getPortalConfig(PortalConfig.GROUP_TYPE, "/groupTest"); assertNotNull("the Group's PortalConfig is not null", pConfig); - assertTrue(pConfig.getPortalLayout().getChildren() == null || pConfig.getPortalLayout().getChildren().size() < 1); + assertTrue(pConfig.getPortalLayout().getChildren() == null || pConfig.getPortalLayout().getChildren().size() == 4); } public void testUserLayout() throws Exception Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-11 11:39:06 UTC (rev 991) @@ -33,7 +33,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestPortletPreferences extends BasicTestCase +public class TestPortletPreferences extends AbstractPortalTest { public TestPortletPreferences(String name) 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 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2009-12-11 11:39:06 UTC (rev 991) @@ -43,7 +43,7 @@ * Created by The eXo Platform SARL Author : Tung Pham thanhtungty(a)gmail.com Nov * 13, 2007 */ -public class TestSavedPOM extends BasicTestCase +public class TestSavedPOM extends AbstractPortalTest { /** . */ 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 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-12-11 11:39:06 UTC (rev 991) @@ -63,7 +63,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestUserPortalConfigService extends BasicTestCase +public class TestUserPortalConfigService extends AbstractPortalTest { /** . */ Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-11 11:39:06 UTC (rev 991) @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class TestWSRP extends BasicTestCase +public class TestWSRP extends AbstractPortalTest { /** . */ Added: 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 (rev 0) +++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2009-12-11 11:39:06 UTC (rev 991) @@ -0,0 +1,86 @@ +<?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. + --> + +<portal-config> + <portal-name>@owner@</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <creator>root</creator> + <properties> + <entry key="sessionAlive">onDemand</entry> + </properties> + + <portal-layout> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>LogoPortlet</portlet-ref> + <preferences> + <preference> + <name>url</name> + <value>/eXoResources/skin/sharedImages/GroupIcon.png</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>NavigationPortlet</portlet-ref> + <preferences> + <preference> + <name>CSSClassName</name> + <value>GroupNavigation</value> + <read-only>true</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <page-body> + </page-body> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>FooterPortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + </portal-layout> + +</portal-config> Modified: portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/ConfiguredBy.java =================================================================== --- portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/ConfiguredBy.java 2009-12-11 11:19:40 UTC (rev 990) +++ portal/trunk/component/test/core/src/main/java/org/exoplatform/component/test/ConfiguredBy.java 2009-12-11 11:39:06 UTC (rev 991) @@ -19,6 +19,7 @@ package org.exoplatform.component.test; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -32,6 +33,7 @@ */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) +@Inherited public @interface ConfiguredBy {