August 2010 - gatein-commits - Jboss List Archives

gatein SVN: r3972 - in portal/branches/branched-r3845: component/application-registry/src/test and 32 other directories.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2010-08-31 02:45:13 -0400 (Tue, 31 Aug 2010) New Revision: 3972 Added: portal/branches/branched-r3845/component/application-registry/src/test/resources/ portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/ portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml portal/branches/branched-r3845/component/identity/src/test/resources/ portal/branches/branched-r3845/component/identity/src/test/resources/conf/ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml portal/branches/branched-r3845/component/portal/src/test/resources/conf/ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml portal/branches/branched-r3845/component/resources/src/test/resources/ portal/branches/branched-r3845/component/resources/src/test/resources/conf/ portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties portal/branches/branched-r3845/component/resources/src/test/resources/resources/ portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml portal/branches/branched-r3845/component/web/resources/src/test/resources/org/ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml portal/branches/branched-r3845/webui/core/src/test/resources/conf/ portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/ portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml Removed: portal/branches/branched-r3845/component/portal/src/test/java/conf/ Modified: portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml portal/branches/branched-r3845/pom.xml portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml Log: GTNPORTAL-113 resources have to be in src/[main|test]/resources and not in src/[main|test]/java Modified: portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,620 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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.application.registry.ApplicationRegistryService</key> - <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</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.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type> - <init-params> - <value-param> - <name>domain-name</name> - <value>app</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.application.registry.impl.ContentRegistry</value> - <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> - <value>org.exoplatform.application.registry.impl.ContentDefinition</value> - <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> - <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> - <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> - <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> - <value>org.chromattic.ext.ntdef.NTFile</value> - <value>org.chromattic.ext.ntdef.NTFolder</value> - <value>org.chromattic.ext.ntdef.NTResource</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>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="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/> - <property name="app" value="http://www.gatein.org/jcr/application-registry/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/application-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> - <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> - <value-param> - <name>page.templates.location</name> - <description>the path to the location that contains Page templates</description> - <value>classpath:/portal/template/pages</value> - </value-param> - <object-param> - <name>site.templates.location</name> - <description>description</description> - <object type="org.exoplatform.portal.config.SiteConfigTemplates"> - <field name="location"> - <string>classpath:/portal</string> - </field> - <field name="portalTemplates"> - <collection type="java.util.HashSet"> - <value> - <string>classic</string> - </value> - <value> - <string>test</string> - </value> - </collection> - </field> - <field name="groupTemplates"> - <collection type="java.util.HashSet"> - <value> - <string>group</string> - </value> - </collection> - </field> - <field name="userTemplates"> - <collection type="java.util.HashSet"> - <value> - <string>user</string> - </value> - </collection> - </field> - </object> - </object-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> - </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>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>MembershipType_1</string></field> - <field name="description"><string>MembershipType_1 membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>MembershipType_2</string></field> - <field name="description"><string>MembershipType_2 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>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>Group1</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group1 group</string></field> - <field name="label"><string>Group1</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>Group2</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group2 group</string></field> - <field name="label"><string>Group2</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>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/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>userName_1</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name="email"><string>exo(a)exoportal.org</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>userName_2</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name="email"><string>exo(a)exoportal.org</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - -  - - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - - </external-component-plugins> - -</configuration> Added: portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml (rev 0) +++ portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,620 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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.application.registry.ApplicationRegistryService</key> + <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</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.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>app</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.application.registry.impl.ContentRegistry</value> + <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentDefinition</value> + <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> + <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> + <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> + <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> + <value>org.chromattic.ext.ntdef.NTFile</value> + <value>org.chromattic.ext.ntdef.NTFolder</value> + <value>org.chromattic.ext.ntdef.NTResource</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>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="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/> + <property name="app" value="http://www.gatein.org/jcr/application-registry/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/application-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <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> + <value-param> + <name>page.templates.location</name> + <description>the path to the location that contains Page templates</description> + <value>classpath:/portal/template/pages</value> + </value-param> + <object-param> + <name>site.templates.location</name> + <description>description</description> + <object type="org.exoplatform.portal.config.SiteConfigTemplates"> + <field name="location"> + <string>classpath:/portal</string> + </field> + <field name="portalTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="groupTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>group</string> + </value> + </collection> + </field> + <field name="userTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>user</string> + </value> + </collection> + </field> + </object> + </object-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> + </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>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>MembershipType_1</string></field> + <field name="description"><string>MembershipType_1 membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>MembershipType_2</string></field> + <field name="description"><string>MembershipType_2 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>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>Group1</string></field> + <field name="parentId"><string>/platform/users</string></field> + <field name="description"><string>the /platform/users/Group1 group</string></field> + <field name="label"><string>Group1</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>Group2</string></field> + <field name="parentId"><string>/platform/users</string></field> + <field name="description"><string>the /platform/users/Group2 group</string></field> + <field name="label"><string>Group2</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>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/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>userName_1</string></field> + <field name="password"><string>default</string></field> + <field name="firstName"><string>default</string></field> + <field name="lastName"><string>default</string></field> + <field name="email"><string>exo(a)exoportal.org</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>userName_2</string></field> + <field name="password"><string>default</string></field> + <field name="firstName"><string>default</string></field> + <field name="lastName"><string>default</string></field> + <field name="email"><string>exo(a)exoportal.org</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + +  + + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + </external-component-plugins> + +</configuration> Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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.organization.idm.PicketLinkIDMCacheService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type> - </component> - - <component> - <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> - <init-params> - <value-param> - <name>config</name> - <value>jar:/conf/portal/idm-config.xml</value> - </value-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> - <init-params> - <object-param> - <name>configuration</name> - <object type="org.exoplatform.services.organization.idm.Config"> - <field name="useParentIdAsGroupType"> - <boolean>true</boolean> - </field> - <field name="groupTypeMappings"> - <map type="java.util.HashMap"> - <entry> - <key><string>/</string></key> - <value><string>root_type</string></value> - </entry> - <entry> - <key><string>/platform/*</string></key> - <value><string>platform_type</string></value> - </entry> - <entry> - <key><string>/platform/users</string></key> - <value><string>users_type</string></value> - </entry> - <entry> - <key><string>/organization/acme/france</string></key> - <value><string>france_type</string></value> - </entry> - <entry> - <key><string>/toto/*</string></key> - <value><string>toto_type</string></value> - </entry> - </map> - </field> -  - <field name="associationMembershipType"> - <string>member</string> - </field> -  - <field name="ignoreMappedMembershipType"> - <boolean>false</boolean> - </field> - </object> - </object-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.database.HibernateService</key> - <jmx-name>database:type=HibernateService</jmx-name> - <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> - <init-params> - <properties-param> - <name>hibernate.properties</name> - <description>Default Hibernate Service</description> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> -  -  -  - <property name="hibernate.current_session_context_class" value="thread"/> - <property name="hibernate.jdbc.batch_size" value="0"/> - <property name="hibernate.cache.use_second_level_cache" value="true"/> - <property name="hibernate.cache.use_query_cache" value="true"/> -  - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:file:${basedir}/target/temp/data/exodb${container.name.suffix}"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.connection.autocommit" value="true"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.c3p0.min_size" value="5"/> - <property name="hibernate.c3p0.max_size" value="20"/> - <property name="hibernate.c3p0.timeout" value="1800"/> - <property name="hibernate.c3p0.max_statements" value="50"/> - </properties-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.database.HibernateService</target-component> - <component-plugin> - <name>add.hibernate.mapping</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> - <init-params> - <values-param> - <name>hibernate.mapping</name> - <value>mappings/HibernateRealm.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> - <value>mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> - <value>mappings/HibernateIdentityObject.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredential.hbm.xml</value> - <value>mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectAttribute.hbm.xml</value> - <value>mappings/HibernateIdentityObjectType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationship.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> - <value>mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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"> - <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>empty</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>member</string></field> - <field name="description"><string>member membershipt 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>users</string></field> - <field name="parentId"><string></string></field> -  - <field name="description"><string>the /users group</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>demo</string></field> - <field name="password"><string>exo</string></field> - <field name="firstName"><string>demo</string></field> - <field name="lastName"><string>demo</string></field> - <field name="email"><string>demo@localhost</string></field> - <field name="groups"> - <string>member:/users</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>/users</string></field> - <field name="membership"><string>member</string></field> - </object> - </value> - </collection> - </field> - <field name="ignoredUser"> - <collection type="java.util.HashSet"> - <value><string>demo</string></value> - <value><string>admin</string></value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="DEBUG, stdout" /> - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" /> - <property name="log4j.appender.stdout.threshold" value="INFO" /> - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" /> - <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> - </properties-param> - </init-params> - </component> - - <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>300</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.database.DatabaseService</key> - <type>org.exoplatform.services.database.impl.XAPoolTxSupportDatabaseService</type> - <init-params> - <properties-param> - <name>default</name> - <description>Connection configuration</description> - <property name='connection.driver' value='org.hsqldb.jdbcDriver' /> - <property name='connection.url' value='jdbc:hsqldb:mem:db/default' /> - <property name='connection.login' value='sa' /> - <property name='connection.password' value='' /> - <property name='connection.min-size' value='3' /> - <property name='connection.max-size' value='5' /> - </properties-param> - </init-params> - </component> - - <import>classpath:/conf/portal/idm-configuration.xml</import> - <import>classpath:/conf/portal/organization-configuration.xml</import> -</configuration> \ No newline at end of file Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml (rev 0) +++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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.organization.idm.PicketLinkIDMCacheService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type> + </component> + + <component> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> + <init-params> + <value-param> + <name>config</name> + <value>jar:/conf/portal/idm-config.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> + <init-params> + <object-param> + <name>configuration</name> + <object type="org.exoplatform.services.organization.idm.Config"> + <field name="useParentIdAsGroupType"> + <boolean>true</boolean> + </field> + <field name="groupTypeMappings"> + <map type="java.util.HashMap"> + <entry> + <key><string>/</string></key> + <value><string>root_type</string></value> + </entry> + <entry> + <key><string>/platform/*</string></key> + <value><string>platform_type</string></value> + </entry> + <entry> + <key><string>/platform/users</string></key> + <value><string>users_type</string></value> + </entry> + <entry> + <key><string>/organization/acme/france</string></key> + <value><string>france_type</string></value> + </entry> + <entry> + <key><string>/toto/*</string></key> + <value><string>toto_type</string></value> + </entry> + </map> + </field> +  + <field name="associationMembershipType"> + <string>member</string> + </field> +  + <field name="ignoreMappedMembershipType"> + <boolean>false</boolean> + </field> + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <jmx-name>database:type=HibernateService</jmx-name> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> +  +  +  + <property name="hibernate.current_session_context_class" value="thread"/> + <property name="hibernate.jdbc.batch_size" value="0"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="true"/> +  + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.connection.url" value="jdbc:hsqldb:file:${basedir}/target/temp/data/exodb${container.name.suffix}"/> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> + <property name="hibernate.connection.autocommit" value="true"/> + <property name="hibernate.connection.username" value="sa"/> + <property name="hibernate.connection.password" value=""/> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.c3p0.min_size" value="5"/> + <property name="hibernate.c3p0.max_size" value="20"/> + <property name="hibernate.c3p0.timeout" value="1800"/> + <property name="hibernate.c3p0.max_statements" value="50"/> + </properties-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.database.HibernateService</target-component> + <component-plugin> + <name>add.hibernate.mapping</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> + <init-params> + <values-param> + <name>hibernate.mapping</name> + <value>mappings/HibernateRealm.hbm.xml</value> + <value>mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> + <value>mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> + <value>mappings/HibernateIdentityObject.hbm.xml</value> + <value>mappings/HibernateIdentityObjectCredential.hbm.xml</value> + <value>mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> + <value>mappings/HibernateIdentityObjectAttribute.hbm.xml</value> + <value>mappings/HibernateIdentityObjectType.hbm.xml</value> + <value>mappings/HibernateIdentityObjectRelationship.hbm.xml</value> + <value>mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> + <value>mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml (rev 0) +++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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"> + <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>empty</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>member</string></field> + <field name="description"><string>member membershipt 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>users</string></field> + <field name="parentId"><string></string></field> +  + <field name="description"><string>the /users group</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>demo</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>demo</string></field> + <field name="lastName"><string>demo</string></field> + <field name="email"><string>demo@localhost</string></field> + <field name="groups"> + <string>member:/users</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>/users</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>demo</string></value> + <value><string>admin</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml (rev 0) +++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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.log.LogConfigurationInitializer</key> + <type>org.exoplatform.services.log.LogConfigurationInitializer</type> + <init-params> + <value-param> + <name>logger</name> + <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> + </value-param> + <value-param> + <name>configurator</name> + <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> + </value-param> + <properties-param> + <name>properties</name> + <description>Log4J properties</description> + <property name="log4j.rootLogger" value="DEBUG, stdout" /> + <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" /> + <property name="log4j.appender.stdout.threshold" value="INFO" /> + <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" /> + <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> + </properties-param> + </init-params> + </component> + + <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>300</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.database.DatabaseService</key> + <type>org.exoplatform.services.database.impl.XAPoolTxSupportDatabaseService</type> + <init-params> + <properties-param> + <name>default</name> + <description>Connection configuration</description> + <property name='connection.driver' value='org.hsqldb.jdbcDriver' /> + <property name='connection.url' value='jdbc:hsqldb:mem:db/default' /> + <property name='connection.login' value='sa' /> + <property name='connection.password' value='' /> + <property name='connection.min-size' value='3' /> + <property name='connection.max-size' value='5' /> + </properties-param> + </init-params> + </component> + + <import>classpath:/conf/portal/idm-configuration.xml</import> + <import>classpath:/conf/portal/organization-configuration.xml</import> +</configuration> \ No newline at end of file Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml =================================================================== --- portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml (rev 0) +++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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>30000</int></field> + <field name="liveTime"><long>60000</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> + + <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="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/> + <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/gatein-nodetypes.xml</value> + <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>domain-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.TemplatizedImpl</value> + <value>org.gatein.mop.core.api.AttributesImpl</value> + <value>org.gatein.mop.core.api.Attribute</value> + <value>org.gatein.mop.core.api.PathAttribute</value> + <value>org.gatein.mop.core.api.StringAttribute</value> + <value>org.gatein.mop.core.api.BooleanAttribute</value> + <value>org.gatein.mop.core.api.IntegerAttribute</value> + <value>org.gatein.mop.core.api.DateAttribute</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> + <value>org.exoplatform.portal.mop.ProtectedResource</value> + <value>org.exoplatform.portal.mop.Described</value> + <value>org.exoplatform.portal.mop.Visible</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>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> + +</configuration> Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml =================================================================== --- portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml (rev 0) +++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,435 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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"> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <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> + <value-param> + <name>page.templates.location</name> + <description>the path to the location that contains Page templates</description> + <value>classpath:/portal/template/pages</value> + </value-param> + <object-param> + <name>site.templates.location</name> + <description>description</description> + <object type="org.exoplatform.portal.config.SiteConfigTemplates"> + <field name="location"> + <string>classpath:/portal</string> + </field> + <field name="portalTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="groupTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>group</string> + </value> + </collection> + </field> + <field name="userTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>user</string> + </value> + </collection> + </field> + </object> + </object-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> + <value> + <string>system</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> + </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> + + </external-component-plugins> + +</configuration> Modified: portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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>60</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.resources.LocaleConfigService</key> - <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type> - <init-params> - <value-param> - <name>locale.config.file</name> - <value>jar:/conf/locales-config.xml</value> - </value-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.resources.ResourceBundleManager</key> - <type>org.exoplatform.services.resources.ResourceBundleManager</type> - </component> - - <component> - <key>org.exoplatform.services.resources.ResourceBundleService</key> - <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> - <init-params> - <values-param> - <name>classpath.resources</name> - <description>The resources that start with the following package name should be load from file system</description> - <value>locale.portlet</value> - </values-param> - - <values-param> - <name>init.resources</name> - <description>Store the following resources into the db for the first launch </description> - <value>locale.test.resources.test</value> - </values-param> - - <values-param> - <name>portal.resource.names</name> - <description>The properties files of the portal , those file will be merged - into one ResourceBundle properties </description> - <value>local.portal.portal</value> - <value>local.portal.custom</value> - </values-param> - </init-params> - </component> - -</configuration> Modified: portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<locales-config> -  - - <locale-config> - <locale>en</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for english locale</description> - </locale-config> - - <locale-config> - <locale>fr</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the french locale</description> - </locale-config> - - <locale-config> - <locale>ar</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the arabic locale</description> - <orientation>rt</orientation> - </locale-config> - - <locale-config> - <locale>vi</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the vietnam locale</description> - </locale-config> -</locales-config> Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,28 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key1>My Default Value In English v2</key1> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,32 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key1>My Default Value In English</key1> -  - <key2>My Default Value In English</key2> -  - <key3>My Default Value In English</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key2>My New Value In English v2</key2> -  - <key3>My New Value In English v2</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key1>My New Value In English</key1> -  - <key3>My New Value In English</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ - - -<?xml version="1.0" encoding="UTF-8"?> -<bundle> - <my> -  - <key1>My Value In French v2 with special characters such as éçàùƔ௵</key1> -  - <key3>My Value In French v2 with special characters such as éçàùƔ௵</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ - - -<?xml version="1.0" encoding="UTF-8"?> -<bundle> - <my> -  - <key1>My Value In French with special characters such as éçàùƔ௵</key1> -  - <key2>My Value In French with special characters such as éçàùƔ௵</key2> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key2>Il Mio Nuovo Valore In Italiano v2</key2> -  - <key3>Il Mio Nuovo Valore In Italiano v2</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,30 +0,0 @@ -<?xml version="1.0" ?> - - -<bundle> - <my> -  - <key1>Il Mio Nuovo Valore In Italiano</key1> -  - <key3>Il Mio Nuovo Valore In Italiano</key3> - </my> -</bundle> \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,21 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=My Default Value In English v2 Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,25 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=My Default Value In English -# key2 -my.key2=My Default Value In English -# key3 -my.key3=My Default Value In English \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key2 -my.key2=My New Value In English v2 -# key3 -my.key3=My New Value In English v2 Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=My New Value In English -# key3 -my.key3=My New Value In English Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 -# key3 -my.key3=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 -# key2 -my.key2=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key2 -my.key2=Il mio nuovo valore in italiano v2 -# key3 -my.key3=Il mio nuovo valore in italiano v2 Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,23 +0,0 @@ -# -# 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. -# - -# key1 -my.key1=Il mio nuovo valore in italiano -# key3 -my.key3=Il mio nuovo valore in italiano Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language=English Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language.language=English Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language.language=French Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language=Italiano \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language.language=Русский Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language.language=TiengViet Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,20 +0,0 @@ -# -# 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. -# - -language=Italiano \ No newline at end of file Modified: portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<locales-config> - - <locale-config> - <locale>en</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for english locale</description> - </locale-config> - - <locale-config> - <locale>fr</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the french locale</description> - </locale-config> - - <locale-config> - <locale>ar</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the arabic locale</description> - <orientation>rt</orientation> - </locale-config> - - <locale-config> - <locale>vi</locale> - <output-encoding>UTF-8</output-encoding> - <input-encoding>UTF-8</input-encoding> - <description>Default configuration for the vietnam locale</description> - <orientation>lt</orientation> - </locale-config> -</locales-config> Added: portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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>60</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.resources.LocaleConfigService</key> + <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type> + <init-params> + <value-param> + <name>locale.config.file</name> + <value>jar:/conf/locales-config.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.resources.ResourceBundleManager</key> + <type>org.exoplatform.services.resources.ResourceBundleManager</type> + </component> + + <component> + <key>org.exoplatform.services.resources.ResourceBundleService</key> + <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> + <init-params> + <values-param> + <name>classpath.resources</name> + <description>The resources that start with the following package name should be load from file system</description> + <value>locale.portlet</value> + </values-param> + + <values-param> + <name>init.resources</name> + <description>Store the following resources into the db for the first launch </description> + <value>locale.test.resources.test</value> + </values-param> + + <values-param> + <name>portal.resource.names</name> + <description>The properties files of the portal , those file will be merged + into one ResourceBundle properties </description> + <value>local.portal.portal</value> + <value>local.portal.custom</value> + </values-param> + </init-params> + </component> + +</configuration> Added: portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<locales-config> +  + + <locale-config> + <locale>en</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for english locale</description> + </locale-config> + + <locale-config> + <locale>fr</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the french locale</description> + </locale-config> + + <locale-config> + <locale>ar</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the arabic locale</description> + <orientation>rt</orientation> + </locale-config> + + <locale-config> + <locale>vi</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the vietnam locale</description> + </locale-config> +</locales-config> Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,28 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key1>My Default Value In English v2</key1> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,32 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key1>My Default Value In English</key1> +  + <key2>My Default Value In English</key2> +  + <key3>My Default Value In English</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key2>My New Value In English v2</key2> +  + <key3>My New Value In English v2</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key1>My New Value In English</key1> +  + <key3>My New Value In English</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ + + +<?xml version="1.0" encoding="UTF-8"?> +<bundle> + <my> +  + <key1>My Value In French v2 with special characters such as éçàùƔ௵</key1> +  + <key3>My Value In French v2 with special characters such as éçàùƔ௵</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ + + +<?xml version="1.0" encoding="UTF-8"?> +<bundle> + <my> +  + <key1>My Value In French with special characters such as éçàùƔ௵</key1> +  + <key2>My Value In French with special characters such as éçàùƔ௵</key2> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key2>Il Mio Nuovo Valore In Italiano v2</key2> +  + <key3>Il Mio Nuovo Valore In Italiano v2</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,30 @@ +<?xml version="1.0" ?> + + +<bundle> + <my> +  + <key1>Il Mio Nuovo Valore In Italiano</key1> +  + <key3>Il Mio Nuovo Valore In Italiano</key3> + </my> +</bundle> \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,21 @@ +# +# 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. +# + +# key1 +my.key1=My Default Value In English v2 Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,25 @@ +# +# 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. +# + +# key1 +my.key1=My Default Value In English +# key2 +my.key2=My Default Value In English +# key3 +my.key3=My Default Value In English \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key2 +my.key2=My New Value In English v2 +# key3 +my.key3=My New Value In English v2 Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key1 +my.key1=My New Value In English +# key3 +my.key3=My New Value In English Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key1 +my.key1=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 +# key3 +my.key3=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key1 +my.key1=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 +# key2 +my.key2=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5 Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key2 +my.key2=Il mio nuovo valore in italiano v2 +# key3 +my.key3=Il mio nuovo valore in italiano v2 Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,23 @@ +# +# 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. +# + +# key1 +my.key1=Il mio nuovo valore in italiano +# key3 +my.key3=Il mio nuovo valore in italiano Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language=English Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language.language=English Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language.language=French Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language=Italiano \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language.language=Русский Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language.language=TiengViet Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,20 @@ +# +# 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. +# + +language=Italiano \ No newline at end of file Added: portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml =================================================================== --- portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml (rev 0) +++ portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<locales-config> + + <locale-config> + <locale>en</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for english locale</description> + </locale-config> + + <locale-config> + <locale>fr</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the french locale</description> + </locale-config> + + <locale-config> + <locale>ar</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the arabic locale</description> + <orientation>rt</orientation> + </locale-config> + + <locale-config> + <locale>vi</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the vietnam locale</description> + <orientation>lt</orientation> + </locale-config> +</locales-config> Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,334 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<gatein-resources - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> - -  - <portal-skin> - <skin-name>Default</skin-name> - <skin-module>MyModule</skin-module> - <css-path>/skin/Stylesheet.css</css-path> - </portal-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>BannerPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>FooterPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - <window-style> - <style-name>Simple</style-name> - <style-theme> - <theme-name>SimpleBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>SimplePink</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>RoundConer</style-name> - <style-theme> - <theme-name>RoundConerBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerPink</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>Shadow</style-name> - <style-theme> - <theme-name>ShadowBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowPink</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>MacStyle</style-name> - <style-theme> - <theme-name>MacTheme</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGray</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGreenSteel</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>VistaStyle</style-name> - <style-theme> - <theme-name>VistaTheme</theme-name> - </style-theme> - </window-style> - - <javascript> - <param> - <js-module>eXo</js-module> - <js-path>/javascript/eXo.js</js-path> - <js-priority>0</js-priority> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.core.Utils</js-module> - <js-path>/javascript/eXo/core/Util.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.DOMUtil</js-module> - <js-path>/javascript/eXo/core/DOMUtil.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.Browser</js-module> - <js-path>/javascript/eXo/core/Browser.js</js-path> - <js-priority>2</js-priority> - </param> - <param> - <js-module>eXo.core.MouseEventManager</js-module> - <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> - </param> - <param> - <js-module>eXo.core.UIMaskLayer</js-module> - <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> - </param> - <param> - <js-module>eXo.core.Skin</js-module> - <js-path>/javascript/eXo/core/Skin.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop</js-module> - <js-path>/javascript/eXo/core/DragDrop.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop2</js-module> - <js-path>/javascript/eXo/core/DragDrop2.js</js-path> - </param> - <param> - <js-module>eXo.core.Topic</js-module> - <js-path>/javascript/eXo/core/Topic.js</js-path> - </param> - <param> - <js-module>eXo.core.JSON</js-module> - <js-path>/javascript/eXo/core/JSON.js</js-path> - </param> - <param> - <js-module>eXo.core.Cometd</js-module> - <js-path>/javascript/eXo/core/Cometd.js</js-path> - </param> - <param> - <js-module>eXo.core.Spliter</js-module> - <js-path>/javascript/eXo/core/Spliter.js</js-path> - </param> - <param> - <js-module>eXo.core.Notification</js-module> - <js-path>/javascript/eXo/core/Notification.js</js-path> - </param> - <param> - <js-module>eXo.core.Loader</js-module> - <js-path>/javascript/eXo/core/Loader.js</js-path> - </param> - <param> - <js-module>eXo.core.I18n</js-module> - <js-path>/javascript/eXo/core/I18n.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.gadget.UIGadget</js-module> - <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.webui.UIItemSelector</js-module> - <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIForm</js-module> - <js-path>/javascript/eXo/webui/UIForm.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopup</js-module> - <js-path>/javascript/eXo/webui/UIPopup.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupSelectCategory</js-module> - <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupWindow</js-module> - <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIHorizontalTabs</js-module> - <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDropDownControl</js-module> - <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIRightClickPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIVerticalSlideTabs</js-module> - <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPermissionSelectorTab</js-module> - <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboard</js-module> - <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboardUtil</js-module> - <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> - </param> - <param> - <js-module>eXo.webui.UINotification</js-module> - <js-path>/javascript/eXo/webui/UINotification.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIUserSelector</js-module> - <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UICombobox.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIColorPicker</js-module> - <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.portal.PortalHttpRequest</js-module> - <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortal</js-module> - <js-path>/javascript/eXo/portal/UIPortal.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalControl</js-module> - <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> - </param> - <param> - <js-module>eXo.portal.PortalDragDrop</js-module> - <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalNavigation</js-module> - <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIMaskWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIBrowseContent</js-module> - <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> - </param> - </javascript> - - <javascript> - <param> - <js-module>eXo.webui.UIPortlet</js-module> - <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> - </param> - </javascript> -</gatein-resources> Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,332 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<gatein-resources - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> - -  - <portal-skin> - <skin-name>Default</skin-name> - <css-path>/skin/Stylesheet.css</css-path> - </portal-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>BannerPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>FooterPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - <window-style> - <style-name>Simple</style-name> - <style-theme> - <theme-name>SimpleBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>SimplePink</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>RoundConer</style-name> - <style-theme> - <theme-name>RoundConerBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerPink</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>Shadow</style-name> - <style-theme> - <theme-name>ShadowBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowPink</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>MacStyle</style-name> - <style-theme> - <theme-name>MacTheme</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGray</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGreenSteel</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>VistaStyle</style-name> - <style-theme> - <theme-name>VistaTheme</theme-name> - </style-theme> - </window-style> - - <javascript> - <param> - <js-module>eXo</js-module> - <js-path>/javascript/eXo.js</js-path> - <js-priority>0</js-priority> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.core.Utils</js-module> - <js-path>/javascript/eXo/core/Util.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.DOMUtil</js-module> - <js-path>/javascript/eXo/core/DOMUtil.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.Browser</js-module> - <js-path>/javascript/eXo/core/Browser.js</js-path> - <js-priority>2</js-priority> - </param> - <param> - <js-module>eXo.core.MouseEventManager</js-module> - <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> - </param> - <param> - <js-module>eXo.core.UIMaskLayer</js-module> - <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> - </param> - <param> - <js-module>eXo.core.Skin</js-module> - <js-path>/javascript/eXo/core/Skin.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop</js-module> - <js-path>/javascript/eXo/core/DragDrop.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop2</js-module> - <js-path>/javascript/eXo/core/DragDrop2.js</js-path> - </param> - <param> - <js-module>eXo.core.Topic</js-module> - <js-path>/javascript/eXo/core/Topic.js</js-path> - </param> - <param> - <js-module>eXo.core.JSON</js-module> - <js-path>/javascript/eXo/core/JSON.js</js-path> - </param> - <param> - <js-module>eXo.core.Cometd</js-module> - <js-path>/javascript/eXo/core/Cometd.js</js-path> - </param> - <param> - <js-module>eXo.core.Spliter</js-module> - <js-path>/javascript/eXo/core/Spliter.js</js-path> - </param> - <param> - <js-module>eXo.core.Notification</js-module> - <js-path>/javascript/eXo/core/Notification.js</js-path> - </param> - <param> - <js-module>eXo.core.Loader</js-module> - <js-path>/javascript/eXo/core/Loader.js</js-path> - </param> - <param> - <js-module>eXo.core.I18n</js-module> - <js-path>/javascript/eXo/core/I18n.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.gadget.UIGadget</js-module> - <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.webui.UIItemSelector</js-module> - <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIForm</js-module> - <js-path>/javascript/eXo/webui/UIForm.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopup</js-module> - <js-path>/javascript/eXo/webui/UIPopup.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupSelectCategory</js-module> - <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupWindow</js-module> - <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIHorizontalTabs</js-module> - <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDropDownControl</js-module> - <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIRightClickPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIVerticalSlideTabs</js-module> - <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPermissionSelectorTab</js-module> - <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboard</js-module> - <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboardUtil</js-module> - <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> - </param> - <param> - <js-module>eXo.webui.UINotification</js-module> - <js-path>/javascript/eXo/webui/UINotification.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIUserSelector</js-module> - <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UICombobox.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIColorPicker</js-module> - <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.portal.PortalHttpRequest</js-module> - <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortal</js-module> - <js-path>/javascript/eXo/portal/UIPortal.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalControl</js-module> - <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> - </param> - <param> - <js-module>eXo.portal.PortalDragDrop</js-module> - <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalNavigation</js-module> - <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIMaskWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIBrowseContent</js-module> - <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> - </param> - </javascript> - - <javascript> - <param> - <js-module>eXo.webui.UIPortlet</js-module> - <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> - </param> - </javascript> -</gatein-resources> Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,334 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<gatein-resources - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> - -  - <portal-skin> - <skin-name>Default</skin-name> - <skin-module>MyModule</skin-module> - <css-path>/skin/Stylesheet.css</css-path> - </portal-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>BannerPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - - <portlet-skin> - <application-name>web</application-name> - <portlet-name>FooterPortlet</portlet-name> - <skin-name>Default</skin-name> - <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> - </portlet-skin> - -  - <window-style> - <style-name>Simple</style-name> - <style-theme> - <theme-name>SimpleBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>SimplePink</theme-name> - </style-theme> - <style-theme> - <theme-name>SimpleGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>RoundConer</style-name> - <style-theme> - <theme-name>RoundConerBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerPink</theme-name> - </style-theme> - <style-theme> - <theme-name>RoundConerGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>Shadow</style-name> - <style-theme> - <theme-name>ShadowBlue</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowViolet</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowOrange</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowPink</theme-name> - </style-theme> - <style-theme> - <theme-name>ShadowGreen</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>MacStyle</style-name> - <style-theme> - <theme-name>MacTheme</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGray</theme-name> - </style-theme> - <style-theme> - <theme-name>MacGreenSteel</theme-name> - </style-theme> - </window-style> - -  - <window-style> - <style-name>VistaStyle</style-name> - <style-theme> - <theme-name>VistaTheme</theme-name> - </style-theme> - </window-style> - - <javascript> - <param> - <js-module>eXo</js-module> - <js-path>/javascript/eXo.js</js-path> - <js-priority>0</js-priority> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.core.Utils</js-module> - <js-path>/javascript/eXo/core/Util.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.DOMUtil</js-module> - <js-path>/javascript/eXo/core/DOMUtil.js</js-path> - <js-priority>1</js-priority> - </param> - <param> - <js-module>eXo.core.Browser</js-module> - <js-path>/javascript/eXo/core/Browser.js</js-path> - <js-priority>2</js-priority> - </param> - <param> - <js-module>eXo.core.MouseEventManager</js-module> - <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> - </param> - <param> - <js-module>eXo.core.UIMaskLayer</js-module> - <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> - </param> - <param> - <js-module>eXo.core.Skin</js-module> - <js-path>/javascript/eXo/core/Skin.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop</js-module> - <js-path>/javascript/eXo/core/DragDrop.js</js-path> - </param> - <param> - <js-module>eXo.core.DragDrop2</js-module> - <js-path>/javascript/eXo/core/DragDrop2.js</js-path> - </param> - <param> - <js-module>eXo.core.Topic</js-module> - <js-path>/javascript/eXo/core/Topic.js</js-path> - </param> - <param> - <js-module>eXo.core.JSON</js-module> - <js-path>/javascript/eXo/core/JSON.js</js-path> - </param> - <param> - <js-module>eXo.core.Cometd</js-module> - <js-path>/javascript/eXo/core/Cometd.js</js-path> - </param> - <param> - <js-module>eXo.core.Spliter</js-module> - <js-path>/javascript/eXo/core/Spliter.js</js-path> - </param> - <param> - <js-module>eXo.core.Notification</js-module> - <js-path>/javascript/eXo/core/Notification.js</js-path> - </param> - <param> - <js-module>eXo.core.Loader</js-module> - <js-path>/javascript/eXo/core/Loader.js</js-path> - </param> - <param> - <js-module>eXo.core.I18n</js-module> - <js-path>/javascript/eXo/core/I18n.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.gadget.UIGadget</js-module> - <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.webui.UIItemSelector</js-module> - <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIForm</js-module> - <js-path>/javascript/eXo/webui/UIForm.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopup</js-module> - <js-path>/javascript/eXo/webui/UIPopup.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupSelectCategory</js-module> - <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupWindow</js-module> - <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIHorizontalTabs</js-module> - <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDropDownControl</js-module> - <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIRightClickPopupMenu</js-module> - <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIVerticalSlideTabs</js-module> - <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIPermissionSelectorTab</js-module> - <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboard</js-module> - <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIDashboardUtil</js-module> - <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> - </param> - <param> - <js-module>eXo.webui.UINotification</js-module> - <js-path>/javascript/eXo/webui/UINotification.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIUserSelector</js-module> - <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UICombobox.js</js-path> - </param> - <param> - <js-module>eXo.webui.UICombobox</js-module> - <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> - </param> - <param> - <js-module>eXo.webui.UIColorPicker</js-module> - <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> - </param> - </javascript> - -  - <javascript> - <param> - <js-module>eXo.portal.PortalHttpRequest</js-module> - <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortal</js-module> - <js-path>/javascript/eXo/portal/UIPortal.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalControl</js-module> - <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> - </param> - <param> - <js-module>eXo.portal.PortalDragDrop</js-module> - <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIPortalNavigation</js-module> - <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIMaskWorkspace</js-module> - <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> - </param> - <param> - <js-module>eXo.portal.UIBrowseContent</js-module> - <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> - </param> - </javascript> - - <javascript> - <param> - <js-module>eXo.webui.UIPortlet</js-module> - <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> - </param> - </javascript> -</gatein-resources> Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml (rev 0) +++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,334 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + +  + <portal-skin> + <skin-name>Default</skin-name> + <skin-module>MyModule</skin-module> + <css-path>/skin/Stylesheet.css</css-path> + </portal-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>BannerPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>FooterPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + + <javascript> + <param> + <js-module>eXo</js-module> + <js-path>/javascript/eXo.js</js-path> + <js-priority>0</js-priority> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.core.Utils</js-module> + <js-path>/javascript/eXo/core/Util.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.DOMUtil</js-module> + <js-path>/javascript/eXo/core/DOMUtil.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.Browser</js-module> + <js-path>/javascript/eXo/core/Browser.js</js-path> + <js-priority>2</js-priority> + </param> + <param> + <js-module>eXo.core.MouseEventManager</js-module> + <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> + </param> + <param> + <js-module>eXo.core.UIMaskLayer</js-module> + <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> + </param> + <param> + <js-module>eXo.core.Skin</js-module> + <js-path>/javascript/eXo/core/Skin.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop</js-module> + <js-path>/javascript/eXo/core/DragDrop.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop2</js-module> + <js-path>/javascript/eXo/core/DragDrop2.js</js-path> + </param> + <param> + <js-module>eXo.core.Topic</js-module> + <js-path>/javascript/eXo/core/Topic.js</js-path> + </param> + <param> + <js-module>eXo.core.JSON</js-module> + <js-path>/javascript/eXo/core/JSON.js</js-path> + </param> + <param> + <js-module>eXo.core.Cometd</js-module> + <js-path>/javascript/eXo/core/Cometd.js</js-path> + </param> + <param> + <js-module>eXo.core.Spliter</js-module> + <js-path>/javascript/eXo/core/Spliter.js</js-path> + </param> + <param> + <js-module>eXo.core.Notification</js-module> + <js-path>/javascript/eXo/core/Notification.js</js-path> + </param> + <param> + <js-module>eXo.core.Loader</js-module> + <js-path>/javascript/eXo/core/Loader.js</js-path> + </param> + <param> + <js-module>eXo.core.I18n</js-module> + <js-path>/javascript/eXo/core/I18n.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.gadget.UIGadget</js-module> + <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.webui.UIItemSelector</js-module> + <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIForm</js-module> + <js-path>/javascript/eXo/webui/UIForm.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopup</js-module> + <js-path>/javascript/eXo/webui/UIPopup.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupSelectCategory</js-module> + <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupWindow</js-module> + <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIHorizontalTabs</js-module> + <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDropDownControl</js-module> + <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIRightClickPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIVerticalSlideTabs</js-module> + <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPermissionSelectorTab</js-module> + <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboard</js-module> + <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboardUtil</js-module> + <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> + </param> + <param> + <js-module>eXo.webui.UINotification</js-module> + <js-path>/javascript/eXo/webui/UINotification.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIUserSelector</js-module> + <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UICombobox.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIColorPicker</js-module> + <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.portal.PortalHttpRequest</js-module> + <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortal</js-module> + <js-path>/javascript/eXo/portal/UIPortal.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalControl</js-module> + <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> + </param> + <param> + <js-module>eXo.portal.PortalDragDrop</js-module> + <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalNavigation</js-module> + <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIMaskWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIBrowseContent</js-module> + <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> + </param> + </javascript> + + <javascript> + <param> + <js-module>eXo.webui.UIPortlet</js-module> + <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> + </param> + </javascript> +</gatein-resources> Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml (rev 0) +++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + +  + <portal-skin> + <skin-name>Default</skin-name> + <css-path>/skin/Stylesheet.css</css-path> + </portal-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>BannerPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>FooterPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + + <javascript> + <param> + <js-module>eXo</js-module> + <js-path>/javascript/eXo.js</js-path> + <js-priority>0</js-priority> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.core.Utils</js-module> + <js-path>/javascript/eXo/core/Util.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.DOMUtil</js-module> + <js-path>/javascript/eXo/core/DOMUtil.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.Browser</js-module> + <js-path>/javascript/eXo/core/Browser.js</js-path> + <js-priority>2</js-priority> + </param> + <param> + <js-module>eXo.core.MouseEventManager</js-module> + <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> + </param> + <param> + <js-module>eXo.core.UIMaskLayer</js-module> + <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> + </param> + <param> + <js-module>eXo.core.Skin</js-module> + <js-path>/javascript/eXo/core/Skin.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop</js-module> + <js-path>/javascript/eXo/core/DragDrop.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop2</js-module> + <js-path>/javascript/eXo/core/DragDrop2.js</js-path> + </param> + <param> + <js-module>eXo.core.Topic</js-module> + <js-path>/javascript/eXo/core/Topic.js</js-path> + </param> + <param> + <js-module>eXo.core.JSON</js-module> + <js-path>/javascript/eXo/core/JSON.js</js-path> + </param> + <param> + <js-module>eXo.core.Cometd</js-module> + <js-path>/javascript/eXo/core/Cometd.js</js-path> + </param> + <param> + <js-module>eXo.core.Spliter</js-module> + <js-path>/javascript/eXo/core/Spliter.js</js-path> + </param> + <param> + <js-module>eXo.core.Notification</js-module> + <js-path>/javascript/eXo/core/Notification.js</js-path> + </param> + <param> + <js-module>eXo.core.Loader</js-module> + <js-path>/javascript/eXo/core/Loader.js</js-path> + </param> + <param> + <js-module>eXo.core.I18n</js-module> + <js-path>/javascript/eXo/core/I18n.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.gadget.UIGadget</js-module> + <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.webui.UIItemSelector</js-module> + <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIForm</js-module> + <js-path>/javascript/eXo/webui/UIForm.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopup</js-module> + <js-path>/javascript/eXo/webui/UIPopup.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupSelectCategory</js-module> + <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupWindow</js-module> + <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIHorizontalTabs</js-module> + <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDropDownControl</js-module> + <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIRightClickPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIVerticalSlideTabs</js-module> + <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPermissionSelectorTab</js-module> + <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboard</js-module> + <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboardUtil</js-module> + <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> + </param> + <param> + <js-module>eXo.webui.UINotification</js-module> + <js-path>/javascript/eXo/webui/UINotification.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIUserSelector</js-module> + <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UICombobox.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIColorPicker</js-module> + <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.portal.PortalHttpRequest</js-module> + <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortal</js-module> + <js-path>/javascript/eXo/portal/UIPortal.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalControl</js-module> + <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> + </param> + <param> + <js-module>eXo.portal.PortalDragDrop</js-module> + <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalNavigation</js-module> + <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIMaskWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIBrowseContent</js-module> + <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> + </param> + </javascript> + + <javascript> + <param> + <js-module>eXo.webui.UIPortlet</js-module> + <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> + </param> + </javascript> +</gatein-resources> Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml (rev 0) +++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,334 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + +  + <portal-skin> + <skin-name>Default</skin-name> + <skin-module>MyModule</skin-module> + <css-path>/skin/Stylesheet.css</css-path> + </portal-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>BannerPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>FooterPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + + <javascript> + <param> + <js-module>eXo</js-module> + <js-path>/javascript/eXo.js</js-path> + <js-priority>0</js-priority> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.core.Utils</js-module> + <js-path>/javascript/eXo/core/Util.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.DOMUtil</js-module> + <js-path>/javascript/eXo/core/DOMUtil.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.Browser</js-module> + <js-path>/javascript/eXo/core/Browser.js</js-path> + <js-priority>2</js-priority> + </param> + <param> + <js-module>eXo.core.MouseEventManager</js-module> + <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> + </param> + <param> + <js-module>eXo.core.UIMaskLayer</js-module> + <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> + </param> + <param> + <js-module>eXo.core.Skin</js-module> + <js-path>/javascript/eXo/core/Skin.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop</js-module> + <js-path>/javascript/eXo/core/DragDrop.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop2</js-module> + <js-path>/javascript/eXo/core/DragDrop2.js</js-path> + </param> + <param> + <js-module>eXo.core.Topic</js-module> + <js-path>/javascript/eXo/core/Topic.js</js-path> + </param> + <param> + <js-module>eXo.core.JSON</js-module> + <js-path>/javascript/eXo/core/JSON.js</js-path> + </param> + <param> + <js-module>eXo.core.Cometd</js-module> + <js-path>/javascript/eXo/core/Cometd.js</js-path> + </param> + <param> + <js-module>eXo.core.Spliter</js-module> + <js-path>/javascript/eXo/core/Spliter.js</js-path> + </param> + <param> + <js-module>eXo.core.Notification</js-module> + <js-path>/javascript/eXo/core/Notification.js</js-path> + </param> + <param> + <js-module>eXo.core.Loader</js-module> + <js-path>/javascript/eXo/core/Loader.js</js-path> + </param> + <param> + <js-module>eXo.core.I18n</js-module> + <js-path>/javascript/eXo/core/I18n.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.gadget.UIGadget</js-module> + <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.webui.UIItemSelector</js-module> + <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIForm</js-module> + <js-path>/javascript/eXo/webui/UIForm.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopup</js-module> + <js-path>/javascript/eXo/webui/UIPopup.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupSelectCategory</js-module> + <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupWindow</js-module> + <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIHorizontalTabs</js-module> + <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDropDownControl</js-module> + <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIRightClickPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIVerticalSlideTabs</js-module> + <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPermissionSelectorTab</js-module> + <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboard</js-module> + <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboardUtil</js-module> + <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> + </param> + <param> + <js-module>eXo.webui.UINotification</js-module> + <js-path>/javascript/eXo/webui/UINotification.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIUserSelector</js-module> + <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UICombobox.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIColorPicker</js-module> + <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.portal.PortalHttpRequest</js-module> + <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortal</js-module> + <js-path>/javascript/eXo/portal/UIPortal.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalControl</js-module> + <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> + </param> + <param> + <js-module>eXo.portal.PortalDragDrop</js-module> + <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalNavigation</js-module> + <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIMaskWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIBrowseContent</js-module> + <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> + </param> + </javascript> + + <javascript> + <param> + <js-module>eXo.webui.UIPortlet</js-module> + <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> + </param> + </javascript> +</gatein-resources> Modified: portal/branches/branched-r3845/pom.xml =================================================================== --- portal/branches/branched-r3845/pom.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/pom.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -792,16 +792,11 @@ </resources> <testResources> <testResource> - <directory>src/test/java</directory> + <directory>src/test/resources</directory> <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.jstmpl</include> + <include>**/*.*</include> </includes> </testResource> - <testResource> - <directory>src/test/resources</directory> - </testResource> </testResources> <pluginManagement> <plugins> Modified: portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml =================================================================== --- portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml 2010-08-31 02:25:43 UTC (rev 3971) +++ portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<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"> -</configuration> Added: portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml (rev 0) +++ portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml 2010-08-31 06:45:13 UTC (rev 3972) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<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"> +</configuration>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3971 - portal/branches/branched-r3845/web/portal/src/main/webapp/groovy/webui/core.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2010-08-30 22:25:43 -0400 (Mon, 30 Aug 2010) New Revision: 3971 Modified: portal/branches/branched-r3845/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl Log: GTNPORTAL-1332 [IE7] Navigations is hidden when have more 5 navigations in list. Modified: portal/branches/branched-r3845/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl =================================================================== --- portal/branches/branched-r3845/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl 2010-08-30 14:19:58 UTC (rev 3970) +++ portal/branches/branched-r3845/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl 2010-08-31 02:25:43 UTC (rev 3971) @@ -13,7 +13,9 @@ %> <div id="$uicomponent.id" style="overflow:auto;" onscroll="eXo.webui.UIVirtualList.scrollMove(this,'$url');"> - <% uicomponent.renderChildren();%> + <div style="width: 99%;" > + <% uicomponent.renderChildren();%> + </div> <% if (!hasNext) { rcontext.getJavascriptManager().addJavascript("eXo.webui.UIVirtualList.loadFinished('$uicomponent.id');");

13 years, 10 months

1
0
0 / 0

gatein SVN: r3970 - in exo/portal/branches/3.1.x/docs: reference-guide and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-08-30 10:19:58 -0400 (Mon, 30 Aug 2010) New Revision: 3970 Modified: exo/portal/branches/3.1.x/docs/pom.xml exo/portal/branches/3.1.x/docs/reference-guide/pom.xml exo/portal/branches/3.1.x/docs/user-guide/pom.xml Log: fix wrong pom for docs Modified: exo/portal/branches/3.1.x/docs/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/pom.xml 2010-08-30 13:10:13 UTC (rev 3969) +++ exo/portal/branches/3.1.x/docs/pom.xml 2010-08-30 14:19:58 UTC (rev 3970) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.0.1-GA-SNAPSHOT</version> + <version>3.1.3-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-08-30 13:10:13 UTC (rev 3969) +++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-08-30 14:19:58 UTC (rev 3970) @@ -28,7 +28,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.2-PLF-SNAPSHOT</version> + <version>3.1.3-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-08-30 13:10:13 UTC (rev 3969) +++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-08-30 14:19:58 UTC (rev 3970) @@ -29,7 +29,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.0.1-GA-SNAPSHOT</version> + <version>3.1.3-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-user-guide-en</artifactId>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3969 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component and 3 other directories.

by do-not-reply＠jboss.org

Author: mstruk Date: 2010-08-30 09:10:13 -0400 (Mon, 30 Aug 2010) New Revision: 3969 Modified: portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java Log: GTNPORTAL-1355, GTNPORTAL-1306: Additional fixes GTNPORTAL-1355: - Added SessionLocale to LocaleContextInfo in order to keep the fix working when cookies are disabled. - Hopefully fixed TX context issue when accessing OrganizationService. GTNPORTAL-1306: - Made it more robust and fixed orientation and navigation localization when browser language settings change between two requests - moved it to LocalizationLifecycle. - Disabled cookies for now. Modified: portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java =================================================================== --- portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/LocaleContextInfo.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -38,6 +38,7 @@ private Locale userProfileLocale; private String remoteUser; private Locale portalLocale; + private Locale sessionLocale; /** * Setter for supportedLocales @@ -148,6 +149,24 @@ } /** + * Setter for sessionLocale + * @param locale Locale stored in current session + */ + public void setSessionLocale(Locale locale) + { + this.sessionLocale = locale; + } + + /** + * Getter for sessionLocale + * @return sessionLocale + */ + public Locale getSessionLocale() + { + return sessionLocale; + } + + /** * Helper method that returns the locale only if it's supported by portal. * Otherwise it returns null. * Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -137,8 +137,6 @@ localeConfig = localeConfigService.getDefaultLocaleConfig(); PortalRequestContext prqCtx = PortalRequestContext.getCurrentInstance(); prqCtx.setLocale(localeConfig.getLocale()); - uiApp.setOrientation(localeConfig.getOrientation()); - uiApp.localizeNavigations(); Util.getPortalRequestContext().addUIComponentToUpdateByAjax( uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -177,5 +177,4 @@ ((ApplicationRequestPhaseLifecycle) lifecycle).onEndRequestPhase(app, context, phase); } } - } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -71,6 +71,8 @@ if (locale == null) locale = getLocaleConfigFromCookie(context); if (locale == null) + locale = getLocaleConfigFromSession(context); + if (locale == null) locale = getLocaleConfigFromBrowser(context); return locale; @@ -86,9 +88,11 @@ protected Locale getLocaleConfigFromBrowser(LocaleContextInfo context) { List<Locale> locales = context.getBrowserLocales(); - for (Locale loc: locales) - return context.getLocaleIfSupported(loc); - + if (locales != null) + { + for (Locale loc: locales) + return context.getLocaleIfSupported(loc); + } return null; } @@ -104,12 +108,27 @@ { Locale locale = getLocaleConfigFromCookie(context); if (locale == null) + locale = getLocaleConfigFromSession(context); + if (locale == null) locale = getLocaleConfigFromBrowser(context); return locale; } /** + * Override this method to change the Locale determination based on session attribute. + * Note: this is mostly a backup for cookie, as either one usually has to be enabled for + * locale to remain synchronized between portal and non-portal pages. + * + * @param context locale context info available to implementations in order to determine appropriate Locale + * @return Locale representing a language to use, or null + */ + protected Locale getLocaleConfigFromSession(LocaleContextInfo context) + { + return context.getSessionLocale(); + } + + /** * Override this method to change the Locale determination based on browser cookie. * If you want to disable the use of browser cookies simply return null. * @@ -119,9 +138,11 @@ protected Locale getLocaleConfigFromCookie(LocaleContextInfo context) { List<Locale> locales = context.getCookieLocales(); - for (Locale locale: locales) - return context.getLocaleIfSupported(locale); - + if (locales != null) + { + for (Locale locale: locales) + return context.getLocaleIfSupported(locale); + } return null; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -24,6 +24,8 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.RootContainer; +import org.exoplatform.container.component.ComponentRequestLifecycle; +import org.exoplatform.container.component.RequestLifeCycle; import org.exoplatform.portal.Constants; import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.services.log.ExoLogger; @@ -51,14 +53,15 @@ /** * This filter provides {@link HttpServletRequest#getLocale()} and {@link HttpServletRequest#getLocales()} - * override for extra-portlet requests (i.e. unbridged .jsp). Thanks to this dynamic resources can be localized - * to keep in synch with the rest of the portal. + * override for extra-portlet requests (i.e. unbridged .jsp). Thanks to it dynamic resources can be localized + * to keep in sync with the rest of the portal. This filter is re-entrant, and can safely be installed for + * INCLUDE, FORWARD, and ERROR dispatch methods. * - * A concrete example for this is login/jsp/login.jsp used when authentication fails at portal login. + * A concrete example of re-entrant use is login/jsp/login.jsp used when authentication fails at portal login. * * By default {@link HttpServletRequest#getLocale()} and {@link HttpServletRequest#getLocales()} reflect * browser language preference. When using this filter these two calls employ the same Locale determination algorithm - * that LocalizationLifecycle uses. + * as LocalizationLifecycle does. * * This filter can be activated / deactivated via portal module's web.xml * @@ -133,7 +136,8 @@ localeCtx.setSupportedLocales(supportedLocales); localeCtx.setBrowserLocales(Collections.list(request.getLocales())); - localeCtx.setCookieLocales(LocalizationLifecycle.getCookieLocales(req)); + //localeCtx.setCookieLocales(LocalizationLifecycle.getCookieLocales(req)); + localeCtx.setSessionLocale(LocalizationLifecycle.getSessionLocale(req)); localeCtx.setUserProfileLocale(getUserProfileLocale(container, req.getRemoteUser())); localeCtx.setRemoteUser(req.getRemoteUser()); @@ -169,21 +173,50 @@ { try { + beginContext(svc); userProfile = svc.getUserProfileHandler().findUserProfileByName(user); } catch (Exception ignored) { log.error("IGNORED: Failed to load UserProfile for username: " + user, ignored); } + finally + { + try + { + endContext(svc); + } + catch(Exception ignored) + { + // we don't care + } + } if (userProfile == null && log.isWarnEnabled()) - log.warn("Could not load user profile for " + user + ". Using default portal locale."); + log.warn("Could not load user profile for " + user); } String lang = userProfile == null ? null : userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE); return (lang != null) ? new Locale(lang) : null; } + public void beginContext(OrganizationService orgService) throws Exception + { + if (orgService instanceof ComponentRequestLifecycle) + { + RequestLifeCycle.begin((ComponentRequestLifecycle)orgService); + } + } + + public void endContext(OrganizationService orgService) throws Exception + { + // do the same check as in beginContext to make it symmetric + if (orgService instanceof ComponentRequestLifecycle) + { + RequestLifeCycle.end(); + } + } + public void destroy() { } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -27,6 +27,7 @@ import org.exoplatform.portal.application.PortalStateManager; import org.exoplatform.portal.application.UserProfileLifecycle; import org.exoplatform.portal.config.UserPortalConfig; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.organization.OrganizationService; @@ -40,10 +41,12 @@ import org.exoplatform.web.application.Phase; import org.exoplatform.web.application.RequestFailure; import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIApplication; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -75,8 +78,12 @@ */ public class LocalizationLifecycle implements ApplicationRequestPhaseLifecycle<WebuiRequestContext> { - private static final String COOKIE_NAME = "LOCALE"; + private static final String LOCALE_COOKIE = "LOCALE"; + private static final String LOCALE_SESSION_ATTR = "org.gatein.LOCALE"; + + private static final String PREV_LOCALE_SESSION_ATTR = "org.gatein.LAST_LOCALE"; + private static final ThreadLocal<Locale> calculatedLocale = new ThreadLocal<Locale>(); private static Log log = ExoLogger.getLogger("portal:LocalizationLifecycle"); @@ -116,8 +123,8 @@ HttpServletRequest request = HttpServletRequest.class.cast(context.getRequest()); localeCtx.setBrowserLocales(Collections.list(request.getLocales())); - - localeCtx.setCookieLocales(getCookieLocales(request)); + //localeCtx.setCookieLocales(getCookieLocales(request)); + localeCtx.setSessionLocale(getSessionLocale(request)); localeCtx.setUserProfileLocale(getUserProfileLocale(reqCtx)); localeCtx.setRemoteUser(reqCtx.getRemoteUser()); @@ -173,8 +180,31 @@ Locale loc = reqCtx.getLocale(); Locale remembered = calculatedLocale.get(); calculatedLocale.remove(); + + boolean refreshNeeded = false; + + // if locale changed since previous request + Locale sessLocale = getPreviousLocale(reqCtx.getRequest()); + if (loc != null && sessLocale != null && !loc.equals(sessLocale)) + { + refreshNeeded = true; + } + // if locale changed during this request's processing if (loc != null && (remembered == null || !loc.equals(remembered))) + { + refreshNeeded = true; saveLocale(reqCtx, loc); + } + + if (refreshNeeded) + { + UIApplication uiapp = context.getUIApplication(); + // we presume PortalRequestContext, and UIPortalApplication + resetOrientation(reqCtx, loc); + ((UIPortalApplication) uiapp).localizeNavigations(); + } + + savePreviousLocale(reqCtx, loc); } } @@ -249,7 +279,7 @@ { for (Cookie cookie: cookies) { - if (COOKIE_NAME.equals(cookie.getName())) + if (LOCALE_COOKIE.equals(cookie.getName())) { List<Locale> locales = new ArrayList<Locale>(); locales.add(LocaleContextInfo.getLocale(cookie.getValue())); @@ -260,6 +290,25 @@ return Collections.emptyList(); } + public static Locale getSessionLocale(HttpServletRequest request) + { + return getLocaleFromSession(request, LOCALE_SESSION_ATTR); + } + + public static Locale getPreviousLocale(HttpServletRequest request) + { + return getLocaleFromSession(request, PREV_LOCALE_SESSION_ATTR); + } + + private static Locale getLocaleFromSession(HttpServletRequest request, String attrName) + { + String lang = null; + HttpSession session = request.getSession(false); + if (session != null) + lang = (String) session.getAttribute(attrName); + return (lang != null) ? new Locale(lang) : null; + } + private void saveLocale(PortalRequestContext context, Locale loc) { String user = context.getRemoteUser(); @@ -269,14 +318,51 @@ } else { - saveLocaleToCookie(context, loc); + // disabled for now + //saveLocaleToCookie(context, loc); } + + saveSessionLocale(context, loc); } + private void resetOrientation(PortalRequestContext context, Locale loc) + { + ExoContainer container = context.getApplication().getApplicationServiceContainer(); + LocaleConfigService localeConfigService = (LocaleConfigService) + container.getComponentInstanceOfType(LocaleConfigService.class); + LocaleConfig localeConfig = localeConfigService.getLocaleConfig(LocaleContextInfo.getLocaleAsString(loc)); + if (localeConfig == null) + { + if (log.isWarnEnabled()) + log.warn("Locale changed to unsupported Locale during request processing: " + loc); + return; + } + // we presume PortalRequestContext, and UIPortalApplication + ((UIPortalApplication) context.getUIApplication()).setOrientation(localeConfig.getOrientation()); + } + + private void saveSessionLocale(PortalRequestContext context, Locale loc) + { + saveLocaleToSession(context, LOCALE_SESSION_ATTR, loc); + } + + private void savePreviousLocale(PortalRequestContext context, Locale loc) + { + saveLocaleToSession(context, PREV_LOCALE_SESSION_ATTR, loc); + } + + private void saveLocaleToSession(PortalRequestContext context, String attrName, Locale loc) + { + HttpServletRequest res = context.getRequest(); + HttpSession session = res.getSession(false); + if (session != null) + session.setAttribute(attrName, LocaleContextInfo.getLocaleAsString(loc)); + } + private void saveLocaleToCookie(PortalRequestContext context, Locale loc) { HttpServletResponse res = context.getResponse(); - Cookie cookie = new Cookie(COOKIE_NAME, LocaleContextInfo.getLocaleAsString(loc)); + Cookie cookie = new Cookie(LOCALE_COOKIE, LocaleContextInfo.getLocaleAsString(loc)); cookie.setMaxAge(Integer.MAX_VALUE); cookie.setPath("/"); res.addCookie(cookie); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -178,8 +178,8 @@ localeConfig = localeConfigService.getDefaultLocaleConfig(); PortalRequestContext prqCtx = PortalRequestContext.getCurrentInstance(); prqCtx.setLocale(localeConfig.getLocale()); - uiApp.setOrientation(localeConfig.getOrientation()); - uiApp.localizeNavigations(); + //uiApp.setOrientation(localeConfig.getOrientation()); + //uiApp.localizeNavigations(); } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-08-30 11:44:17 UTC (rev 3968) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-08-30 13:10:13 UTC (rev 3969) @@ -233,7 +233,7 @@ { prContext.setLocale(localeConfig.getLocale()); //editPortal.refreshNavigation(localeConfig.getLocale()); - uiPortalApp.localizeNavigations(); + //uiPortalApp.localizeNavigations(); } uiPortalApp.setSkin(editPortal.getSkin()); }

13 years, 10 months

1
0
0 / 0

gatein SVN: r3968 - in components/wsrp/trunk: producer/src/main/java/org/gatein/wsrp/producer/handlers and 2 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-08-30 07:44:17 -0400 (Mon, 30 Aug 2010) New Revision: 3968 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/exports/data/ExportContext.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java Log: - Changed handling of null portlet handles as a null portlet handle is not an InvalidHandle since the handle is a non-nillable element at the XML level so should result in an OperationFailed exception and updated test cases accordingly. - Replaced use of NotYetImplementedException by NotYetImplemented (that added an undesired dependency on org.jboss.messaging) - Fixed more typos and removed use of ExtendedAssert where unneeded. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/exports/data/ExportContext.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/exports/data/ExportContext.java 2010-08-30 10:58:25 UTC (rev 3967) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/exports/data/ExportContext.java 2010-08-30 11:44:17 UTC (rev 3968) @@ -1,33 +1,33 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2010, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * 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. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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.gatein.exports.data; +import org.oasis.wsrp.v2.Lifetime; + import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import org.oasis.wsrp.v2.Lifetime; - /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> * @version $Revision$ @@ -38,20 +38,20 @@ protected static final String ENCODING = "UTF-8"; public static final String TYPE = "WSRP_EC"; public static final double VERSION = 1.0; - - + + protected Lifetime lifeTime; protected final boolean exportByValue; - + protected List<String> portlets; - + //for now, we don't store anything in the exported by value ExportContext public ExportContext() { this.lifeTime = null; this.exportByValue = true; } - + public ExportContext(boolean exportByValue, Lifetime lifetime) { //ignore the lifetime if we are exporting by value @@ -65,22 +65,22 @@ } this.exportByValue = exportByValue; } - + public boolean isExportByValue() { return this.exportByValue; } - + public Lifetime getLifeTime() { return lifeTime; } - + public void setLifeTime(Lifetime lifetime) { this.lifeTime = lifetime; } - + public void addPortlet(String portletName) { if (portlets == null) @@ -89,7 +89,7 @@ } this.portlets.add(portletName); } - + public static ExportContext create(byte[] bytes) { //for now, we don't store anything in the stored by value ExportContext @@ -101,7 +101,7 @@ { return TYPE; } - + public double getVersion() { return VERSION; @@ -109,7 +109,7 @@ protected byte[] internalEncodeAsBytes() throws UnsupportedEncodingException { - return "EMPTY".getBytes(ENCODING); + return "EMPTY".getBytes(ENCODING); // todo: Matt, is this needed? } } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2010-08-30 10:58:25 UTC (rev 3967) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2010-08-30 11:44:17 UTC (rev 3968) @@ -504,7 +504,7 @@ WSRP2ExceptionFactory.throwMissingParametersIfValueIsMissing(exportPortlets, "ExportPortlets", "ExportPortlets"); List<PortletContext> portletContexts = exportPortlets.getPortletContext(); - if (portletContexts == null || portletContexts.isEmpty()) + if (!ParameterValidation.existsAndIsNotEmpty(portletContexts)) { throw WSRP2ExceptionFactory.createWSException(MissingParameters.class, "Missing required portletContext in ExportPortlets.", null); } @@ -533,8 +533,8 @@ } - List<ExportedPortlet> exportedPortlets = new ArrayList<ExportedPortlet>(); - Map<String, FailedPortlets> failedPortletsMap = new HashMap<String, FailedPortlets>(); + List<ExportedPortlet> exportedPortlets = new ArrayList<ExportedPortlet>(portletContexts.size()); + Map<String, FailedPortlets> failedPortletsMap = new HashMap<String, FailedPortlets>(portletContexts.size()); try { @@ -551,27 +551,21 @@ String portletHandle = portletContext.getPortletHandle(); byte[] portletState = portletContext.getPortletState(); + WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(portletHandle, "Portlet handle"); - if (portletHandle != null) - { - org.gatein.pc.api.PortletContext portalPC = WSRPUtils.convertToPortalPortletContext(portletContext); + org.gatein.pc.api.PortletContext portalPC = WSRPUtils.convertToPortalPortletContext(portletContext); - producer.getPortletInvoker().getPortlet(portalPC); + producer.getPortletInvoker().getPortlet(portalPC); - org.gatein.pc.api.PortletContext exportedPortalPC = producer.getPortletInvoker().exportPortlet(PortletStateType.OPAQUE, portalPC); + org.gatein.pc.api.PortletContext exportedPortalPC = producer.getPortletInvoker().exportPortlet(PortletStateType.OPAQUE, portalPC); - PortletContext exportedPortalContext = WSRPUtils.convertToWSRPPortletContext(exportedPortalPC); - portletHandle = exportedPortalContext.getPortletHandle(); - portletState = exportedPortalContext.getPortletState(); + PortletContext exportedPortalContext = WSRPUtils.convertToWSRPPortletContext(exportedPortalPC); + portletHandle = exportedPortalContext.getPortletHandle(); + portletState = exportedPortalContext.getPortletState(); - if (exportedPortalPC == null) - { - WSRP2ExceptionFactory.throwWSException(InvalidHandle.class, "Could not find a portlet with handle " + portletHandle + " in the producer", null); - } - } - else + if (exportedPortalPC == null) { - WSRP2ExceptionFactory.throwWSException(InvalidHandle.class, "A portlet handle cannot be null.", null); + WSRP2ExceptionFactory.throwWSException(InvalidHandle.class, "Could not find a portlet with handle " + portletHandle + " in the producer", null); } //get the exportPortletData Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2010-08-30 10:58:25 UTC (rev 3967) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2010-08-30 11:44:17 UTC (rev 3968) @@ -36,7 +36,6 @@ import org.gatein.wsrp.producer.WSRPProducerBaseTest; import org.gatein.wsrp.servlet.ServletAccess; import org.gatein.wsrp.support.TestMockExportPersistenceManager; -import org.gatein.wsrp.test.ExtendedAssert; import org.gatein.wsrp.test.support.MockHttpServletRequest; import org.gatein.wsrp.test.support.MockHttpServletResponse; import org.jboss.arquillian.api.Deployment; @@ -144,31 +143,18 @@ } @Test - public void testExportNonExistantHandle() throws Exception + public void testExportNonExistentHandle() throws Exception { - String nonExistantHandle = "123FakeHandle"; - List<PortletContext> portletContexts = createPortletContextList(nonExistantHandle); + String nonExistentHandle = "123FakeHandle"; + List<PortletContext> portletContexts = createPortletContextList(nonExistentHandle); ExportPortlets exportPortlets = createSimpleExportPortlets(portletContexts); ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - checkInvalidHandle(response, nonExistantHandle); + checkInvalidHandle(response, nonExistentHandle); } @Test - public void testExportNullHandle() throws Exception - { - String nullHandle = null; - List<PortletContext> portletContexts = createPortletContextList(nullHandle); - - ExportPortlets exportPortlets = createSimpleExportPortlets(portletContexts); - - ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - - checkInvalidHandle(response, nullHandle); - } - - @Test public void testExportNoRegistrationWhenRequired() throws Exception { producer.getConfigurationService().getConfiguration().getRegistrationRequirements().setRegistrationRequired(true); @@ -181,7 +167,7 @@ try { ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - ExtendedAssert.fail("ExportPortlets should fail if registration is required and none is provided"); + fail("ExportPortlets should fail if registration is required and none is provided"); } catch (InvalidRegistration e) { @@ -206,7 +192,7 @@ try { ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - ExtendedAssert.fail("ExportPortlets should fail if registration is required and an invalid registration handle is provided"); + fail("ExportPortlets should fail if registration is required and an invalid registration handle is provided"); } catch (InvalidRegistration e) { @@ -241,7 +227,7 @@ try { ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - ExtendedAssert.fail("Should have thrown a MissingParameters fault if no portlets passed for export."); + fail("Should have thrown a MissingParameters fault if no portlets passed for export."); } catch (MissingParameters e) { @@ -255,7 +241,7 @@ try { ExportPortletsResponse response = producer.exportPortlets(null); - ExtendedAssert.fail("Should have failed if sending a null exportPortlet object"); + fail("Should have failed if sending a null exportPortlet object"); } catch (MissingParameters e) { @@ -266,10 +252,9 @@ @Test public void testExports() throws Exception { - String nullHandle = null; - String nonExistantHandle = "123FakeHandle"; + String nonExistentHandle = "123FakeHandle"; String handle = getDefaultHandle(); - List<PortletContext> portletContexts = createPortletContextList(nullHandle, nonExistantHandle, handle); + List<PortletContext> portletContexts = createPortletContextList(nonExistentHandle, handle); ExportPortlets exportPortlets = createSimpleExportPortlets(portletContexts); @@ -290,9 +275,8 @@ FailedPortlets failedPortlets = response.getFailedPortlets().get(0); assertEquals("InvalidHandle", failedPortlets.getErrorCode().getLocalPart()); - assertEquals(2, failedPortlets.getPortletHandles().size()); - assertTrue(failedPortlets.getPortletHandles().contains(nullHandle)); - assertTrue(failedPortlets.getPortletHandles().contains(nonExistantHandle)); + assertEquals(1, failedPortlets.getPortletHandles().size()); + assertTrue(failedPortlets.getPortletHandles().contains(nonExistentHandle)); } protected void checkInvalidHandle(ExportPortletsResponse response, String handle) throws Exception @@ -386,7 +370,7 @@ try { ImportPortletsResponse response = producer.importPortlets(importPortlets); - ExtendedAssert.fail("ImportPortlets should fail if registration is required and non is provided"); + fail("ImportPortlets should fail if registration is required and non is provided"); } catch (InvalidRegistration e) { @@ -457,7 +441,7 @@ try { ImportPortletsResponse response = producer.importPortlets(importPortlets); - ExtendedAssert.fail("Should have failed when registration is required and an invalid registration handle is used."); + fail("Should have failed when registration is required and an invalid registration handle is used."); } catch (InvalidRegistration e) { @@ -480,7 +464,7 @@ try { producer.importPortlets(importPortlets); - ExtendedAssert.fail("Should have thrown an OperationFailedFault"); + fail("Should have thrown an OperationFailedFault"); } catch (OperationFailed e) { @@ -503,7 +487,7 @@ try { producer.importPortlets(importPortlets); - ExtendedAssert.fail("Should have thrown an OperationFailedFault"); + fail("Should have thrown an OperationFailedFault"); } catch (OperationFailed e) { @@ -639,7 +623,7 @@ GetMarkup markup = createMarkupRequest(portletContext.getPortletHandle()); MarkupResponse markupResponse = producer.getMarkup(markup); assertNotNull(markupResponse.getMarkupContext()); - assertEquals("<p>symbol unset stock value: value unset</p>", new String(markupResponse.getMarkupContext().getItemString())); + assertEquals("<p>symbol unset stock value: value unset</p>", markupResponse.getMarkupContext().getItemString()); } @Test @@ -658,7 +642,7 @@ PortletContext portletContext = performBlockingInteractionOnSessionPortlet(originalHandle, "new value", StateChange.CLONE_BEFORE_WRITE); //check that we have a new portlet context - ExtendedAssert.assertFalse(originalHandle.equals(portletContext.getPortletHandle())); + assertFalse(originalHandle.equals(portletContext.getPortletHandle())); checkStatePortlet(portletContext.getPortletHandle(), "new value"); @@ -666,12 +650,12 @@ ExportPortlets exportPortlets = createSimpleExportPortlets(portletContexts); ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - ExtendedAssert.assertFalse(response.getExportedPortlet().isEmpty()); + assertFalse(response.getExportedPortlet().isEmpty()); List<PortletContext> portletContextsFromExport = getPortletContext(response); - ExtendedAssert.assertNotNull(portletContextsFromExport.isEmpty()); - ExtendedAssert.assertEquals(1, portletContexts.size()); + assertNotNull(portletContextsFromExport.isEmpty()); + assertEquals(1, portletContexts.size()); PortletContext portletContextFromExport = portletContextsFromExport.get(0); //we should be getting the handle of the stateless portlet @@ -777,12 +761,12 @@ ExportPortlets exportPortlets = createSimpleExportPortlets(portletContexts); ExportPortletsResponse response = producer.exportPortlets(exportPortlets); - ExtendedAssert.assertFalse(response.getExportedPortlet().isEmpty()); + assertFalse(response.getExportedPortlet().isEmpty()); List<PortletContext> portletContextsFromExport = getPortletContext(response); - ExtendedAssert.assertNotNull(portletContextsFromExport.isEmpty()); - ExtendedAssert.assertEquals(1, portletContexts.size()); + assertNotNull(portletContextsFromExport.isEmpty()); + assertEquals(1, portletContexts.size()); PortletContext portletContextFromExport = portletContextsFromExport.get(0); assertEquals(originalHandle, portletContextFromExport.getPortletHandle()); @@ -849,7 +833,7 @@ //Test that doing a release export actually removed the stored RefId TestMockExportPersistenceManager persistenceManager = (TestMockExportPersistenceManager)producer.getExportManager().getPersistenceManager(); - ExtendedAssert.assertEquals(0, persistenceManager.getExportContexts().keySet().size()); + assertEquals(0, persistenceManager.getExportContexts().keySet().size()); } @Test @@ -865,9 +849,9 @@ ImportPortlets importPortlets = createSimpleImportPortlets(response.getExportContext(), importPortletsList); ImportPortletsResponse importResponse = producer.importPortlets(importPortlets); - ExtendedAssert.assertEquals(1, importResponse.getImportedPortlets().size()); - ExtendedAssert.assertEquals(importID, importResponse.getImportedPortlets().get(0).getImportID()); - ExtendedAssert.assertNotNull(importResponse.getImportedPortlets().get(0).getNewPortletContext().getPortletHandle()); + assertEquals(1, importResponse.getImportedPortlets().size()); + assertEquals(importID, importResponse.getImportedPortlets().get(0).getImportID()); + assertNotNull(importResponse.getImportedPortlets().get(0).getNewPortletContext().getPortletHandle()); } protected ExportPortletsResponse exportPortletToPM() throws Exception @@ -883,12 +867,12 @@ exportPortlets.setExportByValueRequired(false); //Test that we don't have anything in the PM before doing an export - ExtendedAssert.assertEquals(0, persistenceManager.getExportContexts().keySet().size()); + assertEquals(0, persistenceManager.getExportContexts().keySet().size()); ExportPortletsResponse response = producer.exportPortlets(exportPortlets); //Test that we have an entry in the PM after doing an export - ExtendedAssert.assertEquals(1, persistenceManager.getExportContexts().keySet().size()); + assertEquals(1, persistenceManager.getExportContexts().keySet().size()); return response; } @@ -899,7 +883,7 @@ try { producer.setExportLifetime(null); - ExtendedAssert.fail(); + fail(); } catch (OperationNotSupported e) { @@ -914,7 +898,7 @@ { SetExportLifetime setExportLifetime = WSRPTypeFactory.createSetExportLifetime(null, new byte[]{-10, 24, 24, 54, 'a', 'f', 'g'}, null, null); producer.setExportLifetime(setExportLifetime); - ExtendedAssert.fail(); + fail(); } catch (OperationNotSupported e) { @@ -937,7 +921,7 @@ SetExportLifetime setExportLifetime = WSRPTypeFactory.createSetExportLifetime(null, exportData.encodeAsBytes(), null, null); producer.setExportLifetime(setExportLifetime); - ExtendedAssert.fail(); + fail(); } catch (OperationNotSupported e) { @@ -969,7 +953,7 @@ { GetMarkup getMarkupOriginalStateless = createMarkupRequest(handle); MarkupResponse responseOriginalStateless = producer.getMarkup(getMarkupOriginalStateless); - ExtendedAssert.assertEquals(expectedValue, responseOriginalStateless.getMarkupContext().getItemString()); + assertEquals(expectedValue, responseOriginalStateless.getMarkupContext().getItemString()); } protected PortletContext performBlockingInteractionOnSessionPortlet(String handle, String value, StateChange stateChange) throws Exception Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java 2010-08-30 10:58:25 UTC (rev 3967) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java 2010-08-30 11:44:17 UTC (rev 3968) @@ -1,42 +1,40 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2010, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * 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. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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.gatein.wsrp.support; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - +import org.gatein.common.NotYetImplemented; import org.gatein.exports.ExportPersistenceManager; import org.gatein.exports.data.ExportContext; import org.gatein.exports.data.ExportPortletData; import org.gatein.exports.data.PersistedExportData; -import org.jboss.messaging.util.NotYetImplementedException; import org.oasis.wsrp.v2.Lifetime; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> * @version $Revision$ @@ -46,9 +44,9 @@ public static final String PEC_TYPE = "P_EC"; public static final double PEC_VERSION = 1.0; - - Map<String,ExportContext> exportContexts = new HashMap<String,ExportContext>(); - + + Map<String, ExportContext> exportContexts = new HashMap<String, ExportContext>(); + //For testing purposes only public Map<String, ExportContext> getExportContexts() { @@ -56,7 +54,7 @@ } public ExportContext getExportContext(String type, double version, byte[] bytes) throws UnsupportedEncodingException - { + { if (supports(type, version)) { PersistedExportData persistedExportData = PersistedExportData.create(bytes); @@ -101,7 +99,7 @@ public ExportPortletData retrieveExportPortletData(String refid) { - throw new NotYetImplementedException(); + throw new NotYetImplemented(); } public String storeExportContextData(ExportContext exportContextData) @@ -120,36 +118,26 @@ public String storeExportPortletData(ExportPortletData exportPortletData) { - throw new NotYetImplementedException(); + throw new NotYetImplemented(); } public boolean supports(String type, double version) { - if (type.equals(PEC_TYPE) && (version == PEC_VERSION)) - { - return true; - } - else - { - return false; - } + return type.equals(PEC_TYPE) && (version == PEC_VERSION); } - @Override public Lifetime updateExportLifetime(ExportContext exportContext, Lifetime lifetime) { - throw new NotYetImplementedException(); + throw new NotYetImplemented(); } - @Override public byte[] encodeExportContextData(ExportContext exportContext) throws IOException { String refId = storeExportContextData(exportContext); - PersistedExportData persistedExportData = new PersistedExportData(this.PEC_TYPE, refId); + PersistedExportData persistedExportData = new PersistedExportData(PEC_TYPE, refId); return persistedExportData.encodeAsBytes(); } - @Override public byte[] encodeExportPortletData(ExportContext exportContext, ExportPortletData exportPortlet) { // FIXME encodeExportPortletData

13 years, 10 months

1
0
0 / 0

gatein SVN: r3967 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-08-30 06:58:25 -0400 (Mon, 30 Aug 2010) New Revision: 3967 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html Log: TESTVN-1006: Create new GateIn Selenium scripts Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html 2010-08-30 10:58:25 UTC (rev 3967) @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check editing container with new valid title while edit current portal--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Containers tab on Edit Inline Composer --</td> + <td></td> +</tr> +<tr> + <td>pause</td> + <td>20000</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='oneRow']/div</td> + <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div/div[1]/div</td> +</tr> +<tr> + <td>dragAndDropToObject</td> + <td>//div[@id='oneRow']/div</td> + <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div/div[1]/div</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Container</td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Container</td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Edit container --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>Test_POR_12_02_021</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Test_POR_12_02_021</td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete container --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this Container?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html 2010-08-30 10:58:25 UTC (rev 3967) @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change title of portlet with valid value while editing portal--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit layout's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit portlet --</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Portlet Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change current value of Title with new value --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>Test_POR_12_02_035</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Test_POR_12_02_035</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Portlet Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Return to defautl title--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html 2010-08-30 10:58:25 UTC (rev 3967) @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change title of portlet with invalid value while editing portal --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit layout's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit portlet --</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Portlet Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change current value of Title with new value less than 3 chars--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>PO</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change current value of Title with new value over 60 characters --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=OK</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=OK</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>Close</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html 2010-08-30 10:58:25 UTC (rev 3967) @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change width/height of portlet with valid value while editing portal--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit layout's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit portlet --</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>width</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>width</td> + <td>300px</td> +</tr> +<tr> + <td>type</td> + <td>height</td> + <td>500px</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- View after change width/height of portlet --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Switch View Mode</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Switch View Mode</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change width/height of portlet with blank while editing portal--</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>width</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>width</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>height</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- view when change width/height of portlet with blank --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Switch View Mode</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Switch View Mode</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html 2010-08-30 10:58:25 UTC (rev 3967) @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change width/height of portlet with invalid value while editing portal--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit layout's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit portlet --</td> + <td></td> +</tr> +<tr> + <td>mouseOver</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>Banner Portlet</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Portlet Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change current value of Width/height with invalid value (number no have with “px”) --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>width</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>width</td> + <td>300</td> +</tr> +<tr> + <td>type</td> + <td>height</td> + <td>500</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save And Close</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You must enter a pixel value in field "Width:".</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You must enter a pixel value in field "Width:".</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>You must enter a pixel value in field "Height:".</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>You must enter a pixel value in field "Height:".</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>Close</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>Close</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3966 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-08-30 06:57:27 -0400 (Mon, 30 Aug 2010) New Revision: 3966 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_016_CreatePublicPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_003_DeletePortalWhileItIsBeingUsed.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html Log: TESTVN-1006: Create new GateIn Selenium scripts Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight.html 2010-08-30 10:57:27 UTC (rev 3966) @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_09_014_CreateNewPortalWithoutAssigningEditRight</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new portal without assigning edit right--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_POR_09_014</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properties --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Access Permission -- setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Do not set edit right in Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The "Edit Permission Setting" list can not be empty.</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The "Edit Permission Setting" list can not be empty.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight.html 2010-08-30 10:57:27 UTC (rev 3966) @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_09_015_CreateNewPortalWithoutAssigningAccessRight</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create new portal without assigning edit right--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_POR_09_015</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properties --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Do not set access right in Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permission setting --</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The "Access Permission Setting" list can not be empty. </td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The "Access Permission Setting" list can not be empty. </td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_016_CreatePublicPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_016_CreatePublicPortal.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_016_CreatePublicPortal.html 2010-08-30 10:57:27 UTC (rev 3966) @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_09_016_CreatePublicPortal</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_09_016_CreatePublicPortal</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Create public portal --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_POR_09_016</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properties --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permisison Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Access Permision Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permisison Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=validator</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=validator</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_09_016</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Test_POR_09_016</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/private/Test_POR_09_016/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete portal --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=classic</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_003_DeletePortalWhileItIsBeingUsed.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_003_DeletePortalWhileItIsBeingUsed.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_003_DeletePortalWhileItIsBeingUsed.html 2010-08-30 10:57:27 UTC (rev 3966) @@ -0,0 +1,282 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_10_003_DeletePortalWhileItIsBeingUsed</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_10_003_DeletePortalWhileItIsBeingUsed</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete portal while it is being used--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_POR_10_003</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properites--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Access Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=exact:*</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permission Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--  Change to use new added portal--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_10_003</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Test_POR_10_003</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/private/Test_POR_10_003/</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete using portal--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Return to default portal --</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic.html 2010-08-30 10:57:27 UTC (rev 3966) @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_11_002_CheckWhenChangeToPortalThatIsNotPublic</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check when change to a portal that is not public--</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Test_POR_11_002</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose properties--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Permision Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Access Permision Setting--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=manager</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Edit Permision Setting --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[5]/div[2]/div[1]/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[4]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_11_002</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Test_POR_11_002</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check displaying after sign out when using un-public portal --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/portal-unavailable.jsp</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Check the next login after choosing un-public portal--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>http://localhost:8080/portal/private/Test_POR_11_002/</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/private/Test_POR_11_002/</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=classic</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this portal?</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3965 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-08-30 06:56:34 -0400 (Mon, 30 Aug 2010) New Revision: 3965 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html Log: TestVN-356:Clean and Improve existing Selenium for GateIn Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html 2010-08-30 10:56:09 UTC (rev 3964) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html 2010-08-30 10:56:34 UTC (rev 3965) @@ -18,7 +18,7 @@ </tr> <tr> <td>echo</td> - <td>-- Edit Current Portal With No one For Edit Right</td> + <td>-- Edit current portal with no one for edit right--</td> <td></td> </tr> <tr> @@ -48,20 +48,15 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Site Editor</td> + <td>echo</td> + <td>-- Click Edit layout --</td> <td></td> </tr> <tr> - <td>click</td> - <td>link=Site Editor</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Edit Layout</td> <td></td> @@ -73,7 +68,7 @@ </tr> <tr> <td>echo</td> - <td>- Change Portal Properties -</td> + <td>Choose Site's Config on Edit inline composer --</td> <td></td> </tr> <tr> @@ -87,32 +82,37 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Choose Permission Setting --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>UIPortalForm</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[contains(@onclick,"submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting")]</td> + <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>link=Edit Permission Setting</td> + <td>echo</td> + <td>-- Choose Edit Permission--</td> <td></td> </tr> <tr> - <td>click</td> + <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> - <td>echo</td> - <td>- Delete all edit permissions -</td> + <td>click</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> + <td>waitForElementPresent</td> <td>link=Delete Permission</td> <td></td> </tr> @@ -122,7 +122,7 @@ <td></td> </tr> <tr> - <td>verifyElementPresent</td> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -132,22 +132,17 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>- Verify Pop-up alert presence -</td> + <td>waitForTextPresent</td> + <td>The "Edit Permission Setting" list can not be empty.</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@class='PopupMessage']</td> - <td>The "editPermission" list can not be empty.</td> + <td>verifyTextPresent</td> + <td>The "Edit Permission Setting" list can not be empty.</td> + <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>//div[@class='PopupMessage']</td> - <td>The "editPermission" list can not be empty.</td> -</tr> -<tr> - <td>verifyElementPresent</td> + <td>waitForElementPresent</td> <td>link=OK</td> <td></td> </tr> @@ -157,7 +152,7 @@ <td></td> </tr> <tr> - <td>verifyElementPresent</td> + <td>waitForElementPresent</td> <td>link=Cancel</td> <td></td> </tr> @@ -168,20 +163,15 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>UIPortalComposer</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]//a[1]</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> - <td>echo</td> - <td>- Sign Out -</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3964 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-08-30 06:56:09 -0400 (Mon, 30 Aug 2010) New Revision: 3964 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_54_AddNewpageForUser.html Log: TESTVN-1163 - Create new SniffTest for GateIn Selenium scripts Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_54_AddNewpageForUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_54_AddNewpageForUser.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_54_AddNewpageForUser.html 2010-08-30 10:56:09 UTC (rev 3964) @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_SNF_PRL_54_AddNewpageForUser</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_54_AddNewpageForUser</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new page for user --</td> + <td></td> +</tr> +<tr> + <td>windowMaximize</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Dashboard</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Add new page on Dashboard editor menu--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add New Page</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Add New Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>pageName</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>pageName</td> + <td>Test_SNF_PRL_54</td> +</tr> +<tr> + <td>type</td> + <td>pageDisplayName</td> + <td>Test_SNF_PRL_54</td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Next to move step 2--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Keep empty layout and click Next move step 3--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Finish --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>assertLocation</td> + <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_54</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to Page Management --</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td>Test_SNF_PRL_54</td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Test_SNF_PRL_54</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- https://jira.jboss.org/browse/GTNPORTAL-1304--</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Delete page --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIRepeater']/table/tbody/tr[13]/td[5]/div/img[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIRepeater']/table/tbody/tr[13]/td[5]/div/img[2]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmationPresent</td> + <td></td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[4]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3963 - portal/trunk/testsuite/testdefinitions.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-08-30 06:55:20 -0400 (Mon, 30 Aug 2010) New Revision: 3963 Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.1.0_MainFunctions_TestDefinition.ods Log: Update GateIn_v3.1.0_MainFunctions_TestDefinition.ods base on branch merges into trunk Modified: portal/trunk/testsuite/testdefinitions/GateIn_v3.1.0_MainFunctions_TestDefinition.ods =================================================================== (Binary files differ)

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2010