[portal-commits] JBoss Portal SVN: r5841 - in trunk/identity/src/resources: hibernate portal-identity-test-jar/org/jboss/portal/test/identity test/config

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Wed Dec 13 10:49:23 EST 2006


Author: bdaw
Date: 2006-12-13 10:49:11 -0500 (Wed, 13 Dec 2006)
New Revision: 5841

Added:
   trunk/identity/src/resources/hibernate/domain-identity.hbm.xml
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml
   trunk/identity/src/resources/test/config/db-config.xml
   trunk/identity/src/resources/test/config/opends-config.xml
   trunk/identity/src/resources/test/config/profile-config.xml
   trunk/identity/src/resources/test/config/rhds-config.xml
Removed:
   trunk/identity/src/resources/test/config/minimal-db-identity-config.xml
   trunk/identity/src/resources/test/config/minimal-ldap-identity-config.xml
   trunk/identity/src/resources/test/config/standardidentity-config.xml
Modified:
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml
Log:
move test resources and configuration files

Added: trunk/identity/src/resources/hibernate/domain-identity.hbm.xml
===================================================================
--- trunk/identity/src/resources/hibernate/domain-identity.hbm.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/hibernate/domain-identity.hbm.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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.jboss.portal.identity2.db.HibernateUserImpl"
+      table="jbp_users">
+      <!--<cache usage="@portal.hibernate.cache.usage@"/>-->
+       <id
+          name="key"
+          column="jbp_uid"
+          type="java.lang.Long">
+          <generator class="native">
+             <param name="sequence">user_seq</param>
+          </generator>
+       </id>
+      <property
+         name="userName"
+         column="jbp_uname"
+         type="java.lang.String"
+         update="false"
+         insert="true"
+         unique="true"/>
+       <map
+          name="dynamic"
+          table="jbp_user_prop"
+          lazy="false"
+          sort="unsorted"
+          cascade="all">
+          <!--<cache usage="@portal.hibernate.cache.usage@"/>-->
+          <key column="jbp_uid"/>
+          <index
+             column="jbp_name"
+             type="java.lang.String"/>
+          <element
+             column="jbp_value"
+             type="java.lang.String"
+             not-null="false"
+             unique="false"/>
+       </map>
+      <property
+         name="givenName"
+         column="jbp_givenname"
+         type="java.lang.String"
+         update="true"
+         insert="true"
+         unique="false"/>
+       <property
+          name="familyName"
+          column="jbp_familyname"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <property
+          name="password"
+          column="jbp_password"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <property
+          name="realEmail"
+          column="jbp_realemail"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <property
+          name="fakeEmail"
+          column="jbp_fakeemail"
+          type="java.lang.String"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <property
+          name="registrationDate"
+          column="jbp_regdate"
+          type="java.util.Date"
+          update="false"
+          insert="true"
+          unique="false"/>
+       <property
+          name="viewRealEmail"
+          column="jbp_viewrealemail"
+          type="boolean"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <property
+          name="enabled"
+          column="jbp_enabled"
+          type="boolean"
+          update="true"
+          insert="true"
+          unique="false"/>
+       <set
+          name="roles"
+          table="jbp_role_membership"
+          lazy="false"
+          inverse="false"
+          cascade="none"
+          sort="unsorted">
+          <!--<cache usage="@portal.hibernate.cache.usage@"/>-->
+          <key column="jbp_uid"/>
+          <many-to-many
+             class="org.jboss.portal.identity2.db.HibernateRoleImpl"
+             column="jbp_rid"
+             outer-join="true"/>
+       </set>
+   </class>
+   <class
+      name="org.jboss.portal.identity2.db.HibernateRoleImpl"
+      table="jbp_roles">
+      <!--<cache usage="@portal.hibernate.cache.usage@"/>-->
+      <id
+         name="key"
+         column="jbp_rid"
+         type="java.lang.Long">
+         <generator class="native">
+            <param name="sequence">user_seq</param>
+         </generator>
+      </id>
+      <property
+         name="name"
+         column="jbp_name"
+         type="java.lang.String"
+         update="false"
+         insert="true"
+         unique="true"/>
+      <property
+         name="displayName"
+         column="jbp_displayname"
+         type="java.lang.String"
+         update="true"
+         insert="true"
+         unique="true"/>
+      <set
+         name="users"
+         table="jbp_role_membership"
+         lazy="true"
+         inverse="true"
+         cascade="none"
+         sort="unsorted">
+         <!--<cache usage="@portal.hibernate.cache.usage@"/>-->
+         <key column="jbp_rid"/>
+         <many-to-many
+            class="org.jboss.portal.identity2.db.HibernateUserImpl"
+            column="jbp_uid"
+            outer-join="false"/>
+      </set>
+   </class>
+</hibernate-mapping>
\ No newline at end of file

Modified: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -58,21 +58,26 @@
    </bean>
 
    <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>HibernateSupport</parameter>
+      </constructor>
       <property name="config"><inject bean="HibernateConfig"/></property>
-      <property name="jNDIName">java:/SessionFactory</property>
+      <property name="jNDIName">java:/portal/IdentitySessionFactory</property>
       <property name="mappings">
          <list elementClass="java.lang.String">
-            <value>domain-single.hbm.xml</value>
+            <value>domain-identity.hbm.xml</value>
+            <!--<value>domain-single.hbm.xml</value>-->
          </list>
       </property>
    </bean>
 
-   <bean name="DBTestBean" class="org.jboss.portal.test.identity.db.DBUserTestCase">
+   <bean name="DBTestBean" class="org.jboss.portal.test.identity.db_old.DBUserTestCase">
       <constructor factoryMethod="getBean">
          <factory bean="BeanFactory"/>
          <parameter>DBTestBean</parameter>
       </constructor>
-      <property name="hibernate"><inject bean="HibernateSupport"/></property>
+      <!--<property name="hibernate" class="org.jboss.portal.test.framework.embedded.HibernateSupport"><inject bean="HibernateSupport"/></property>-->
    </bean>
 
 </deployment>

Added: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>DataSourceConfig</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>HibernateConfig</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+   </bean>
+
+   <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport">
+   </bean>
+
+   <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+   </bean>
+
+   <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+      <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property>
+      <property name="config"><inject bean="DataSourceConfig"/></property>
+   </bean>
+
+   <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+      <property name="config"><inject bean="HibernateConfig"/></property>
+      <property name="jNDIName">java:/SessionFactory</property>
+      <property name="mappings">
+         <list elementClass="java.lang.String">
+            <value>domain-single.hbm.xml</value>
+         </list>
+      </property>
+   </bean>
+
+   <bean name="DBTestBean" class="org.jboss.portal.test.identity.db_old.DBUserTestCase">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>DBTestBean</parameter>
+      </constructor>
+      <property name="hibernate"><inject bean="HibernateSupport"/></property>
+   </bean>
+
+</deployment>

Modified: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -27,18 +27,54 @@
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
 
-   <!--<bean name="ApacheDSService" class="org.jboss.portal.test.framework.embedded.apacheds.ApacheDSService">
-      <constructor factoryMethod="getBean">
+   <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+   </bean>
+
+   <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+      <!--<constructor factoryMethod="getBean">
          <factory bean="BeanFactory"/>
-         <parameter>ApacheDSServiceBean</parameter>
-      </constructor>
-      <property name="removeWorkingDir">true</property>
-   </bean>-->
+         <parameter>DataSourceConfig</parameter>
+      </constructor>-->
+      <property name="name">dummy</property>
+      <property name="connectionURL">jdbc:mysql://localhost:3306/portal_test</property>
+      <property name="driverClass">org.gjt.mm.mysql.Driver</property>
+      <property name="userName">root</property>
+      <!--<property name="password"></property>-->
+   </bean>
 
+   <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport">
+   </bean>
 
-   <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+   <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
    </bean>
 
+   <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+      <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property>
+      <property name="config"><inject bean="DataSourceConfig"/></property>
+   </bean>
+
+   <!--<bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+      <property name="jNDIName">java:/TestSessionFactory</property>
+      <property name="mappings">
+         <list elementClass="java.lang.String">
+            <value>domain-single.hbm.xml</value>
+         </list>
+      </property>
+   </bean>-->
+
+   <!--<bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+      <property name="config"><inject bean="HibernateConfig"/></property>
+      <property name="jNDIName">java:/SessionFactory</property>
+      <property name="mappings">
+         <list elementClass="java.lang.String">
+            <value>domain-single.hbm.xml</value>
+         </list>
+      </property>
+   </bean>-->
+
+
    <bean name="LDAPTestBean" class="org.jboss.portal.test.identity.ldap.LDAPUserTestCase">
       <constructor factoryMethod="getBean">
          <factory bean="BeanFactory"/>

Added: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+            xmlns="urn:jboss:bean-deployer">
+
+   <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+   </bean>
+
+   <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+      <!--<constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>DataSourceConfig</parameter>
+      </constructor>-->
+      <property name="name">dummy</property>
+      <property name="connectionURL">jdbc:mysql://localhost:3306/portal_test</property>
+      <property name="driverClass">org.gjt.mm.mysql.Driver</property>
+      <property name="userName">root</property>
+      <!--<property name="password"></property>-->
+   </bean>
+
+   <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>HibernateConfig</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport">
+   </bean>
+
+   <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+   </bean>
+
+   <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport">
+      <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+      <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property>
+      <property name="config"><inject bean="DataSourceConfig"/></property>
+   </bean>
+
+   <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+      <property name="config"><inject bean="HibernateConfig"/></property>
+      <property name="jNDIName">java:/TestSessionFactory</property>
+      <property name="mappings">
+         <list elementClass="java.lang.String">
+            <value>domain-proto.hbm.xml</value>
+         </list>
+      </property>
+   </bean>
+
+   <bean name="LDAPTestBean" class="org.jboss.portal.test.identity.UserProtoTestCase">
+      <constructor factoryMethod="getBean">
+         <factory bean="BeanFactory"/>
+         <parameter>LDAPTestBean</parameter>
+      </constructor>
+      <property name="hibernate"><inject bean="HibernateSupport"/></property>
+   </bean>
+
+</deployment>

Added: trunk/identity/src/resources/test/config/db-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/db-config.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/test/config/db-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<identity-configuration>
+   <datasources>
+      <!--in tests Hibernate SF is created separately-->
+      <!--<datasource>
+         <name>DB</name>
+         <config/>
+      </datasource>-->
+   </datasources>                                        
+   <modules>
+      <module>
+         <!--type used to correctly map in IdentityContext registry-->
+         <type>User</type>
+         <implementation>DB</implementation>
+         <config/>
+      </module>
+
+      <module>
+         <!--type used to correctly map in IdentityContext registry-->
+         <type>Role</type>
+         <implementation>DB</implementation>
+         <config/>
+      </module>
+      <module>
+         <!--type used to correctly map in IdentityContext registry-->
+         <type>Membership</type>
+         <implementation>DB</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>UserProfile</type>
+         <implementation>DB</implementation>
+         <config>
+            <option>
+               <name>profileConfigFile</name>
+               <value>test/config/profile-config.xml</value>
+            </option>
+         </config>
+      </module>
+
+   </modules>
+</identity-configuration>
\ No newline at end of file

Deleted: trunk/identity/src/resources/test/config/minimal-db-identity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/minimal-db-identity-config.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/test/config/minimal-db-identity-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<identity-configuration>
-   <modules>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserModule</type>
-         <implementation>DB</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>RoleModule</type>
-         <implementation>DB</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>MembershipModule</type>
-         <implementation>DB</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserProfileModule</type>
-         <implementation>DB</implementation>
-      </module>
-   </modules>
-</identity-configuration>
\ No newline at end of file

Deleted: trunk/identity/src/resources/test/config/minimal-ldap-identity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/minimal-ldap-identity-config.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/test/config/minimal-ldap-identity-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<identity-configuration>
-   <modules>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserModule</type>
-         <implementation>LDAP</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>RoleModule</type>
-         <implementation>LDAP</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>MembershipModule</type>
-         <implementation>LDAP</implementation>
-      </module>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserProfileModule</type>
-         <implementation>LDAP</implementation>
-      </module>
-
-      <!--For ldap configuration this is needed additionally to use ldap connection...-->
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>ConnectionContext</type>
-         <implementation>LDAP</implementation>
-         <config>
-            <option>
-               <name>host</name>
-               <value>localhost</value>
-            </option>
-            <option>
-               <name>port</name>
-               <value>10389</value>
-            </option>
-            <option>
-               <name>admin-dn</name>
-               <value>cn=Directory Manager</value>
-            </option>
-            <option>
-               <name>admin-password</name>
-               <value>password</value>
-            </option>
-         </config>
-      </module>
-   </modules>
-
-   <options>
-      <option-group>
-         <group-name>common</group-name>
-         <option>
-            <name>userContainerDN</name>
-            <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
-         </option>
-         <option>
-            <name>roleContainerDN</name>
-            <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
-         </option>
-      </option-group>
-   </options>
-</identity-configuration>
\ No newline at end of file

Copied: trunk/identity/src/resources/test/config/opends-config.xml (from rev 5770, trunk/test/src/etc/identityconfig/opends-config.xml)
===================================================================
--- trunk/test/src/etc/identityconfig/opends-config.xml	2006-12-06 09:43:49 UTC (rev 5770)
+++ trunk/identity/src/resources/test/config/opends-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<identity-configuration>
+   <datasources>
+      <datasource>
+         <name>LDAP</name>
+         <config>
+            <option>
+               <name>host</name>
+               <value>localhost</value>
+            </option>
+            <option>
+               <name>port</name>
+               <value>10389</value>
+            </option>
+            <option>
+               <name>adminDN</name>
+               <value>cn=Directory Manager</value>
+            </option>
+            <option>
+               <name>adminPassword</name>
+               <value>password</value>
+            </option>
+         </config>
+      </datasource>
+   </datasources>
+   <modules>
+      <module>
+         <!--type used to correctly map in IdentityContext registry-->
+         <type>User</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>Role</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>Membership</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>UserProfile</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+   </modules>
+
+   <options>
+      <option-group>
+         <group-name>common</group-name>
+         <option>
+            <name>userContainerDN</name>
+            <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+         </option>
+         <option>
+            <name>roleContainerDN</name>
+            <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+         </option>
+      </option-group>
+   </options>
+</identity-configuration>
\ No newline at end of file

Added: trunk/identity/src/resources/test/config/profile-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/profile-config.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/test/config/profile-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<profile>
+   <!--Database mapping - jbp_user table column mapping-->
+   <property>
+      <name>portal.user.name.given</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Name</display-name>
+      <description xml:lang="en">The user name</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_username</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.name.family</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Family name</display-name>
+      <description xml:lang="en">The user family name</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_familyname</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.email.real</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Email</display-name>
+      <description xml:lang="en">The user real email</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_realemail</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.email.fake</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Fake email</display-name>
+      <description xml:lang="en">The user fake email</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_fakeemail</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.registration-date</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Registration date</display-name>
+      <description xml:lang="en">Registration date of user</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_regdate</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.email.view-real</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">View real email</display-name>
+      <description xml:lang="en">Is user real email displayed in public</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_viewrealemail</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.enabled</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>mandatory</usage>
+      <display-name xml:lang="en">Enabled</display-name>
+      <description xml:lang="en">User enabled state</description>
+      <mapping>
+         <database>
+            <type>column</type>
+            <value>jbp_enabled</value>
+         </database>
+      </mapping>
+   </property>
+
+   <!--Dynamic database store-->
+   <property>
+      <name>portal.user.location</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Location</display-name>
+      <description xml:lang="en">The user location</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.location</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.occupation</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Occupation</display-name>
+      <description xml:lang="en">The user occupation</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.occupation</value>
+         </database>
+         <ldap>
+            <value>title</value>
+         </ldap>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.extra</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Extra info</display-name>
+      <description xml:lang="en">Extra informtion about user</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.extra</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.signature</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Signature</display-name>
+      <description xml:lang="en">The user signature</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.signature</value>
+         </database>
+         <ldap>
+            <value>personalSignature</value>
+         </ldap>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.interests</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Interests</display-name>
+      <description xml:lang="en">The user interests</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.interests</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.locale</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Locale</display-name>
+      <description xml:lang="en">The user locale</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.locale</value>
+         </database>
+         <ldap>
+            <value>localityName</value>
+         </ldap>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.im.icq</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">ICQ</display-name>
+      <description xml:lang="en">The user ICQ id</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.im.icq</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.im.aim</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">AIM</display-name>
+      <description xml:lang="en">The user AIM id</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.im.aim</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.im.msnm</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">MSN</display-name>
+      <description xml:lang="en">The user MSN id</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.im.msnm</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.im.yim</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">YIM</display-name>
+      <description xml:lang="en">The user YIM id</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.im.yim</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.im.skype</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Skype</display-name>
+      <description xml:lang="en">The user skype id</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.im.skype</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.homepage</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Homepage</display-name>
+      <description xml:lang="en">The user homepage</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.homepage</value>
+         </database>
+         <ldap>
+            <value>seeAlso</value>
+         </ldap>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.time-zone-offset</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Timezone</display-name>
+      <description xml:lang="en">Timezone in users location</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.time-zone-offset</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.theme</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Theme</display-name>
+      <description xml:lang="en">Portlat theme that user is using</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.theme</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.security.question</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Password Question</display-name>
+      <description xml:lang="en">Portal password recovery question</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.security.question</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.security.answer</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Password Answer</display-name>
+      <description xml:lang="en">Portal password recovery answer</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.security.answer</value>
+         </database>
+      </mapping>
+   </property>
+   <property>
+      <name>portal.user.last-login-date</name>
+      <type>java.lang.String</type>
+      <access-mode>read-write</access-mode>
+      <usage>optional</usage>
+      <display-name xml:lang="en">Last login</display-name>
+      <description xml:lang="en">The date of users last login</description>
+      <mapping>
+         <database>
+            <type>dynamic</type>
+            <value>portal.user.last-login-date</value>
+         </database>
+      </mapping>
+   </property>
+</profile>
\ No newline at end of file

Copied: trunk/identity/src/resources/test/config/rhds-config.xml (from rev 5770, trunk/test/src/etc/identityconfig/rhds-config.xml)
===================================================================
--- trunk/test/src/etc/identityconfig/rhds-config.xml	2006-12-06 09:43:49 UTC (rev 5770)
+++ trunk/identity/src/resources/test/config/rhds-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<identity-configuration>
+   <datasources>
+      <datasource>
+         <name>LDAP</name>
+         <config>
+            <option>
+               <name>host</name>
+               <value>dev39.qa.atl.jboss.com</value>
+            </option>
+            <option>
+               <name>port</name>
+               <value>10389</value>
+            </option>
+            <option>
+               <name>adminDN</name>
+               <value>cn=Directory Manager</value>
+            </option>
+            <option>
+               <name>adminPassword</name>
+               <value>qpq123qpq</value>
+            </option>
+         </config>
+      </datasource>
+   </datasources>
+   <modules>
+      <module>
+         <!--type used to correctly map in IdentityContext registry-->
+         <type>User</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>Role</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>Membership</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+      <module>
+         <type>UserProfile</type>
+         <implementation>LDAP</implementation>
+         <config/>
+      </module>
+
+      <!--For ldap configuration this is needed additionally to use ldap connection...-->
+      <module>
+         <type>ConnectionContext</type>
+         <implementation>LDAP</implementation>
+      </module>
+   </modules>
+   <options>
+      <option-group>
+         <group-name>common</group-name>
+         <option>
+            <name>userContainerDN</name>
+            <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+         </option>
+         <option>
+            <name>roleContainerDN</name>
+            <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+         </option>
+      </option-group>
+   </options>
+</identity-configuration>
\ No newline at end of file

Deleted: trunk/identity/src/resources/test/config/standardidentity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/standardidentity-config.xml	2006-12-13 15:40:19 UTC (rev 5840)
+++ trunk/identity/src/resources/test/config/standardidentity-config.xml	2006-12-13 15:49:11 UTC (rev 5841)
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<identity-configuration>
-   <datasources>
-      <datasouce>
-         <!--schema that maps hibernate objects-->
-         <name>Identity</name>
-
-         <class>blah.IdentitySessionFactoryBinder</class>
-         <service-name>portal:service=Hibernate,type=Identity</service-name>
-
-         <config>
-            <option>
-               <name>DoChecking</name>
-               <value>true</value>
-            </option>
-            <option>
-               <name>ProfileConfigLocation</name>
-               <value>conf/hibernate/user/profile-config.xml</value>
-            </option>
-            <option>
-               <name>ConfigLocation</name>
-               <value>conf/hibernate/user/hibernate.cfg.xml</value>
-            </option>
-            <option>
-               <name>SetupLocation</name>
-               <value>conf/hibernate/user/setup.txt</value>
-            </option>
-            <option>
-               <name>JNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>
-         </config>
-      </datasouce>
-      <datasouce>
-         <!--schema that provides dynamic database property store for ldap impl-->
-         <name>Dynamic</name>
-
-         <class>org.jboss.portal.jems.hibernate.SessionFactoryBinder</class>
-         <service-name>portal:service=Hibernate,type=UserDynProfile</service-name>
-
-         <config>
-            <option>
-               <name>DoChecking</name>
-               <value>true</value>
-            </option>
-            <option>
-               <name>ProfileConfigLocation</name>
-               <value>conf/hibernate/user/profile-config.xml</value>
-            </option>
-            <option>
-               <name>ConfigLocation</name>
-               <value>conf/hibernate/user/hibernate.cfg.xml</value>
-            </option>
-            <option>
-               <name>SetupLocation</name>
-               <value>conf/hibernate/user/setup.txt</value>
-            </option>
-            <option>
-               <name>JNDIName</name>
-               <value>java:/portal/DynamicProfileSessionFactory</value>
-            </option>
-         </config>
-      </datasouce>
-   </datasources>
-   <modules>
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserModule</type>
-         <implementation>DB</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=User</service-name>
-         <class>org.jboss.portal.identity.db.DBUserModuleImp</class>
-         <jndi-name>java:/portal/UserModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <option>
-               <name>SessionFactoryJNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>
-         </config>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>RoleModule</type>
-         <implementation>DB</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=Role</service-name>
-         <class>org.jboss.portal.identity.db.DBRoleModuleImp</class>
-         <jndi-name>java:/portal/RoleModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <option>
-               <name>SessionFactoryJNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>
-         </config>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>MembershipModule</type>
-         <implementation>DB</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=Membership</service-name>
-         <class>org.jboss.portal.identity.db.DBMembershipModuleImp</class>
-         <jndi-name>java:/portal/MembershipModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <option>
-               <name>SessionFactoryJNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>
-         </config>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserProfileModule</type>
-         <implementation>DB</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=UserProfile</service-name>
-         <class>org.jboss.portal.identity.db.DBUserProfileModuleImp</class>
-         <jndi-name>java:/portal/UserProfileModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <option>
-               <name>SessionFactoryJNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>
-         </config>
-      </module>
-
-      <!--for ldap modules...-->
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserModule</type>
-         <implementation>LDAP</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=User</service-name>
-         <class>org.jboss.portal.identity2.ldap.LDAPUserModuleImpl</class>
-         <jndi-name>java:/portal/UserModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config/>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>RoleModule</type>
-         <implementation>LDAP</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=Role</service-name>
-         <class>org.jboss.portal.identity2.ldap.LDAPRoleModuleImpl</class>
-         <jndi-name>java:/portal/RoleModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config/>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>MembershipModule</type>
-         <implementation>LDAP</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=Membership</service-name>
-         <class>org.jboss.portal.identity2.ldap.LDAPStaticGroupMembershipModuleImpl</class>
-         <jndi-name>java:/portal/MembershipModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config/>
-      </module>
-
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>UserProfileModule</type>
-         <implementation>LDAP</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=UserProfile</service-name>
-         <class>org.jboss.portal.identity2.ldap.LDAPUserProfileModuleImpl</class>
-         <jndi-name>java:/portal/UserProfileModule</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <!--<option>
-               <name>LDAPConnectionJNDIName</name>
-               <value>java:/portal/UserSessionFactory</value>
-            </option>-->
-            <!--Hibernate mappings for db level store (dynamic properties not mapped as ldap attributes)-->
-            <option>
-               <name>SessionFactoryJNDIName</name>
-               <value>java:/portal/PropertyStoreSessionFactory</value>
-            </option>
-            <option>
-               <name>profileMappings</name>
-               <value>ldap-profile.xml</value>
-            </option>
-         </config>
-      </module>
-
-      <!--For ldap configuration this is needed additionally to use ldap connection...-->
-      <module>
-         <!--type used to correctly map in IdentityContext registry-->
-         <type>ConnectionContext</type>
-         <implementation>LDAP</implementation>
-
-         <!--name of service and class for creating mbean-->
-         <service-name>portal:service=Module,type=LDAPConnectionContext</service-name>
-         <class>org.jboss.portal.identity2.ldap.LDAPConnectionContext</class>
-         <jndi-name>java:/portal/LDAPConnectionContext</jndi-name>
-
-         <!--set of options that are passed to a class constructor-->
-         <config>
-            <option>
-               <name>host</name>
-               <value>jboss.com</value>
-            </option>
-            <option>
-               <name>port</name>
-               <value>389</value>
-            </option>
-            <option>
-               <name>context-factory</name>
-               <value>com.sun.jndi.ldap.LdapCtxFactory</value>
-            </option>
-            <option>
-               <name>admin-dn</name>
-               <value>cn=Directory Manager</value>
-            </option>
-            <option>
-               <name>admin-password</name>
-               <value>password</value>
-            </option>
-            <option>
-               <name>authentication</name>
-               <value>simple</value>
-            </option>
-         </config>
-      </module>
-   </modules>
-
-   <options>
-      <!--Common options section-->
-      <!--
-         <option-group>
-            <group-name>connection</group-name>
-            <option>
-               <name>host</name>
-               <value>localhost</value>
-            </option>
-            <option>
-               <name>port</name>
-               <value>10389</value>
-            </option>
-            <option>
-               <name>context-factory</name>
-               <value>com.sun.jndi.ldap.LdapCtxFactory</value>
-            </option>
-            <option>
-               <name>admin-dn</name>
-               <value>cn=Directory Manager</value>
-            </option>
-            <option>
-               <name>admin-password</name>
-               <value>password</value>
-            </option>
-   </option-group>      -->
-      <option-group>
-         <group-name>common</group-name>
-         <option>
-            <name>userContainerDN</name>
-            <value>ou=People,dc=example,dc=com</value>
-         </option>
-         <option>
-            <name>uidAttributeId</name>
-            <value>uid</value>
-         </option>
-         <option>
-            <name>passwordAttributeID</name>
-            <value>userPassword</value>
-         </option>
-         <option>
-            <name>hashAlgorithm</name>
-            <value>MD5</value>
-         </option>
-         <option>
-            <name>hashEncoding</name>
-            <value>hex</value>
-         </option>
-         <option>
-            <name>roleContainerDN</name>
-            <value>ou=Roles,dc=example,dc=com</value>
-         </option>
-         <option>
-            <name>ridAttributeId</name>
-            <value>cn</value>
-         </option>
-         <option>
-            <name>roleDisplayNameAttributeID</name>
-            <value>cn</value>
-         </option>
-         <option>
-            <name>membershipAttributeID</name>
-            <value>member</value>
-         </option>
-         <option>
-            <name>membershipAttributeIsDN</name>
-            <value>true</value>
-         </option>
-      </option-group>
-      <option-group>
-         <group-name>userCreateAttibutes</group-name>
-         <option>
-            <name>objectClass</name>
-            <value>top</value>
-            <value>uidObject</value>
-            <value>person</value>
-            <value>inetUser</value>
-         </option>
-         <!--Schema requires those to have initial value-->
-         <option>
-            <name>cn</name>
-            <value>none</value>
-         </option>
-         <option>
-            <name>sn</name>
-            <value>none</value>
-         </option>
-      </option-group>
-      <option-group>
-         <group-name>roleCreateAttibutes</group-name>
-         <option>
-            <name>objectClass</name>
-            <value>top</value>
-            <value>groupOfNames</value>
-         </option>
-         <!--Schema requires those to have initial value-->
-         <option>
-            <name>cn</name>
-            <value>none</value>
-         </option>
-         <!--Some directory servers require this attribute to be valid DN-->
-         <!--For safety reasons point to the admin user here-->
-         <option>
-            <name>member</name>
-            <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
-         </option>
-      </option-group>
-   </options>
-</identity-configuration>
\ No newline at end of file




More information about the portal-commits mailing list