Author: julien_viet
Date: 2010-01-05 10:01:32 -0500 (Tue, 05 Jan 2010)
New Revision: 1163
Added:
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml
portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml
Removed:
portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml
portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml
portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml
portal/trunk/component/portal/src/test/java/conf/portal/
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml
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/mappings/
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml
portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml
Modified:
portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java
portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java
portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java
Log:
use configuration files identified by the artifact id of the module they are to avoid any
naming issue when loading configuration
Deleted:
portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml
===================================================================
---
portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
-<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
- <component>
-
<key>org.exoplatform.application.registry.ApplicationRegistryService</key>
-
<type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type>
- <!--
- <component-plugins>
- <component-plugin>
- <name>new.portal.portlets.registry</name>
- <set-method>initListener</set-method>
-
<type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
- <description>this listener init the portlets are registered in
PortletRegister</description>
- <init-params>
- <object-param>
- <name>administration</name>
- <description>description</description>
- <object
type="org.exoplatform.application.registry.ApplicationCategory">
- <field
name="name"><string>administration</string></field>
- <field
name="displayName"><string>Administration</string></field>
- <field name="description"><string>application for
administration</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
-
<value><string>*:/platform/administrators</string></value>
-
<value><string>*:/organization/management/executive-board</string></value>
- </collection>
- </field>
- <field name="applications">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="applicationName"><string>ApplicationRegistryPortlet</string></field>
- <field
name="categoryName"><string>administration</string></field>
- <field name="displayName"><string>Application
Registry</string></field>
- <field name="description"><string>Application
Registry</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>exoadmin</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
-
<value><string>*:/platform/administrators</string></value>
-
<value><string>*:/organization/management/executive-board</string></value>
- </collection>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="applicationName"><string>OrganizationPortlet</string></field>
- <field
name="categoryName"><string>administration</string></field>
- <field name="displayName"><string>Organization
Management</string></field>
- <field name="description"><string>Organization
Management</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>exoadmin</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/administrators</string></value>
- <value><string>*:/organization/management/executive-board</string></value>
- </collection>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="applicationName"><string>AccountPortlet</string></field>
- <field
name="categoryName"><string>administration</string></field>
- <field name="displayName"><string>New
Account</string></field>
- <field name="description"><string>New
Account</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>exoadmin</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/administrators</string></value>
- <value><string>*:/organization/management/executive-board</string></value>
- </collection>
- </field>
- </object>
- </value>
- </collection>
- </field>
- </object>
- </object-param>
-
- <object-param>
- <name>web</name>
- <description>description</description>
- <object
type="org.exoplatform.application.registry.ApplicationCategory">
- <field
name="name"><string>web</string></field>
- <field
name="displayName"><string>web</string></field>
- <field
name="description"><string>BasicPortlets</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- <field name="applications">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="categoryName"><string>web</string></field>
- <field
name="applicationName"><string>IFramePortlet</string></field>
- <field
name="displayName"><string>IFrame</string></field>
- <field
name="description"><string>IFrame</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>web</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="categoryName"><string>web</string></field>
- <field
name="applicationName"><string>SiteMapPortlet</string></field>
- <field
name="displayName"><string>SiteMap</string></field>
- <field
name="description"><string>SiteMap</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>web</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="categoryName"><string>web</string></field>
- <field
name="applicationName"><string>BrowserPortlet</string></field>
- <field name="displayName"><string>Web
Explorer</string></field>
- <field name="description"><string>Web
Explorer</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>web</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- </object>
- </value>
- </collection>
- </field>
- </object>
- </object-param>
-
- <object-param>
- <name>dashboard</name>
- <description>description</description>
- <object
type="org.exoplatform.application.registry.ApplicationCategory">
- <field
name="name"><string>dashboard</string></field>
- <field
name="displayName"><string>Dashboard</string></field>
- <field
name="description"><string>Dashboard</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- <field name="applications">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="categoryName"><string>dashboard</string></field>
- <field
name="applicationName"><string>DashboardPortlet</string></field>
- <field name="displayName"><string>Dashboard
Portlet</string></field>
- <field name="description"><string>Dashboard
Portlet</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>dashboard</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.application.registry.Application">
- <field
name="categoryName"><string>dashboard</string></field>
- <field
name="applicationName"><string>GadgetPortlet</string></field>
- <field name="displayName"><string>Gadget Wrapper
Portlet</string></field>
- <field name="description"><string>Gadget Wrapper
Portlet</string></field>
- <field
name="applicationType"><string>portlet</string></field>
- <field
name="applicationGroup"><string>dashboard</string></field>
- <field name="accessPermissions">
- <collection type="java.util.ArrayList"
item-type="java.lang.String">
- <value><string>*:/platform/users</string></value>
- </collection>
- </field>
- </object>
- </value>
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
- </component-plugins>
--->
- </component>
-
- <external-component-plugins>
-
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
- <component-plugin>
- <name>chromattic</name>
- <set-method>addLifeCycle</set-method>
-
<type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>app</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
-
<value>org.exoplatform.application.registry.impl.ContentRegistry</value>
-
<value>org.exoplatform.application.registry.impl.CategoryDefinition</value>
-
<value>org.exoplatform.application.registry.impl.ContentDefinition</value>
-
<value>org.exoplatform.application.gadget.impl.GadgetRegistry</value>
-
<value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
-
<value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
-
<value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
- <value>org.chromattic.ntdef.NTFile</value>
- <value>org.chromattic.ntdef.NTFolder</value>
- <value>org.chromattic.ntdef.NTResource</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
- <external-component-plugins>
-
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
- <component-plugin>
- <name>add.namespaces</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- <init-params>
- <properties-param>
- <name>namespaces</name>
- <property name="app"
value="http://www.gatein.org/jcr/application-registry/1.0/"/>
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>add.nodeType</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
- <init-params>
- <values-param>
- <name>autoCreatedInNewRepository</name>
- <description>Node types configuration file</description>
- <value>jar:/conf/application-nodetypes.xml</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
- <external-component-plugins>
-
<target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
- <component-plugin>
- <name>new.portal.config.user.listener</name>
- <set-method>initListener</set-method>
- <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
- <description>this listener init the portal configuration</description>
- <init-params>
- <value-param>
- <name>default.portal</name>
- <description>The default portal for checking db is empty or
not</description>
- <value>classic</value>
- </value-param>
- <value-param>
- <name>initializing.failure.ignore</name>
- <description>In the run method, use try catch or not (value is
true/false)</description>
- <value>true</value>
- </value-param>
- <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>
- </external-component-plugins>
-
- <external-component-plugins>
-
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
- <component-plugin>
- <name>init.service.listener</name>
- <set-method>addListenerPlugin</set-method>
-
<type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
- <description>this listener populate organization data for the first
launch</description>
- <init-params>
- <value-param>
- <name>checkDatabaseAlgorithm</name>
- <description>check database</description>
- <value>entry</value>
- </value-param>
- <value-param>
- <name>printInformation</name>
- <description>Print information init database</description>
- <value>true</value>
- </value-param>
- <object-param>
- <name>configuration</name>
- <description>description</description>
- <object
type="org.exoplatform.services.organization.OrganizationConfig">
- <field name="membershipType">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>member</string></field>
- <field name="description"><string>member
membership type</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>MembershipType_1</string></field>
- <field
name="description"><string>MembershipType_1 membership
type</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>MembershipType_2</string></field>
- <field
name="description"><string>MembershipType_2 membership
type</string></field>
- </object>
- </value>
- </collection>
- </field>
-
- <field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>platform</string></field>
- <field
name="parentId"><string></string></field>
- <field name="description"><string>the
/platform group</string></field>
- <field
name="label"><string>Platform</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>users</string></field>
- <field
name="parentId"><string>/platform</string></field>
- <field name="description"><string>the
/platform/users group</string></field>
- <field
name="label"><string>Users</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>Group1</string></field>
- <field
name="parentId"><string>/platform/users</string></field>
- <field name="description"><string>the
/platform/users/Group1 group</string></field>
- <field
name="label"><string>Group1</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>Group2</string></field>
- <field
name="parentId"><string>/platform/users</string></field>
- <field name="description"><string>the
/platform/users/Group2 group</string></field>
- <field
name="label"><string>Group2</string></field>
- </object>
- </value>
- </collection>
- </field>
-
- <field name="user">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>demo</string></field>
- <field
name="password"><string>gtn</string></field>
- <field
name="firstName"><string>Demo</string></field>
- <field
name="lastName"><string>gtn</string></field>
- <field
name="email"><string>demo@localhost</string></field>
- <field name="groups">
- <string>member:/platform/users</string>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>userName_1</string></field>
- <field
name="password"><string>default</string></field>
- <field
name="firstName"><string>default</string></field>
- <field
name="lastName"><string>default</string></field>
- <field
name="email"><string>exo(a)exoportal.org</string></field>
- <field name="groups">
- <string>member:/platform/users</string>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>userName_2</string></field>
- <field
name="password"><string>default</string></field>
- <field
name="firstName"><string>default</string></field>
- <field
name="lastName"><string>default</string></field>
- <field
name="email"><string>exo(a)exoportal.org</string></field>
- <field name="groups">
- <string>member:/platform/users</string>
- </field>
- </object>
- </value>
-
- <!--
- <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>overwritelayout</string></field>
- <field
name="password"><string>whatever</string></field>
- <field
name="firstName"><string>whatever</string></field>
- <field
name="lastName"><string>whatever</string></field>
- <field
name="email"><string>whatever@localhost</string></field>
- <field name="groups">
- <string>member:/platform/guests</string>
- </field>
- </object>
- </value>
--->
-
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
-
- </external-component-plugins>
-
-</configuration>
Copied:
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
(from rev 1154,
portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml)
===================================================================
---
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
(rev 0)
+++
portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+
<key>org.exoplatform.application.registry.ApplicationRegistryService</key>
+
<type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type>
+ <!--
+ <component-plugins>
+ <component-plugin>
+ <name>new.portal.portlets.registry</name>
+ <set-method>initListener</set-method>
+
<type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
+ <description>this listener init the portlets are registered in
PortletRegister</description>
+ <init-params>
+ <object-param>
+ <name>administration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.application.registry.ApplicationCategory">
+ <field
name="name"><string>administration</string></field>
+ <field
name="displayName"><string>Administration</string></field>
+ <field name="description"><string>application for
administration</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+
<value><string>*:/platform/administrators</string></value>
+
<value><string>*:/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ <field name="applications">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="applicationName"><string>ApplicationRegistryPortlet</string></field>
+ <field
name="categoryName"><string>administration</string></field>
+ <field name="displayName"><string>Application
Registry</string></field>
+ <field name="description"><string>Application
Registry</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>exoadmin</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+
<value><string>*:/platform/administrators</string></value>
+
<value><string>*:/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="applicationName"><string>OrganizationPortlet</string></field>
+ <field
name="categoryName"><string>administration</string></field>
+ <field name="displayName"><string>Organization
Management</string></field>
+ <field name="description"><string>Organization
Management</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>exoadmin</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/administrators</string></value>
+ <value><string>*:/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="applicationName"><string>AccountPortlet</string></field>
+ <field
name="categoryName"><string>administration</string></field>
+ <field name="displayName"><string>New
Account</string></field>
+ <field name="description"><string>New
Account</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>exoadmin</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/administrators</string></value>
+ <value><string>*:/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+
+ <object-param>
+ <name>web</name>
+ <description>description</description>
+ <object
type="org.exoplatform.application.registry.ApplicationCategory">
+ <field
name="name"><string>web</string></field>
+ <field
name="displayName"><string>web</string></field>
+ <field
name="description"><string>BasicPortlets</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ <field name="applications">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="categoryName"><string>web</string></field>
+ <field
name="applicationName"><string>IFramePortlet</string></field>
+ <field
name="displayName"><string>IFrame</string></field>
+ <field
name="description"><string>IFrame</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>web</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="categoryName"><string>web</string></field>
+ <field
name="applicationName"><string>SiteMapPortlet</string></field>
+ <field
name="displayName"><string>SiteMap</string></field>
+ <field
name="description"><string>SiteMap</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>web</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="categoryName"><string>web</string></field>
+ <field
name="applicationName"><string>BrowserPortlet</string></field>
+ <field name="displayName"><string>Web
Explorer</string></field>
+ <field name="description"><string>Web
Explorer</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>web</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+
+ <object-param>
+ <name>dashboard</name>
+ <description>description</description>
+ <object
type="org.exoplatform.application.registry.ApplicationCategory">
+ <field
name="name"><string>dashboard</string></field>
+ <field
name="displayName"><string>Dashboard</string></field>
+ <field
name="description"><string>Dashboard</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ <field name="applications">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="categoryName"><string>dashboard</string></field>
+ <field
name="applicationName"><string>DashboardPortlet</string></field>
+ <field name="displayName"><string>Dashboard
Portlet</string></field>
+ <field name="description"><string>Dashboard
Portlet</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>dashboard</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.application.registry.Application">
+ <field
name="categoryName"><string>dashboard</string></field>
+ <field
name="applicationName"><string>GadgetPortlet</string></field>
+ <field name="displayName"><string>Gadget Wrapper
Portlet</string></field>
+ <field name="description"><string>Gadget Wrapper
Portlet</string></field>
+ <field
name="applicationType"><string>portlet</string></field>
+ <field
name="applicationGroup"><string>dashboard</string></field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList"
item-type="java.lang.String">
+ <value><string>*:/platform/users</string></value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+-->
+ </component>
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+
<type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>domain-name</name>
+ <value>app</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+
<value>org.exoplatform.application.registry.impl.ContentRegistry</value>
+
<value>org.exoplatform.application.registry.impl.CategoryDefinition</value>
+
<value>org.exoplatform.application.registry.impl.ContentDefinition</value>
+
<value>org.exoplatform.application.gadget.impl.GadgetRegistry</value>
+
<value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
+
<value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
+
<value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
+ <value>org.chromattic.ntdef.NTFile</value>
+ <value>org.chromattic.ntdef.NTFolder</value>
+ <value>org.chromattic.ntdef.NTResource</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="app"
value="http://www.gatein.org/jcr/application-registry/1.0/"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>jar:/conf/application-nodetypes.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
+ <component-plugin>
+ <name>new.portal.config.user.listener</name>
+ <set-method>initListener</set-method>
+ <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+ <description>this listener init the portal configuration</description>
+ <init-params>
+ <value-param>
+ <name>default.portal</name>
+ <description>The default portal for checking db is empty or
not</description>
+ <value>classic</value>
+ </value-param>
+ <value-param>
+ <name>initializing.failure.ignore</name>
+ <description>In the run method, use try catch or not (value is
true/false)</description>
+ <value>true</value>
+ </value-param>
+ <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>
+ </external-component-plugins>
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+ <component-plugin>
+ <name>init.service.listener</name>
+ <set-method>addListenerPlugin</set-method>
+
<type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
+ <description>this listener populate organization data for the first
launch</description>
+ <init-params>
+ <value-param>
+ <name>checkDatabaseAlgorithm</name>
+ <description>check database</description>
+ <value>entry</value>
+ </value-param>
+ <value-param>
+ <name>printInformation</name>
+ <description>Print information init database</description>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>configuration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig">
+ <field name="membershipType">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>member</string></field>
+ <field name="description"><string>member
membership type</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>MembershipType_1</string></field>
+ <field
name="description"><string>MembershipType_1 membership
type</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>MembershipType_2</string></field>
+ <field
name="description"><string>MembershipType_2 membership
type</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+
+ <field name="group">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>platform</string></field>
+ <field
name="parentId"><string></string></field>
+ <field name="description"><string>the
/platform group</string></field>
+ <field
name="label"><string>Platform</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>users</string></field>
+ <field
name="parentId"><string>/platform</string></field>
+ <field name="description"><string>the
/platform/users group</string></field>
+ <field
name="label"><string>Users</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>Group1</string></field>
+ <field
name="parentId"><string>/platform/users</string></field>
+ <field name="description"><string>the
/platform/users/Group1 group</string></field>
+ <field
name="label"><string>Group1</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>Group2</string></field>
+ <field
name="parentId"><string>/platform/users</string></field>
+ <field name="description"><string>the
/platform/users/Group2 group</string></field>
+ <field
name="label"><string>Group2</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+
+ <field name="user">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>demo</string></field>
+ <field
name="password"><string>gtn</string></field>
+ <field
name="firstName"><string>Demo</string></field>
+ <field
name="lastName"><string>gtn</string></field>
+ <field
name="email"><string>demo@localhost</string></field>
+ <field name="groups">
+ <string>member:/platform/users</string>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>userName_1</string></field>
+ <field
name="password"><string>default</string></field>
+ <field
name="firstName"><string>default</string></field>
+ <field
name="lastName"><string>default</string></field>
+ <field
name="email"><string>exo(a)exoportal.org</string></field>
+ <field name="groups">
+ <string>member:/platform/users</string>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>userName_2</string></field>
+ <field
name="password"><string>default</string></field>
+ <field
name="firstName"><string>default</string></field>
+ <field
name="lastName"><string>default</string></field>
+ <field
name="email"><string>exo(a)exoportal.org</string></field>
+ <field name="groups">
+ <string>member:/platform/users</string>
+ </field>
+ </object>
+ </value>
+
+ <!--
+ <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>overwritelayout</string></field>
+ <field
name="password"><string>whatever</string></field>
+ <field
name="firstName"><string>whatever</string></field>
+ <field
name="lastName"><string>whatever</string></field>
+ <field
name="email"><string>whatever@localhost</string></field>
+ <field name="groups">
+ <string>member:/platform/guests</string>
+ </field>
+ </object>
+ </value>
+-->
+
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+
+ </external-component-plugins>
+
+</configuration>
Modified:
portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java
===================================================================
---
portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -28,10 +28,10 @@
* @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/application-registry-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/portal/portal-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.organization-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.application-registry-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.portal-configuration1.xml")
})
public abstract class AbstractApplicationRegistryTest extends AbstractGateInTest
{
Modified:
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
===================================================================
---
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -34,8 +34,8 @@
* @version $Revision$
*/
@ConfiguredBy({
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/jcr/jcr-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/chromattic-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.common-configuration.xml")
})
public class ChromatticIntegrationTestCase extends AbstractGateInTest
{
Deleted:
portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml
===================================================================
---
portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
-<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.commons.chromattic.ChromatticManager</key>
- <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
- </component>
- <external-component-plugins>
-
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
- <component-plugin>
- <name>chromattic</name>
- <set-method>addLifeCycle</set-method>
- <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>test</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
- <value>org.exoplatform.commons.chromattic.FooEntity</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-</configuration>
Copied:
portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml
(from rev 1159,
portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml)
===================================================================
---
portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml
(rev 0)
+++
portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<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.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+ <external-component-plugins>
+
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+ <component-plugin>
+ <name>chromattic</name>
+ <set-method>addLifeCycle</set-method>
+ <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>domain-name</name>
+ <value>test</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ <value>org.exoplatform.commons.chromattic.FooEntity</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
Copied:
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
(from rev 1154,
portal/trunk/component/portal/src/test/java/conf/portal/portal-configuration.xml)
===================================================================
---
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
(rev 0)
+++
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.exoplatform.services.cache.CacheService</key>
+ <jmx-name>cache:type=CacheService</jmx-name>
+ <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
+ <init-params>
+ <object-param>
+ <name>cache.config.default</name>
+ <description>The default cache configuration</description>
+ <object type="org.exoplatform.services.cache.ExoCacheConfig">
+ <field
name="name"><string>default</string></field>
+ <field name="maxSize"><int>300</int></field>
+ <field
name="liveTime"><long>6000</long></field>
+ <field
name="distributed"><boolean>false</boolean></field>
+ <field
name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
+ </object>
+ </object-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+
<type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.listener.ListenerService</key>
+ <type>org.exoplatform.services.listener.ListenerService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.pom.config.POMSessionManager</key>
+ <type>org.exoplatform.portal.pom.config.POMSessionManager</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.pom.data.ModelDataStorage</key>
+ <type>org.exoplatform.portal.pom.config.POMDataStorage</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.config.DataStorage</key>
+ <type>org.exoplatform.portal.config.DataStorageImpl</type>
+ </component>
+
+ <component>
+
<key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
+
<type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.config.UserACL</key>
+ <type>org.exoplatform.portal.config.UserACL</type>
+ <init-params>
+ <value-param>
+ <name>super.user</name>
+ <description>administrator</description>
+ <value>root</value>
+ </value-param>
+ <value-param>
+ <name>guests.group</name>
+ <description>guests group</description>
+ <value>/platform/guests</value>
+ </value-param>
+ <value-param>
+ <name>navigation.creator.membership.type</name>
+ <description>specific membership type have full permission with group
navigation</description>
+ <value>manager</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+ <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+ </component>
+
+ <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>domain-name</name>
+ <value>mop</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+ <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value>
+ <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value>
+ <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value>
+ <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value>
+ <value>org.gatein.mop.core.api.workspace.PageImpl</value>
+ <value>org.gatein.mop.core.api.workspace.PageContainer</value>
+ <value>org.gatein.mop.core.api.workspace.NavigationImpl</value>
+
<value>org.gatein.mop.core.api.workspace.NavigationContainer</value>
+ <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value>
+ <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value>
+
<value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value>
+ <value>org.gatein.mop.core.api.workspace.PortalSite</value>
+
<value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value>
+ <value>org.gatein.mop.core.api.workspace.GroupSite</value>
+ <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value>
+ <value>org.gatein.mop.core.api.workspace.UserSite</value>
+
<value>org.gatein.mop.core.api.workspace.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>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>
Copied:
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml
(from rev 1159,
portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml)
===================================================================
---
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml
(rev 0)
+++
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
+ <component-plugin>
+ <name>new.portal.config.user.listener</name>
+ <set-method>initListener</set-method>
+ <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+ <description>this listener init the portal configuration</description>
+ <init-params>
+ <value-param>
+ <name>default.portal</name>
+ <description>The default portal for checking db is empty or
not</description>
+ <value>classic</value>
+ </value-param>
+ <value-param>
+ <name>initializing.failure.ignore</name>
+ <description>In the run method, use try catch or not (value is
true/false)</description>
+ <value>true</value>
+ </value-param>
+ <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>
+ </external-component-plugins>
+
+ <external-component-plugins>
+
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+ <component-plugin>
+ <name>init.service.listener</name>
+ <set-method>addListenerPlugin</set-method>
+
<type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
+ <description>this listener populate organization data for the first
launch</description>
+ <init-params>
+ <value-param>
+ <name>checkDatabaseAlgorithm</name>
+ <description>check database</description>
+ <value>entry</value>
+ </value-param>
+ <value-param>
+ <name>printInformation</name>
+ <description>Print information init database</description>
+ <value>true</value>
+ </value-param>
+ <object-param>
+ <name>configuration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig">
+ <field name="membershipType">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>manager</string></field>
+ <field name="description"><string>manager
membership type</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>member</string></field>
+ <field name="description"><string>member
membership type</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+ <field
name="type"><string>validator</string></field>
+ <field name="description"><string>validator
membership type</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+
+ <field name="group">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>platform</string></field>
+ <field
name="parentId"><string></string></field>
+ <field name="description"><string>the
/platform group</string></field>
+ <field
name="label"><string>Platform</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>administrators</string></field>
+ <field
name="parentId"><string>/platform</string></field>
+ <field name="description"><string>the
/platform/administrators group</string></field>
+ <field
name="label"><string>Administrators</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>users</string></field>
+ <field
name="parentId"><string>/platform</string></field>
+ <field name="description"><string>the
/platform/users group</string></field>
+ <field
name="label"><string>Users</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>guests</string></field>
+ <field
name="parentId"><string>/platform</string></field>
+ <field name="description"><string>the
/platform/guests group</string></field>
+ <field
name="label"><string>Guests</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>organization</string></field>
+ <field
name="parentId"><string></string></field>
+ <field name="description"><string>the
organization group</string></field>
+ <field
name="label"><string>Organization</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>management</string></field>
+ <field
name="parentId"><string>/organization</string></field>
+ <field name="description"><string>the
/organization/management group</string></field>
+ <field
name="label"><string>Management</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>executive-board</string></field>
+ <field
name="parentId"><string>/organization/management</string></field>
+ <field name="description"><string>the
/organization/management/executive-board group</string></field>
+ <field name="label"><string>Executive
Board</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>human-resources</string></field>
+ <field
name="parentId"><string>/organization/management</string></field>
+ <field name="description"><string>the
/organization/management/human-resource group</string></field>
+ <field name="label"><string>Human
Resources</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>communication</string></field>
+ <field
name="parentId"><string>/organization</string></field>
+ <field name="description"><string>the
/organization/communication group</string></field>
+ <field
name="label"><string>Communication</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>marketing</string></field>
+ <field
name="parentId"><string>/organization/communication</string></field>
+ <field name="description"><string>the
/organization/communication/marketing group</string></field>
+ <field
name="label"><string>Marketing</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>press-and-media</string></field>
+ <field
name="parentId"><string>/organization/communication</string></field>
+ <field name="description"><string>the
/organization/communication/press-and-media group</string></field>
+ <field name="label"><string>Press and
Media</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>operations</string></field>
+ <field
name="parentId"><string>/organization</string></field>
+ <field name="description"><string>the
/organization/operations and media group</string></field>
+ <field
name="label"><string>Operations</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>sales</string></field>
+ <field
name="parentId"><string>/organization/operations</string></field>
+ <field name="description"><string>the
/organization/operations/sales group</string></field>
+ <field
name="label"><string>Sales</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>finances</string></field>
+ <field
name="parentId"><string>/organization/operations</string></field>
+ <field name="description"><string>the
/organization/operations/finances group</string></field>
+ <field
name="label"><string>Finances</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>customers</string></field>
+ <field
name="parentId"><string></string></field>
+ <field name="description"><string>the
/customers group</string></field>
+ <field
name="label"><string>Customers</string></field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
+ <field
name="name"><string>partners</string></field>
+ <field
name="parentId"><string></string></field>
+ <field name="description"><string>the
/partners group</string></field>
+ <field
name="label"><string>Partners</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+
+ <field name="user">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>root</string></field>
+ <field
name="password"><string>gtn</string></field>
+ <field
name="firstName"><string>Root</string></field>
+ <field
name="lastName"><string>Root</string></field>
+ <field
name="email"><string>root@localhost</string></field>
+ <field name="groups">
+ <string>
+ manager:/platform/administrators,member:/platform/users,
+ member:/organization/management/executive-board
+ </string>
+ </field>
+ </object>
+ </value>
+
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>john</string></field>
+ <field
name="password"><string>gtn</string></field>
+ <field
name="firstName"><string>John</string></field>
+ <field
name="lastName"><string>Anthony</string></field>
+ <field
name="email"><string>john@localhost</string></field>
+ <field name="groups">
+ <string>
+ member:/platform/administrators,member:/platform/users,
+ manager:/organization/management/executive-board
+ </string>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>mary</string></field>
+ <field
name="password"><string>gtn</string></field>
+ <field
name="firstName"><string>Mary</string></field>
+ <field
name="lastName"><string>Kelly</string></field>
+ <field
name="email"><string>mary@localhost</string></field>
+ <field name="groups">
+ <string>member:/platform/users</string>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>demo</string></field>
+ <field
name="password"><string>gtn</string></field>
+ <field
name="firstName"><string>Demo</string></field>
+ <field
name="lastName"><string>gtn</string></field>
+ <field
name="email"><string>demo@localhost</string></field>
+ <field name="groups">
+
<string>member:/platform/guests,member:/platform/users</string>
+ </field>
+ </object>
+ </value>
+
+ <value>
+ <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
+ <field
name="userName"><string>overwritelayout</string></field>
+ <field
name="password"><string>whatever</string></field>
+ <field
name="firstName"><string>whatever</string></field>
+ <field
name="lastName"><string>whatever</string></field>
+ <field
name="email"><string>whatever@localhost</string></field>
+ <field name="groups">
+ <string>member:/platform/guests</string>
+ </field>
+ </object>
+ </value>
+
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+
+ </external-component-plugins>
+
+</configuration>
Deleted: portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml 2010-01-05
13:57:00 UTC (rev 1162)
+++ portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
-<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
- <external-component-plugins>
-
<target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
- <component-plugin>
- <name>new.portal.config.user.listener</name>
- <set-method>initListener</set-method>
- <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
- <description>this listener init the portal configuration</description>
- <init-params>
- <value-param>
- <name>default.portal</name>
- <description>The default portal for checking db is empty or
not</description>
- <value>classic</value>
- </value-param>
- <value-param>
- <name>initializing.failure.ignore</name>
- <description>In the run method, use try catch or not (value is
true/false)</description>
- <value>true</value>
- </value-param>
- <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>
- </external-component-plugins>
-
- <external-component-plugins>
-
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
- <component-plugin>
- <name>init.service.listener</name>
- <set-method>addListenerPlugin</set-method>
-
<type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
- <description>this listener populate organization data for the first
launch</description>
- <init-params>
- <value-param>
- <name>checkDatabaseAlgorithm</name>
- <description>check database</description>
- <value>entry</value>
- </value-param>
- <value-param>
- <name>printInformation</name>
- <description>Print information init database</description>
- <value>true</value>
- </value-param>
- <object-param>
- <name>configuration</name>
- <description>description</description>
- <object
type="org.exoplatform.services.organization.OrganizationConfig">
- <field name="membershipType">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>manager</string></field>
- <field name="description"><string>manager
membership type</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>member</string></field>
- <field name="description"><string>member
membership type</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
- <field
name="type"><string>validator</string></field>
- <field name="description"><string>validator
membership type</string></field>
- </object>
- </value>
- </collection>
- </field>
-
- <field name="group">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>platform</string></field>
- <field
name="parentId"><string></string></field>
- <field name="description"><string>the
/platform group</string></field>
- <field
name="label"><string>Platform</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>administrators</string></field>
- <field
name="parentId"><string>/platform</string></field>
- <field name="description"><string>the
/platform/administrators group</string></field>
- <field
name="label"><string>Administrators</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>users</string></field>
- <field
name="parentId"><string>/platform</string></field>
- <field name="description"><string>the
/platform/users group</string></field>
- <field
name="label"><string>Users</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>guests</string></field>
- <field
name="parentId"><string>/platform</string></field>
- <field name="description"><string>the
/platform/guests group</string></field>
- <field
name="label"><string>Guests</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>organization</string></field>
- <field
name="parentId"><string></string></field>
- <field name="description"><string>the
organization group</string></field>
- <field
name="label"><string>Organization</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>management</string></field>
- <field
name="parentId"><string>/organization</string></field>
- <field name="description"><string>the
/organization/management group</string></field>
- <field
name="label"><string>Management</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>executive-board</string></field>
- <field
name="parentId"><string>/organization/management</string></field>
- <field name="description"><string>the
/organization/management/executive-board group</string></field>
- <field name="label"><string>Executive
Board</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>human-resources</string></field>
- <field
name="parentId"><string>/organization/management</string></field>
- <field name="description"><string>the
/organization/management/human-resource group</string></field>
- <field name="label"><string>Human
Resources</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>communication</string></field>
- <field
name="parentId"><string>/organization</string></field>
- <field name="description"><string>the
/organization/communication group</string></field>
- <field
name="label"><string>Communication</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>marketing</string></field>
- <field
name="parentId"><string>/organization/communication</string></field>
- <field name="description"><string>the
/organization/communication/marketing group</string></field>
- <field
name="label"><string>Marketing</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>press-and-media</string></field>
- <field
name="parentId"><string>/organization/communication</string></field>
- <field name="description"><string>the
/organization/communication/press-and-media group</string></field>
- <field name="label"><string>Press and
Media</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>operations</string></field>
- <field
name="parentId"><string>/organization</string></field>
- <field name="description"><string>the
/organization/operations and media group</string></field>
- <field
name="label"><string>Operations</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>sales</string></field>
- <field
name="parentId"><string>/organization/operations</string></field>
- <field name="description"><string>the
/organization/operations/sales group</string></field>
- <field
name="label"><string>Sales</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>finances</string></field>
- <field
name="parentId"><string>/organization/operations</string></field>
- <field name="description"><string>the
/organization/operations/finances group</string></field>
- <field
name="label"><string>Finances</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>customers</string></field>
- <field
name="parentId"><string></string></field>
- <field name="description"><string>the
/customers group</string></field>
- <field
name="label"><string>Customers</string></field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$Group">
- <field
name="name"><string>partners</string></field>
- <field
name="parentId"><string></string></field>
- <field name="description"><string>the
/partners group</string></field>
- <field
name="label"><string>Partners</string></field>
- </object>
- </value>
- </collection>
- </field>
-
- <field name="user">
- <collection type="java.util.ArrayList">
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>root</string></field>
- <field
name="password"><string>gtn</string></field>
- <field
name="firstName"><string>Root</string></field>
- <field
name="lastName"><string>Root</string></field>
- <field
name="email"><string>root@localhost</string></field>
- <field name="groups">
- <string>
- manager:/platform/administrators,member:/platform/users,
- member:/organization/management/executive-board
- </string>
- </field>
- </object>
- </value>
-
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>john</string></field>
- <field
name="password"><string>gtn</string></field>
- <field
name="firstName"><string>John</string></field>
- <field
name="lastName"><string>Anthony</string></field>
- <field
name="email"><string>john@localhost</string></field>
- <field name="groups">
- <string>
- member:/platform/administrators,member:/platform/users,
- manager:/organization/management/executive-board
- </string>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>mary</string></field>
- <field
name="password"><string>gtn</string></field>
- <field
name="firstName"><string>Mary</string></field>
- <field
name="lastName"><string>Kelly</string></field>
- <field
name="email"><string>mary@localhost</string></field>
- <field name="groups">
- <string>member:/platform/users</string>
- </field>
- </object>
- </value>
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>demo</string></field>
- <field
name="password"><string>gtn</string></field>
- <field
name="firstName"><string>Demo</string></field>
- <field
name="lastName"><string>gtn</string></field>
- <field
name="email"><string>demo@localhost</string></field>
- <field name="groups">
-
<string>member:/platform/guests,member:/platform/users</string>
- </field>
- </object>
- </value>
-
- <value>
- <object
type="org.exoplatform.services.organization.OrganizationConfig$User">
- <field
name="userName"><string>overwritelayout</string></field>
- <field
name="password"><string>whatever</string></field>
- <field
name="firstName"><string>whatever</string></field>
- <field
name="lastName"><string>whatever</string></field>
- <field
name="email"><string>whatever@localhost</string></field>
- <field name="groups">
- <string>member:/platform/guests</string>
- </field>
- </object>
- </value>
-
- </collection>
- </field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
-
- </external-component-plugins>
-
-</configuration>
Modified:
portal/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 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -30,10 +30,10 @@
* @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/portal/portal-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/portal-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.organization-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.portal-configuration1.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.portal-configuration2.xml")
})
public abstract class AbstractPortalTest extends AbstractGateInTest
{
Copied:
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml
(from rev 1154,
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml)
===================================================================
---
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml
(rev 0)
+++
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+<configuration
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+ <component>
+ <key>org.exoplatform.services.idgenerator.IDGeneratorService</key>
+
<type>org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.security.IdentityRegistry</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.document.DocumentReaderService</key>
+
<type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>pdf.document.reader</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.PDFDocumentReader</type>
+ <description>to read the pdf inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.types</name>
+ <description>description</description>
+ <value>application/pdf</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSWord</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.MSWordDocumentReader</type>
+ <description>to read the ms word inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSWord</name>
+ <description>description</description>
+ <value>application/msword</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSExcel</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.MSExcelDocumentReader</type>
+ <description>to read the ms excel inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSExcel</name>
+ <description>description</description>
+ <value>application/excel</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerMSOutlook</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.MSOutlookDocumentReader</type>
+ <description>to read the ms outlook inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesMSOutlook</name>
+ <description>description</description>
+ <value>application/vnd.ms-outlook</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>PPTdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.PPTDocumentReader</type>
+ <description>to read the ms ppt inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesPPT</name>
+ <description>description</description>
+ <value>application/ppt</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerHTML</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.HTMLDocumentReader</type>
+ <description>to read the html inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesHTML</name>
+ <description>description</description>
+ <value>text/html</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerXML</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.XMLDocumentReader</type>
+ <description>to read the xml inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesXML</name>
+ <description>description</description>
+ <value>text/xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>TPdocument.reader</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.TextPlainDocumentReader</type>
+ <description>to read the plain text inputstream</description>
+ <init-params>
+ <values-param>
+ <name>document.known.typesTextPlain</name>
+ <description>description</description>
+ <value>text/plain</value>
+ </values-param>
+ <!-- values-param>
+ <name>defaultEncoding</name>
+ <description>description</description>
+ <value>UTF-8</value>
+ </values-param -->
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>document.readerOO</name>
+ <set-method>addDocumentReader</set-method>
+
<type>org.exoplatform.services.document.impl.OpenOfficeDocumentReader</type>
+ <description>to read the OO inputstream</description>
+ </component-plugin>
+
+ </component-plugins>
+ </component>
+
+ <component>
+
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+
<value>jar:/conf/exo.portal.component.test.jcr-repository-configuration.xml</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ </component>
+
+</configuration>
Copied:
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
(from rev 1159,
portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml)
===================================================================
---
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
(rev 0)
+++
portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,129 @@
+<!--
+ ~ 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.
+ -->
+
+<repository-service default-repository="repository">
+ <repositories>
+ <repository name="repository" system-workspace="system"
default-workspace="portal-test">
+ <security-domain>gatein-domain</security-domain>
+ <access-control>optional</access-control>
+
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+
+ <!-- System -->
+ <workspaces>
+ <workspace name="system">
+ <container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size"
value="204800"/>
+ <property name="swap-directory"
value="${gatein.tmp.dir}/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="${gatein.tmp.dir}/jcr/values/system"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer
class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype"
value="nt:unstructured"/>
+ <property name="root-permissions"
value="*:/platform/administrators read;*:/platform/administrators
add_node;*:/platform/administrators set_property;*:/platform/administrators
remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir"
value="${gatein.tmp.dir}/jcr/jcrlucenedb/system"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister
class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path"
value="${gatein.tmp.dir}/jcr/lock/system"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ <!-- Portal system data -->
+ <workspace name="portal-test">
+ <container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcexo"/>
+ <property name="dialect" value="hsqldb"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size"
value="204800"/>
+ <property name="swap-directory"
value="${gatein.tmp.dir}/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="${gatein.tmp.dir}/jcr/values/portal-test"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer
class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype"
value="nt:unstructured"/>
+ <property name="root-permissions" value="any
read;*:/platform/administrators read;*:/platform/administrators
add_node;*:/platform/administrators set_property;*:/platform/administrators
remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="20000"/>
+ <property name="live-time" value="30000"/>
+ </properties>
+ </cache>
+ <query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir"
value="${gatein.tmp.dir}/jcr/jcrlucenedb/portal-test"/>
+ </properties>
+ </query-handler>
+ <lock-manager>
+ <time-out>15m</time-out><!-- 15min -->
+ <persister
class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
+ <properties>
+ <property name="path"
value="${gatein.tmp.dir}/jcr/lock/portal-test"/>
+ </properties>
+ </persister>
+ </lock-manager>
+ </workspace>
+
+ </workspaces>
+ </repository>
+ </repositories>
+</repository-service>
Modified:
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java
===================================================================
---
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -32,7 +32,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
-@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/jcr/jcr-configuration.xml")})
+@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.jcr-configuration.xml")})
public class BootstrapTestCase extends AbstractGateInTest
{
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
(from rev 1154,
portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml)
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+
+
+ <component>
+
<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
+
<type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>config</name>
+ <value>jar:/conf/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"/>
+ <!--CHANGEME HashtableCacheProvider shold not be used in production
env-->
+ <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:${basedir}/target/temp/organization"/>
+ <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.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"/>
+ <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/mappings/HibernateRealm.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value>
+ <value>conf/mappings/HibernateIdentityObject.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectCredential.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectAttribute.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectType.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectRelationship.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
+
<value>conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+</configuration>
\ No newline at end of file
Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings (from
rev 1154,
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings)
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,95 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObject.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,55 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectAttribute.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,22 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,62 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectCredential.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,22 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,23 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectCredentialType.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,63 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectRelationship.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,48 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectRelationshipName.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,23 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectRelationshipType.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,23 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml
(from rev 1162,
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/mappings/HibernateIdentityObjectType.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml
===================================================================
---
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml 2010-01-01
18:01:10 UTC (rev 1154)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,36 +0,0 @@
-<?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>
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml
(from rev 1162,
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/mappings/HibernateRealm.hbm.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -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>
Deleted:
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 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
-<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"/>
- <!--CHANGEME HashtableCacheProvider shold not be used in production
env-->
- <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:${basedir}/target/temp/organization"/>
- <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.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"/>
- <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
Deleted:
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 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<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
Copied:
portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml
(from rev 1154,
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/picketlink-idm-config.xml
(rev 0)
+++
portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+
+<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
Modified:
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 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -33,7 +33,7 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.impl.UserImpl;
-@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/organization/organization-configuration.xml")})
+@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.organization-configuration.xml")})
public class BootstrapTestCase extends AbstractGateInTest
{
Modified:
portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java
===================================================================
---
portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-01-05
13:57:00 UTC (rev 1162)
+++
portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-01-05
15:01:32 UTC (rev 1163)
@@ -44,8 +44,8 @@
* @version $Revision$
*/
@ConfiguredBy({
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/jcr/jcr-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/wsrp-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.test.jcr-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path =
"conf/exo.portal.component.wsrp-configuration.xml")
})
public class ConsumerRegistryTestCase extends AbstractGateInTest
{
Copied:
portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml
(from rev 1159,
portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml)
===================================================================
---
portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml
(rev 0)
+++
portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+ <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+ </component>
+ <external-component-plugins>
+
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="wsrp"
value="http://www.gatein.org/jcr/wsrp/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/consumers-configuration-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.commons.chromattic.ChromatticLifeCycle</type>
+ <init-params>
+ <value-param>
+ <name>domain-name</name>
+ <value>wsrp</value>
+ </value-param>
+ <value-param>
+ <name>workspace-name</name>
+ <value>portal-test</value>
+ </value-param>
+ <values-param>
+ <name>entities</name>
+
<value>org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value>
+
<value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping</value>
+
<value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping</value>
+
<value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationInfoMapping</value>
+
<value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value>
+
<value>org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
Deleted: portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml
===================================================================
--- portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml 2010-01-05
13:57:00 UTC (rev 1162)
+++ portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml 2010-01-05
15:01:32 UTC (rev 1163)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
-
-<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.commons.chromattic.ChromatticManager</key>
- <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
- </component>
- <external-component-plugins>
-
<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
- <component-plugin>
- <name>add.namespaces</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- <init-params>
- <properties-param>
- <name>namespaces</name>
- <property name="wsrp"
value="http://www.gatein.org/jcr/wsrp/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/consumers-configuration-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.commons.chromattic.ChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>wsrp</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
-
<value>org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value>
-
<value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping</value>
-
<value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping</value>
-
<value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationInfoMapping</value>
-
<value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value>
-
<value>org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-</configuration>