December 2009 - gatein-commits - Jboss List Archives

gatein SVN: r993 - portal/trunk/component/portal/src/test/java/conf.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-12-11 06:49:03 -0500 (Fri, 11 Dec 2009) New Revision: 993 Modified: portal/trunk/component/portal/src/test/java/conf/test-configuration.xml Log: remove commented stuff Modified: portal/trunk/component/portal/src/test/java/conf/test-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/test-configuration.xml 2009-12-11 11:45:01 UTC (rev 992) +++ portal/trunk/component/portal/src/test/java/conf/test-configuration.xml 2009-12-11 11:49:03 UTC (rev 993) @@ -603,322 +603,4 @@ </external-component-plugins> -  </configuration>

16 years, 4 months

1
0
0 / 0

gatein SVN: r992 - in portal/trunk/component/portal/src/main/java: org/exoplatform/portal/pom and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-12-11 06:45:01 -0500 (Fri, 11 Dec 2009) New Revision: 992 Removed: portal/trunk/component/portal/src/main/java/conf/configuration.xml portal/trunk/component/portal/src/main/java/conf/portal/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ Log: remove useless configuration files Deleted: portal/trunk/component/portal/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/portal/src/main/java/conf/configuration.xml 2009-12-11 11:39:06 UTC (rev 991) +++ portal/trunk/component/portal/src/main/java/conf/configuration.xml 2009-12-11 11:45:01 UTC (rev 992) @@ -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>

16 years, 4 months

1
0
0 / 0

gatein SVN: r991 - in portal/trunk/component: portal/src/main/java/org/exoplatform/portal/config and 6 other directories.

by do-not-reply＠jboss.org

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

16 years, 4 months

1
0
0 / 0

gatein SVN: r990 - in portal/trunk/component: portal/src/main/java/conf/portal and 2 other directories.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2009-12-11 06:19:40 -0500 (Fri, 11 Dec 2009) New Revision: 990 Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml Log: GTNPORTAL-363 Remove RegistryService usage (a fews files more) Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/application-registry/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -48,13 +48,5 @@ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> </component> - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> + </configuration> Modified: portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/conf/portal/configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -23,18 +23,8 @@ <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> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> - + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> <type>org.exoplatform.portal.pom.config.POMDataStorage</type> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2009-12-11 11:19:40 UTC (rev 990) @@ -19,20 +19,19 @@ package org.exoplatform.portal.config; -import java.util.ArrayList; -import java.util.Collection; - import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupEventListener; import org.exoplatform.services.organization.GroupHandler; import org.exoplatform.services.organization.OrganizationService; +import java.util.ArrayList; +import java.util.Collection; + /** * Created by The eXo Platform SARL * Author : Nhu Dinh Thuan @@ -64,8 +63,8 @@ * it I hope that this issues will be fixed when we use the lastest * version of PicoContainer Comment by Hoa Pham. */ - RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); - registryService.start(); + // RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); + // registryService.start(); UserPortalConfigService portalConfigService = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2009-12-11 11:19:40 UTC (rev 990) @@ -25,7 +25,6 @@ import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.UserEventListener; @@ -55,8 +54,8 @@ * hope that this issues will be fixed when we use the lastest version of * PicoContainer Comment by Hoa Pham. */ - RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); - registryService.start(); + // RegistryService registryService = (RegistryService)container.getComponentInstanceOfType(RegistryService.class); + // registryService.start(); UserPortalConfigService portalConfigService = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); Modified: portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) +++ portal/trunk/component/portal/src/test/java/conf/portal/jcr-configuration.xml 2009-12-11 11:19:40 UTC (rev 990) @@ -46,17 +46,7 @@ <component> <key>org.exoplatform.services.jcr.RepositoryService</key> <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.ext.registry.RegistryService</type> - <init-params> - <properties-param> - <name>locations</name> - <property name="repository" value="system"/> - </properties-param> - </init-params> - </component> + </component> <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>

16 years, 4 months

1
0
0 / 0

gatein SVN: r989 - in portal/trunk/component: test/core/src/main/resources/conf and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-12-11 04:25:57 -0500 (Fri, 11 Dec 2009) New Revision: 989 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml Log: - update unit test for organization based components - add a dependency of PicketLinkIDMServiceImpl on InitialContextInitializer to be able to use JNDI setup from this service Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2009-12-11 09:25:57 UTC (rev 989) @@ -25,6 +25,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.database.HibernateService; +import org.exoplatform.services.naming.InitialContextInitializer; import org.picketlink.idm.api.IdentitySession; import org.picketlink.idm.api.IdentitySessionFactory; import org.picketlink.idm.api.cfg.IdentityConfiguration; @@ -69,7 +70,11 @@ { } - public PicketLinkIDMServiceImpl(InitParams initParams, HibernateService hibernateService, ConfigurationManager confManager) throws Exception + public PicketLinkIDMServiceImpl( + InitParams initParams, + HibernateService hibernateService, + ConfigurationManager confManager, + InitialContextInitializer dependency) throws Exception { ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION); ValueParam jndiName = initParams.getValueParam(PARAM_JNDI_NAME_OPTION); Modified: portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml =================================================================== --- portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -58,7 +58,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/> + <property name="url" value="jdbc:hsqldb:file:${basedir}/target/temp/hsqldb"/> <property name="username" value="sa"/> <property name="password" value=""/> </properties-param> Modified: portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -34,12 +34,12 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/system"/> + <property name="swap-directory" value="${basedir}/target/temp/jcr/swap/system"/> </properties> <value-storages> <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/system"/> + <property name="path" value="${basedir}/target/temp/jcr/values/system"/> </properties> <filters> <filter property-type="Binary"/> @@ -61,14 +61,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/system"/> + <property name="index-dir" value="${basedir}/target/temp/jcr/jcrlucenedb/system"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/system"/> + <property name="path" value="${basedir}/target/temp/jcr/lock/system"/> </properties> </persister> </lock-manager> @@ -83,12 +83,12 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-test"/> + <property name="swap-directory" value="${basedir}/target/temp/jcr/swap/portal-test"/> </properties> <value-storages> <value-storage id="portal-test" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/portal-test"/> + <property name="path" value="${basedir}/target/temp/jcr/values/portal-test"/> </properties> <filters> <filter property-type="Binary"/> @@ -110,14 +110,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-test"/> + <property name="index-dir" value="${basedir}/target/temp/jcr/jcrlucenedb/portal-test"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/portal-test"/> + <property name="path" value="${basedir}/target/temp/jcr/lock/portal-test"/> </properties> </persister> </lock-manager> Modified: portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2009-12-11 08:28:50 UTC (rev 988) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2009-12-11 09:25:57 UTC (rev 989) @@ -77,11 +77,14 @@  <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> - <property name="hibernate.connection.url" value="jdbc:hsqldb:file:./target/temp/data/exodb${container.name.suffix}"/> + + <property name="hibernate.connection.datasource" value="jdbcexo"/> <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"/>

16 years, 4 months

1
0
0 / 0

gatein SVN: r988 - in portal/trunk/web: portal/src/main/webapp/groovy/webui/core and 1 other directory.

by do-not-reply＠jboss.org

Author: tan_pham_dinh Date: 2009-12-11 03:28:50 -0500 (Fri, 11 Dec 2009) New Revision: 988 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl Log: GTNPORTAL-348: Some improvements in UISitemap Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-12-11 08:28:29 UTC (rev 987) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-12-11 08:28:50 UTC (rev 988) @@ -566,14 +566,12 @@ }; UIPortal.prototype.collapseExpand = function(element) { - var node = element.parentNode ; - var subGroup = eXo.core.DOMUtil.findFirstChildByClass(node, "div", "ChildrenContainer") ; + var subGroup = eXo.core.DOMUtil.findFirstChildByClass(element.parentNode, "div", "ChildrenContainer") ; var className = element.className; if(!subGroup) return false; if(subGroup.style.display == "none") { if (className.indexOf("ExpandIcon") == 0) element.className = "CollapseIcon FloatLeft" ; subGroup.style.display = "block" ; - return false; } else { if (className.indexOf("CollapseIcon") == 0) element.className = "ExpandIcon FloatLeft" ; subGroup.style.display = "none" ; Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2009-12-11 08:28:29 UTC (rev 987) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2009-12-11 08:28:50 UTC (rev 988) @@ -52,7 +52,10 @@ println """ <div class="$lastNode Node ClearFix"> <div class="CollapseIcon FloatLeft" onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapse"> - <a class="NodeIcon DefaultPageIcon" href="$actionLink">$label</a> + """; + if(treeNode.getNode().getPageReference() == null) println "<a class='NodeIcon DefaultPageIcon' href='javascript:void(0);'>$label</a>"; + else println "<a class='NodeIcon DefaultPageIcon' href='$actionLink'>$label</a>"; + println """ </div> <div class="ChildrenContainer FloatLeft" style="display: block"> """; @@ -63,7 +66,10 @@ println """ <div class="$lastNode Node ClearFix"> <div class="ExpandIcon FloatLeft" onclick="if(eXo.portal.UIPortal.collapseExpand(this)){$actionExpand}"> - <a class="NodeIcon DefaultPageIcon" href="$actionLink">$label</a> + """; + if(treeNode.getNode().getPageReference() == null) println "<a class='NodeIcon DefaultPageIcon' href='javascript:void(0);'>$label</a>"; + else println "<a class='NodeIcon DefaultPageIcon' href='$actionLink'>$label</a>"; + println """ </div> <div class="ChildrenContainer FloatLeft" style="display: none"> """; @@ -102,10 +108,6 @@ <div class="UISiteTree"> <% TreeNode treeNodeRoot = uicomponent.getTreeNodes() ;%> <% renderNodes(treeNodeRoot,portalURI,useAJAX); %> - - - - </div> </div> </div>

16 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2009-12-11 03:28:29 -0500 (Fri, 11 Dec 2009) New Revision: 987 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java Log: GTNPORTAL-384 Not possible to enter accented letter in the user profile Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java 2009-12-11 08:28:29 UTC (rev 987) @@ -32,7 +32,10 @@ */ public class Utils { + public final static String USER_NAME_VALIDATOR_REGEX = "^[\\p{L}][\\p{L}._\\-\\d]+$"; + public final static String FIRST_CHARACTER_NAME_VALIDATOR_REGEX = "^[\\p{L}][\\p{L}._'\\- \\d]+$"; + public static String join(String separator, String... strings) { if (strings == null) @@ -120,7 +123,7 @@ } else { - Map<K, V> copy = new HashMap<K,V>(map); + Map<K, V> copy = new HashMap<K, V>(map); return Collections.unmodifiableMap(copy); } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.organization.webui.component; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; import org.exoplatform.web.application.ApplicationMessage; @@ -57,16 +58,14 @@ super(name); addUIFormInput(new UIFormStringInput(USERNAME, "userName", null).setEditable(false).addValidator( MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30).addValidator( - ResourceValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", + ResourceValidator.class).addValidator(ExpressionValidator.class, Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput("firstName", "firstName", null).setMaxLength(45).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("lastName", "lastName", null).setMaxLength(45).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); UIFormCheckBoxInput<Boolean> uiCheckbox = new UIFormCheckBoxInput<Boolean>(CHANGEPASS, null, false); Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-12-11 08:28:29 UTC (rev 987) @@ -211,7 +211,7 @@ #{0}=input field name NameValidator.msg.Invalid-char=Only alpha, digit, dot, dash and underscore characters are allowed for the field "{0}". -FirstCharacterNameValidator.msg=The "{0}" field must start with a character. +FirstCharacterNameValidator.msg=The "{0}" field must start with a character and must not contains special characters. ############################################################################# # Message Info # Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.webui.organization; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.Query; import org.exoplatform.services.organization.User; @@ -55,19 +56,17 @@ //setComponentConfig(getClass(), null) ; addUIFormInput(new UIFormStringInput(USERNAME, "userName", null).addValidator(MandatoryValidator.class) .addValidator(StringLengthValidator.class, 3, 30).addValidator(ResourceValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput(PASSWORD1X, "password", null).setType(UIFormStringInput.PASSWORD_TYPE) .addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class, 6, 30)); addUIFormInput(new UIFormStringInput(PASSWORD2X, "password", null).setType(UIFormStringInput.PASSWORD_TYPE) .addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class, 6, 30)); addUIFormInput(new UIFormStringInput("firstName", "firstName", null).addValidator(StringLengthValidator.class, 3, - 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", - "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", - "ResourceValidator.msg.Invalid-char")); + 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, + Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator(StringLengthValidator.class, 3, - 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", - "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", - "ResourceValidator.msg.Invalid-char")); + 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, + Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.portal.account; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; @@ -62,16 +63,14 @@ UIFormStringInput userName = new UIFormStringInput("userName", "userName", username); userName.setEditable(false); addUIFormInput(userName.addValidator(MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30) - .addValidator(ResourceValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", - "ResourceValidator.msg.Invalid-char")); + .addValidator(ResourceValidator.class).addValidator(ExpressionValidator.class, + Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput("firstName", "firstName", useraccount.getFirstName()).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("lastName", "lastName", useraccount.getLastName()).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", useraccount.getEmail()).addValidator( MandatoryValidator.class).addValidator(EmailAddressValidator.class)); }

16 years, 4 months

1
0
0 / 0

gatein SVN: r986 - in portal/branches/wsrp-integration: web/portal/src/main/webapp/groovy/portal/webui/container and 5 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-12-10 13:38:10 -0500 (Thu, 10 Dec 2009) New Revision: 986 Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIApplication.java portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: - Fixed typo: isEditting -> isEditing. - Added some constants. - Fixed some incorrect javadoc. Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-12-10 18:38:10 UTC (rev 986) @@ -7,7 +7,7 @@ def rcontext = _ctx.getRequestContext(); UIPortalApplication uiPortalApp = rcontext.getUIApplication(); - if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return; + if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return; int portalMode = uiPortalApp.getModeState(); JavascriptManager jsmanager = rcontext.getJavascriptManager(); @@ -20,7 +20,7 @@ WindowState windowState = uicomponent.getCurrentWindowState(); boolean isDesktop = "Window".equals(uicomponent.getPortletStyle()); String portletId = uicomponent.getId(); - if(!isDesktop && uiPortalApp.isEditting()) { + if(!isDesktop && uiPortalApp.isEditing()) { %> <div class="UIPortlet" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" style="top: 0px; left:0px;"> @@ -285,7 +285,7 @@ } } } - if(!isDesktop && uiPortalApp.isEditting()) { + if(!isDesktop && uiPortalApp.isEditing()) { if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { %> <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute; display:none;"><span></span></div> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-12-10 18:38:10 UTC (rev 986) @@ -7,7 +7,7 @@ ResourceBundle res = rcontext.getApplicationResourceBundle(); UIPortalApplication uiPortalApp = rcontext.getUIApplication(); - if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return; + if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return; String cssStyle = ""; String uiComponentWidth = uicomponent.getWidth(); @@ -24,7 +24,7 @@ } %> -<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> +<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> <div class="NormalContainerBlock"> <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-12-10 18:38:10 UTC (rev 986) @@ -6,7 +6,7 @@ ResourceBundle res = rcontext.getApplicationResourceBundle(); UIPortalApplication uiPortalApp = rcontext.getUIApplication(); - if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return; + if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return; /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */ String componentId = uicomponent.getId(); @@ -15,7 +15,7 @@ } %> -<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> +<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> <div class="NormalContainerBlock"> <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2009-12-10 18:38:10 UTC (rev 986) @@ -5,13 +5,13 @@ def rcontext = _ctx.getRequestContext(); UIPortalApplication uiPortalApp = rcontext.getUIApplication(); - if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return; + if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return; JavascriptManager jsmanager = rcontext.getJavascriptManager(); jsmanager.importJavascript('eXo.portal.PortalDragDrop'); %> -<div class="UIContainer UIToolbarContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> +<div class="UIContainer UIToolbarContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> <div class="NormalContainerBlock"> <div class="LeftContainerBlock"> <div class="RightContainerBlock UIComponentBlock"> Modified: portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java =================================================================== --- portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletURLBuilder.java 2009-12-10 18:38:10 UTC (rev 986) @@ -30,8 +30,10 @@ */ public class PortletURLBuilder extends URLBuilder<UIComponent> { + private static final String AMP = "&"; + private static final char EQUALS = '='; - public PortletURLBuilder() + public PortletURLBuilder() { super(null); } @@ -54,25 +56,25 @@ protected void createURL(StringBuilder builder, UIComponent targetComponent, String action, String targetBeanId, Parameter[] params) { - String baseUrl = getBaseURL().replaceAll("&", "&"); - builder.append(baseUrl).append("&").append(UIComponent.UICOMPONENT).append('=').append( + String baseUrl = getBaseURL().replaceAll("&", AMP); + builder.append(baseUrl).append(AMP).append(UIComponent.UICOMPONENT).append(EQUALS).append( targetComponent.getId()); if (action != null && action.trim().length() > 0) { - builder.append("&").append(WebuiRequestContext.ACTION).append('=').append(action); + builder.append(AMP).append(WebuiRequestContext.ACTION).append(EQUALS).append(action); } if (targetBeanId != null && targetBeanId.trim().length() > 0) { - builder.append("&").append(UIComponent.OBJECTID).append('=').append(targetBeanId); + builder.append(AMP).append(UIComponent.OBJECTID).append(EQUALS).append(targetBeanId); } if (params == null || params.length < 1) return; for (Parameter param : params) { - builder.append("&").append(param.getName()).append('=').append(param.getValue()); + builder.append(AMP).append(param.getName()).append(EQUALS).append(param.getValue()); } } Modified: portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIApplication.java =================================================================== --- portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIApplication.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIApplication.java 2009-12-10 18:38:10 UTC (rev 986) @@ -41,6 +41,7 @@ private long lastAccessApplication_; private UIPopupMessages uiPopupMessages_; + private static final String UIAPPLICATION = "uiapplication"; public UIApplication() throws Exception { @@ -81,11 +82,11 @@ public void setLastAccessApplication(long time) { lastAccessApplication_ = time; - }; + } public String getUIComponentName() { - return "uiapplication"; + return UIAPPLICATION; } @SuppressWarnings("unchecked") Modified: portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java =================================================================== --- portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java 2009-12-10 18:38:10 UTC (rev 986) @@ -372,7 +372,7 @@ public String getUIComponentName() { - return "uicomponent"; + return UICOMPONENT; } public <T> T getApplicationComponent(Class<T> type) Modified: portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java =================================================================== --- portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/Lifecycle.java 2009-12-10 18:38:10 UTC (rev 986) @@ -57,15 +57,12 @@ } /** - * That method is the most generic one for every UICOmponent that is bound to - * this Lifecycle object and the class that extends it withouyt overiding the + * That method is the most generic one for every UIComponent that is bound to + * this Lifecycle object and the class that extends it without overriding the * method. * - * According to the template type associated with the UI component (groovy or - * javascript one); the template is rendered using either the method - * renderJSTemplate() or renderTemplate(). In the case of the use of a groovy - * template, a context object of type WebuiBindingContext is used to then - * provide to the template all the necessary objects to render + * The template associated to the specified UIComponent is rendered using renderTemplate(). A WebuiBindingContext + * context object provides the template with all the necessary objects to render. * (WebuiBindingContext extends the Map class) * */ @@ -74,7 +71,7 @@ String template = uicomponent.getTemplate(); ResourceResolver resolver = uicomponent.getTemplateResourceResolver(context, template); WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, context); - bcontext.put("uicomponent", uicomponent); + bcontext.put(UIComponent.UICOMPONENT, uicomponent); bcontext.put(uicomponent.getUIComponentName(), uicomponent); renderTemplate(template, bcontext); } @@ -83,16 +80,16 @@ /** * The method allows to use Groovy templates to render the portal components. + * + * <ol> + * <li>Add a decorator object into the context</li> + * <li>Get a reference to the TemplateService</li> + * <li>If the system property "exo.product.developing" is set to <code>true</code>, the templates are not cached</li> + * <li>If the writer used to render the output is of type HtmlValidator, which is the case in the Portal + * environment, then it is also possible to validate the generated HTML (for debugging purposes)</li> + * <li>The template and the context are then merged to generate the HTML fragment</li> + * </ol> * - * 1) Add a decorator object into the context 2) Get a reference of the - * TemplateService 3) If the system property "exo.product.developing" is set - * to true, the templates are not cached 4) If the writer used to render the - * output is of type HtmlValidator, which is the case in the Portal - * environement, then it is also possible to validate the generated HTML (for - * debug purposes) 6) The template and the context are then merged using the - * method service.merge(groovyTemplate, bcontext) to generate the HTML - * fragment - * */ protected void renderTemplate(String template, WebuiBindingContext bcontext) throws Exception { Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2009-12-10 18:38:10 UTC (rev 986) @@ -265,7 +265,7 @@ WebuiApplication app = (WebuiApplication)prcontext.getApplication(); ApplicationResourceResolver resolver = app.getResourceResolver(); WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext); - bcontext.put("uicomponent", uicomponent); + bcontext.put(UIComponent.UICOMPONENT, uicomponent); bcontext.put("portletContent", markup); bcontext.put("portletTitle", portletTitle); try Modified: portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-12-10 14:01:49 UTC (rev 985) +++ portal/branches/wsrp-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2009-12-10 18:38:10 UTC (rev 986) @@ -211,7 +211,7 @@ * * @return True if the Portal is not in the normal mode */ - public boolean isEditting() + public boolean isEditing() { return (modeState != NORMAL_MODE); }

16 years, 4 months

1
0
0 / 0

gatein SVN: r985 - in portal/trunk/component/test/organization: src and 12 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2009-12-10 09:01:49 -0500 (Thu, 10 Dec 2009) New Revision: 985 Added: portal/trunk/component/test/organization/src/main/resources/conf/ portal/trunk/component/test/organization/src/main/resources/conf/organization/ portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml portal/trunk/component/test/organization/src/test/ portal/trunk/component/test/organization/src/test/java/ portal/trunk/component/test/organization/src/test/java/org/ portal/trunk/component/test/organization/src/test/java/org/exoplatform/ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java Modified: portal/trunk/component/test/organization/pom.xml Log: - organization test component Modified: portal/trunk/component/test/organization/pom.xml =================================================================== --- portal/trunk/component/test/organization/pom.xml 2009-12-09 20:27:22 UTC (rev 984) +++ portal/trunk/component/test/organization/pom.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -19,33 +19,45 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>exo.portal.component.test.organization</artifactId> - <packaging>jar</packaging> - <name>GateIn Portal Component Core Test Organization</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.component.test.organization</artifactId> + <packaging>jar</packaging> + <name>GateIn Portal Component Core Test Organization</name> - <dependencies> + <dependencies> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>3.0.0-Beta04-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> - </dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> </project> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,119 @@ +<?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.PicketLinkIDMService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> + <init-params> + <value-param> + <name>config</name> + <value>jar:/conf/organization/picketlink-idm/picketlink-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> + </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>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.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.show_sql" value="false"/> + <property name="hibernate.current_session_context_class" value="thread"/> + <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.cglib.use_reflection_optimizer" value="true"/> + <property name="hibernate.connection.url" value="jdbc:hsqldb:file:./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>conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> + <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + +</configuration> \ No newline at end of file Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + table="jbid_io"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <set name="attributes" + inverse="true" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" /> + </set> + <set name="credentials" + inverse="true" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" /> + </set> + <set name="fromRelationships" + inverse="true" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="FROM_IDENTITY" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + <many-to-one name="identityType" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" + access="field" + fetch="join" + lazy="false"> + <column name="IDENTITY_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="select"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + <set name="toRelationships" + inverse="true" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="TO_IDENTITY" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" + table="jbid_io_attr"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ATTRIBUTE_ID" /> + <generator class="native"/> + </id> + <many-to-one name="identityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join"> + <column name="IDENTITY_OBJECT_ID" not-null="true" unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="property" + lazy="false"> + <column name="NAME" + unique-key="id" /> + </property> + <property name="type" + type="java.lang.String" + access="field" + lazy="false" + not-null="true"> + <column name="ATTRIBUTE_TYPE"/> + </property> + <set name="textValues" + table="jbid_io_attr_text_values" + cascade="all, delete-orphan" + access="field" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="TEXT_ATTR_VALUE_ID"/> + <element type="string" + column="ATTR_VALUE"/> + </set> + <many-to-one name="binaryValue" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" + not-null="false" + column="BIN_VALUE_ID" + unique="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"/> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" + table="jbid_attr_bin_value"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="BIN_VALUE_ID" /> + <generator class="native"/> + </id> + <property name="value" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="false" + not-null="true"> + <column name="VALUE" length="10240000"/> + </property> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" + table="jbid_io_creden"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <many-to-one name="binaryValue" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" + not-null="false" + column="BIN_VALUE_ID" + unique="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"/> + <many-to-one name="identityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="IDENTITY_OBJECT_ID" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_creden_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <property name="textValue" + type="java.lang.String" + access="field" + lazy="false"> + <column name="TEXT" /> + </property> + <many-to-one name="type" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" + access="field" + fetch="join" + lazy="false"> + <column name="CREDENTIAL_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" + table="jbid_creden_bin_value"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="BIN_VALUE_ID" /> + <generator class="native"/> + </id> + <property name="value" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="false" + not-null="true"> + <column name="VALUE" length="10240000"/> + </property> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" + table="jbid_io_creden_type"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" + table="jbid_io_rel"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <many-to-one name="fromIdentityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="FROM_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="name" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" + access="field" + fetch="join" + lazy="proxy"> + <column name="NAME" + unique-key="id"/> + </many-to-one> + <many-to-one name="toIdentityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="TO_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="type" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" + access="field" + fetch="select" + lazy="proxy"> + <column name="REL_TYPE" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_rel_props" + cascade="all, delete-orphan" + fetch="subselect" + lazy="extra"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" + table="jbid_io_rel_name"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID"/> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_rel_name_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="select" + lazy="proxy"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" + table="jbid_io_rel_type"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" + table="jbid_io_type"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + table="jbid_realm"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_real_props" + cascade="all, delete-orphan" + fetch="subselect" + lazy="extra"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Added: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> + <realms> + <realm> + <id>PortalRealm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> \ No newline at end of file Added: portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java =================================================================== --- portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java (rev 0) +++ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java 2009-12-10 14:01:49 UTC (rev 985) @@ -0,0 +1,70 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2009, 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.exoplatform.component.test.organization; + +import org.exoplatform.component.test.AbstractGateInTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.container.component.ComponentRequestLifecycle; +import org.exoplatform.services.database.HibernateService; +import org.exoplatform.services.organization.OrganizationService; +import org.exoplatform.services.organization.User; +import org.exoplatform.services.organization.impl.UserImpl; + +@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/organization/organization-configuration.xml")}) +public class BootstrapTestCase extends AbstractGateInTest +{ + + public void testWorkspace() throws Exception + { + PortalContainer container = PortalContainer.getInstance(); + HibernateService hibernate = (HibernateService)container.getComponentInstanceOfType(HibernateService.class); + assertNotNull(hibernate); + OrganizationService organization = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); + assertNotNull(organization); + } + + public void testBasicOperation() throws Exception + { + PortalContainer container = PortalContainer.getInstance(); + OrganizationService organization = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); + assertNotNull(organization); + ((ComponentRequestLifecycle)organization).startRequest(container); + + User test = new UserImpl("testUser"); + organization.getUserHandler().createUser(test, false); + + test = organization.getUserHandler().findUserByName("toto"); + assertNull(test); + test = organization.getUserHandler().findUserByName("testUser"); + assertNotNull(test); + + ((ComponentRequestLifecycle)organization).endRequest(container); + + + } + +} \ No newline at end of file

16 years, 4 months

1
0
0 / 0

gatein SVN: r983 - portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-12-09 12:58:31 -0500 (Wed, 09 Dec 2009) New Revision: 983 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java Log: minor Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-12-09 17:56:51 UTC (rev 982) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2009-12-09 17:58:31 UTC (rev 983) @@ -19,6 +19,7 @@ package org.exoplatform.web.application.javascript; +import org.exoplatform.commons.utils.Safe; import org.exoplatform.container.ExoContainerContext; import org.gatein.wci.impl.DefaultServletContainerFactory; import org.picocontainer.Startable; @@ -127,13 +128,7 @@ } finally { - try - { - reader.close(); - } - catch (Exception ex) - { - } + Safe.close(reader); } } catch (Exception e)

16 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits December 2009