[portal-commits] JBoss Portal SVN: r5853 - in trunk: identity identity/src/main/org/jboss/portal/identity2 identity/src/main/org/jboss/portal/identity2/db identity/src/main/org/jboss/portal/identity2/ldap identity/src/main/org/jboss/portal/identity2/service identity/src/main/org/jboss/portal/test/identity/db identity/src/main/org/jboss/portal/test/identity/ldap identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity identity/src/resources/test/config test/src/etc test/src/etc/ldap/ldif test/src/main/org/jboss/portal/test/framework/embedded
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Wed Dec 13 19:37:59 EST 2006
Author: bdaw
Date: 2006-12-13 19:37:26 -0500 (Wed, 13 Dec 2006)
New Revision: 5853
Added:
trunk/identity/src/main/org/jboss/portal/identity2/DelegatingUserProfileModuleImpl.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java
Modified:
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java
trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity2/service/IdentityModuleService.java
trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java
trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-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
trunk/identity/src/resources/test/config/standardidentity-config.xml
trunk/test/src/etc/directories.xml
trunk/test/src/etc/ldap/ldif/initial-tests.ldif
trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
Log:
- DelegatingUserProfileModule connected with DB and LDAP and initial test case
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/build.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -334,7 +334,7 @@
<x-test>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.db_old.DBUserTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-identity-lib.jar"/>
@@ -446,15 +446,14 @@
<x-test>
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db_old.DBUserTestCase"/>-->
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>-->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.UserProtoTestCase"/>-->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ConfigurationTestCase"/>-->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/>-->
- <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>-->
-
-
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>-->
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>-->
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>-->
+ <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-identity-lib.jar"/>
Added: trunk/identity/src/main/org/jboss/portal/identity2/DelegatingUserProfileModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/DelegatingUserProfileModuleImpl.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/identity2/DelegatingUserProfileModuleImpl.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -0,0 +1,202 @@
+/*
+* 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.
+*/
+package org.jboss.portal.identity2;
+
+import org.jboss.portal.identity2.service.UserProfileModuleService;
+import org.jboss.portal.identity2.info.PropertyInfo;
+import org.jboss.portal.identity2.ldap.LDAPUserImpl;
+import org.jboss.portal.identity2.db.HibernateUserImpl;
+import org.jboss.portal.identity.IdentityException;
+
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 1.1 $
+ */
+public class DelegatingUserProfileModuleImpl extends UserProfileModuleService
+{
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DelegatingUserProfileModuleImpl.class);
+
+ private String ldapModuleJNDIName;
+
+ private String dbModuleJNDIName;
+
+ private UserProfileModule LDAPModule;
+
+ private UserProfileModule dbModule;
+
+ protected void startService() throws Exception
+ {
+ super.startService();
+
+ if(getProfileInfo() == null)
+ {
+ throw new IdentityException("No profile information found. Check the configuration.");
+ }
+
+ }
+
+ public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException
+ {
+ if (log.isDebugEnabled()) log.debug("getProperty: " + propertyName);
+ try
+ {
+ PropertyInfo property = getProfileInfo().getPropertyInfo(propertyName);
+ if (property == null)
+ {
+ throw new IdentityException("Such property name is not supported");
+ }
+ else if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl)
+ {
+ log.debug("Delegating to LDAP module");
+ return getLDAPModule().getProperty(user, propertyName);
+ }
+ else if (property.isMappedDB())
+ {
+ log.debug("Delegating to DB module");
+ return getDBModule().getProperty(user, propertyName);
+ }
+ throw new IdentityException("Cannot process property - incorrect profile or module configuration");
+ }
+ catch (Exception e)
+ {
+ throw new IdentityException("Cannot resolve property: ", e);
+ }
+ }
+
+ public void setProperty(User user, String name, Object propertyValue) throws IdentityException, IllegalArgumentException
+ {
+ if (log.isDebugEnabled()) log.debug("setProperty: " + name + "/" + propertyValue);
+ try
+ {
+ PropertyInfo property = getProfileInfo().getPropertyInfo(name);
+ if (property == null)
+ {
+ throw new IdentityException("Such property name is not supported");
+ }
+ else if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl)
+ {
+ log.debug("Delegating to LDAP module");
+ getLDAPModule().setProperty(user, name, propertyValue);
+ return;
+ }
+ else if (property.isMappedDB())
+ {
+ log.debug("Delegating to DB module");
+ getDBModule().setProperty(user, name, propertyValue);
+ return;
+ }
+ throw new IdentityException("Cannot process property - incorrect profile or module configuration");
+ }
+ catch (Exception e)
+ {
+ throw new IdentityException("Cannot resolve property: ", e);
+ }
+ }
+
+ public Map getProperties(User user) throws IdentityException, IllegalArgumentException
+ {
+ if (log.isDebugEnabled()) log.debug("getProperties");//: " + name + "/" + propertyValue)
+ try
+ {
+ if (user instanceof LDAPUserImpl && isLDAPSupported())
+ {
+ log.debug("Delegating to LDAP module");
+ return getLDAPModule().getProperties(user);
+ }
+ else if (user instanceof HibernateUserImpl && isDBSupported())
+ {
+ log.debug("Delegating to DB module");
+ return getDBModule().getProperties(user);
+ }
+ throw new IdentityException("Cannot process properties - incorrect profile or module configuration");
+ }
+ catch (Exception e)
+ {
+ throw new IdentityException("Cannot resolve property: ", e);
+ }
+ }
+
+
+ public String getLdapModuleJNDIName()
+ {
+ return ldapModuleJNDIName;
+ }
+
+ public void setLdapModuleJNDIName(String ldapModuleJNDIName)
+ {
+ this.ldapModuleJNDIName = ldapModuleJNDIName;
+ }
+
+ public String getDbModuleJNDIName()
+ {
+ return dbModuleJNDIName;
+ }
+
+ public void setDbModuleJNDIName(String dbModuleJNDIName)
+ {
+ this.dbModuleJNDIName = dbModuleJNDIName;
+ }
+
+ public boolean isLDAPSupported()
+ {
+ return getLdapModuleJNDIName()!=null;
+ }
+
+ public boolean isDBSupported()
+ {
+ return getDbModuleJNDIName()!=null;
+ }
+
+ protected UserProfileModule getDBModule() throws Exception
+ {
+
+ //TODO: to tired to clean this at the moment
+ if (dbModule == null)
+ {
+ dbModule = (UserProfileModule)new InitialContext().lookup(getDbModuleJNDIName());
+ if (dbModule == null)
+ {
+ throw new IdentityException("Couldn't obtain DB UserProfileModule");
+ }
+ }
+ return dbModule;
+ }
+
+ protected UserProfileModule getLDAPModule() throws Exception
+ {
+ if (LDAPModule == null)
+ {
+ LDAPModule = (UserProfileModule)new InitialContext().lookup(getLdapModuleJNDIName());
+ if (LDAPModule == null)
+ {
+ throw new IdentityException("Couldn't obtain LDAP UserProfileModule");
+ }
+ }
+ return LDAPModule;
+ }
+
+}
Modified: trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -328,6 +328,11 @@
moduleBMD.addProperty(propertyBMD);
}
+ //make the type from name
+ propertyBMD = new AbstractPropertyMetaData("moduleType", module.getType());
+ moduleBMD.addProperty(propertyBMD);
+
+
// Installation
beans.add(moduleBMD);
KernelControllerContext controllerContext = kernel.getController().install(moduleBMD);
Modified: trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -213,7 +213,7 @@
hu = new HibernateUserImpl(user.getUserName());
user.updatePassword(user.getPassword());
session = getCurrentSession();
- session.save(user);
+ session.save(hu);
return hu;
}
catch (HibernateException e)
@@ -235,13 +235,10 @@
*/
public ProfileInfo getProfileInfo() throws IdentityException
{
- ProfileInfo profileInfo = super.getProfileInfo();
- if (profileInfo != null)
+
+
+ if (super.getProfileInfo() == null)
{
- return profileInfo;
- }
- else
- {
//obtain main UserProfileModule
UserProfileModule module = (UserProfileModule)getIdentityContext().getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
if (module == this)
@@ -251,9 +248,9 @@
else
{
setProfileInfo(module.getProfileInfo());
- return profileInfo;
}
}
+ return super.getProfileInfo();
}
Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -257,13 +257,10 @@
*/
public ProfileInfo getProfileInfo() throws IdentityException
{
- ProfileInfo profileInfo = super.getProfileInfo();
- if (profileInfo == null)
+
+
+ if (super.getProfileInfo() == null)
{
- return profileInfo;
- }
- else
- {
//obtain main UserProfileModule
UserProfileModule module = (UserProfileModule)getIdentityContext().getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
if (module == this)
@@ -273,9 +270,9 @@
else
{
setProfileInfo(module.getProfileInfo());
- return profileInfo;
}
}
+ return super.getProfileInfo();
}
}
Modified: trunk/identity/src/main/org/jboss/portal/identity2/service/IdentityModuleService.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/service/IdentityModuleService.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/identity2/service/IdentityModuleService.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -49,7 +49,7 @@
private Map initOptions;
- private String moduleType;
+ protected String moduleType;
//restrict instance creation
private IdentityModuleService()
@@ -164,6 +164,11 @@
}
+ public void setModuleType(String moduleType)
+ {
+ this.moduleType = moduleType;
+ }
+
public String getConnectionJNDIName()
{
return connectionJNDIName;
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -25,6 +25,10 @@
import org.jboss.portal.identity2.IdentityContext;
import org.jboss.portal.identity2.ProfileMap;
import org.jboss.portal.identity2.User;
+import org.jboss.portal.identity2.service.UserModuleService;
+import org.jboss.portal.identity2.service.UserProfileModuleService;
+import org.jboss.portal.identity2.service.MembershipModuleService;
+import org.jboss.portal.identity2.service.RoleModuleService;
import org.jboss.portal.identity2.db.HibernateUserImpl;
import org.jboss.portal.identity2.db.HibernateUserModuleImpl;
import org.jboss.portal.identity2.db.HibernateRoleModuleImpl;
@@ -78,10 +82,10 @@
controller.setRegisterMBeans(false);
controller.start();
identityContext = controller.getIdentityContext();
- this.userModule = (HibernateUserModuleImpl)identityContext.getObject(IdentityContext.TYPE_USER_MODULE);
- this.roleModule = (HibernateRoleModuleImpl)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE);
- this.membershipModule = (HibernateMembershipModuleImpl)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
- this.userProfileModule = (HibernateUserProfileModuleImpl)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
+ this.userModule = (UserModuleService)identityContext.getObject(IdentityContext.TYPE_USER_MODULE);
+ this.roleModule = (RoleModuleService)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE);
+ this.membershipModule = (MembershipModuleService)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ this.userProfileModule = (UserProfileModuleService)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
//
utc = new UserTest();
@@ -104,86 +108,86 @@
//
- public void testFindUsersUsingFilter() throws Exception
- {
- utc.testFindUsersUsingFilter();
- }
+// public void testFindUsersUsingFilter() throws Exception
+// {
+// utc.testFindUsersUsingFilter();
+// }
+//
+// public void testFindUser1() throws Exception
+// {
+// utc.testFindUser1();
+// }
+//
+// public void testFindUser2() throws Exception
+// {
+// utc.testFindUser2();
+// }
+//
+// public void testFindUsers() throws Exception
+// {
+// utc.testFindUsers();
+// }
+//
+// public void testCreateUser() throws Exception
+// {
+// utc.testCreateUser();
+// }
+//
+// public void testCreateRole() throws Exception
+// {
+// utc.testCreateRole();
+// }
+//
+// public void testCountUser() throws Exception
+// {
+// utc.testCountUser();
+// }
+//
+// public void testRemoveNonExistingRole() throws Exception
+// {
+// utc.testRemoveNonExistingRole();
+// }
+//
+// public void testRemoveRole() throws Exception
+// {
+// utc.testRemoveRole();
+// }
+//
+// public void testRemoveUser() throws Exception
+// {
+// utc.testRemoveUser();
+// }
+//
+// public void testFindRoles() throws Exception
+// {
+// utc.testFindRoles();
+// }
+//
+// public void testFindRoleMembers() throws Exception
+// {
+// utc.testFindRoleMembers();
+// }
+//
+// public void testDynamicProperty() throws Exception
+// {
+// begin();
+// User user = userModule.createUser("testname", "testpassword");
+// ProfileMap map = ((HibernateUserImpl)user).getProfileMap();
+// assertNull(map.get("foo"));
+// assertFalse(map.isReadOnly("foo"));
+// map.put("foo", "value");
+// assertEquals("value", map.get("foo"));
+// assertFalse(map.isReadOnly("foo"));
+// commit();
+//
+// begin();
+// user = userModule.findUserByUserName("testname");
+// map = ((HibernateUserImpl)user).getProfileMap();
+// assertEquals("value", map.get("foo"));
+// assertFalse(map.isReadOnly("foo"));
+// commit();
+// }
- public void testFindUser1() throws Exception
- {
- utc.testFindUser1();
- }
-
- public void testFindUser2() throws Exception
- {
- utc.testFindUser2();
- }
-
- public void testFindUsers() throws Exception
- {
- utc.testFindUsers();
- }
-
- public void testCreateUser() throws Exception
- {
- utc.testCreateUser();
- }
-
- public void testCreateRole() throws Exception
- {
- utc.testCreateRole();
- }
-
- public void testCountUser() throws Exception
- {
- utc.testCountUser();
- }
-
- public void testRemoveNonExistingRole() throws Exception
- {
- utc.testRemoveNonExistingRole();
- }
-
- public void testRemoveRole() throws Exception
- {
- utc.testRemoveRole();
- }
-
- public void testRemoveUser() throws Exception
- {
- utc.testRemoveUser();
- }
-
- public void testFindRoles() throws Exception
- {
- utc.testFindRoles();
- }
-
- public void testFindRoleMembers() throws Exception
- {
- utc.testFindRoleMembers();
- }
-
- public void testDynamicProperty() throws Exception
- {
- begin();
- User user = userModule.createUser("testname", "testpassword");
- ProfileMap map = ((HibernateUserImpl)user).getProfileMap();
- assertNull(map.get("foo"));
- assertFalse(map.isReadOnly("foo"));
- map.put("foo", "value");
- assertEquals("value", map.get("foo"));
- assertFalse(map.isReadOnly("foo"));
- commit();
-
- begin();
- user = userModule.findUserByUserName("testname");
- map = ((HibernateUserImpl)user).getProfileMap();
- assertEquals("value", map.get("foo"));
- assertFalse(map.isReadOnly("foo"));
- commit();
- }
-
public void testStaticProperty() throws Exception
{
begin();
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -28,6 +28,11 @@
import org.jboss.portal.common.test.junit.POJOJUnitTest;
import org.jboss.portal.common.test.junit.JUnitAdapter;
import org.jboss.portal.identity2.IdentityContext;
+import org.jboss.portal.identity2.DelegatingUserProfileModuleImpl;
+import org.jboss.portal.identity2.service.UserProfileModuleService;
+import org.jboss.portal.identity2.service.MembershipModuleService;
+import org.jboss.portal.identity2.service.RoleModuleService;
+import org.jboss.portal.identity2.service.UserModuleService;
import org.jboss.portal.identity2.db.HibernateUserModuleImpl;
import org.jboss.portal.identity2.db.HibernateRoleModuleImpl;
import org.jboss.portal.identity2.db.HibernateMembershipModuleImpl;
@@ -98,22 +103,22 @@
/**
* .
*/
- protected HibernateUserModuleImpl userModule;
+ protected UserModuleService userModule;
/**
* .
*/
- protected HibernateRoleModuleImpl roleModule;
+ protected RoleModuleService roleModule;
/**
* .
*/
- protected HibernateMembershipModuleImpl membershipModule;
+ protected MembershipModuleService membershipModule;
/**
* .
*/
- protected HibernateUserProfileModuleImpl userProfileModule;
+ protected UserProfileModuleService userProfileModule;
public DataSourceSupport.Config getDataSourceConfigParameter()
{
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -59,10 +59,9 @@
public void setUp() throws Exception
{
- runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
- runtimeContext.addBean("LDAPTestBean", this);
- runtimeContext.start();
+ super.setUp();
+
/*IdentityContextImpl context = new IdentityContextImpl();
context.start();
identityContext = context;
@@ -93,7 +92,8 @@
suffix = getDirectoryServerConfigParameter().getCleanUpDN();
- super.setUp();
+ populate();
+
}
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -54,10 +54,7 @@
public void setUp() throws Exception
{
- System.out.println("#########################");
- runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
- runtimeContext.addBean("LDAPTestBean", this);
- runtimeContext.start();
+ super.setUp();
//IdentityContextImpl context = new IdentityContextImpl();
//context.start();
@@ -92,7 +89,7 @@
suffix = getDirectoryServerConfigParameter().getCleanUpDN();
- super.setUp();
+ populate();
}
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -73,9 +73,7 @@
public void setUp() throws Exception
{
- runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
- runtimeContext.addBean("LDAPTestBean", this);
- runtimeContext.start();
+ super.setUp();
IdentityServiceControllerImpl controller = new IdentityServiceControllerImpl();
controller.setConfigFile(getDirectoryServerConfigParameter().getConfigFile());
@@ -87,52 +85,10 @@
roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE);
membershipModule = (MembershipModule)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
- /*IdentityContextImpl context = new IdentityContextImpl();
- context.start();
- identityContext = context;
-
- SimpleConfigurationImpl configuration = new SimpleConfigurationImpl();
- configuration.setIdentityContext(identityContext);
- configuration.setConfigFile(getDirectoryServerConfigParameter().getConfigFile());
- configuration.start();
-
- LDAPConnectionContext connection = new LDAPConnectionContext();
- connection.setIdentityContext(identityContext);
- connection.start();
-
- LDAPUserModuleImpl userModule = new LDAPUserModuleImpl();
- userModule.setIdentityContext(identityContext);
-
- //userModule.setContainerDN("ou=People,dc=jboss,dc=org");
- //userModule.setUidAttributeID("uid");
-
- userModule.start();
- this.userModule = userModule;
-
- LDAPRoleModuleImpl roleModule = new LDAPRoleModuleImpl();
- roleModule.setIdentityContext(identityContext);
- //roleModule.setContainerDN("ou=Roles,dc=jboss,dc=org");
- //roleModule.setRidAttributeID("cn");
- roleModule.start();
- this.roleModule = roleModule;
-
- LDAPStaticGroupMembershipModuleImpl membership = new LDAPStaticGroupMembershipModuleImpl();
- membership.setIdentityContext(identityContext);
- //membership.setUidAttributeID("member");
- //membership.setUidAttributeIsDN(true);
- membership.start();
- this.membershipModule = membership;*/
-
- /*mstc = new MembershipStrategyTest();
- mstc.setContext(this);
- mstc.setMembershipModule(membership);
- mstc.setUserModule(userModule);
- mstc.setRoleModule(roleModule);*/
-
suffix = getDirectoryServerConfigParameter().getCleanUpDN();
- super.setUp();
+ populate();
}
//TODO:extend this
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -70,9 +70,7 @@
public void setUp() throws Exception
{
- runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
- runtimeContext.addBean("LDAPTestBean", this);
- runtimeContext.start();
+ super.setUp();
IdentityServiceControllerImpl controller = new IdentityServiceControllerImpl();
controller.setConfigFile(getDirectoryServerConfigParameter().getConfigFile());
@@ -104,64 +102,11 @@
values.add("memberOf");
configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.MEMBERSHIP_ATTRIBUTE_ID, values);
- /*IdentityContextImpl context = new IdentityContextImpl();
- context.start();
- identityContext = context;*/
-
- /*SimpleConfigurationImpl configuration = new SimpleConfigurationImpl();
- configuration.setIdentityContext(identityContext);
- configuration.setConfigFile(getDirectoryServerConfigParameter().getConfigFile());
- configuration.start();
-
- //provide small configuration change to use another branch of ldap tree
- Set values = new HashSet();
- values.add("ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com");
- configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.ROLE_CONTAINER_DN, values);
- values = new HashSet();
- values.add("ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com");
- configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.USER_CONTAINER_DN, values);
- values = new HashSet();
- values.add("memberOf");
- configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.MEMBERSHIP_ATTRIBUTE_ID, values);
-
- LDAPConnectionContext connection = new LDAPConnectionContext();
- connection.setIdentityContext(identityContext);
- connection.start();
-
- LDAPUserModuleImpl userModule = new LDAPUserModuleImpl();
- userModule.setIdentityContext(identityContext);
-
- //userModule.setContainerDN("ou=People,dc=jboss,dc=org");
- //userModule.setUidAttributeID("uid");
-
- userModule.start();
- this.userModule = userModule;
-
- LDAPRoleModuleImpl roleModule = new LDAPRoleModuleImpl();
- roleModule.setIdentityContext(identityContext);
- //roleModule.setContainerDN("ou=Roles,dc=jboss,dc=org");
- //roleModule.setRidAttributeID("cn");
- roleModule.start();
- this.roleModule = roleModule;
-
- LDAPStaticRoleMembershipModuleImpl membership = new LDAPStaticRoleMembershipModuleImpl();
- membership.setIdentityContext(identityContext);
- //membership.setUidAttributeID("member");
- //membership.setUidAttributeIsDN(true);
- membership.start();
- this.membershipModule = membership;*/
-
- /*mstc = new MembershipStrategyTest();
- mstc.setContext(this);
- mstc.setMembershipModule(membership);
- mstc.setUserModule(userModule);
- mstc.setRoleModule(roleModule);*/
-
suffix = getDirectoryServerConfigParameter().getCleanUpDN();
- super.setUp();
+ populate();
}
//TODO:extend this
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -31,6 +31,8 @@
import org.jboss.portal.identity2.IdentityContext;
import org.jboss.portal.test.framework.TestRuntimeContext;
import org.jboss.portal.test.framework.embedded.DSConfig;
+import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+import org.jboss.portal.test.framework.embedded.HibernateSupport;
import org.jboss.portal.common.test.junit.JUnitAdapter;
import org.jboss.portal.common.test.junit.POJOJUnitTest;
import org.opends.server.tools.LDAPModify;
@@ -69,9 +71,11 @@
public static TestSuite createTestSuite(Class clazz) throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("directories.xml");
+ URL directoriesURL = Thread.currentThread().getContextClassLoader().getResource("directories.xml");
+ URL datasourcesURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
Map parameterMap = new HashMap();
- parameterMap.put("DirectoryServerConfig", DSConfig.fromXML2(configsURL));
+ parameterMap.put("DirectoryServerConfig", DSConfig.fromXML2(directoriesURL));
+ parameterMap.put("DataSourceConfig", DataSourceSupport.Config.fromXML2(datasourcesURL));
POJOJUnitTest abc = new POJOJUnitTest(clazz);
JUnitAdapter adapter = new JUnitAdapter(abc, parameterMap);
TestSuite suite = new TestSuite();
@@ -95,8 +99,11 @@
private DSConfig directoryServerConfigParameter;
+ protected DataSourceSupport.Config dataSourceConfigParameter;
//protected OpenDSService embeddedDSService;
+ protected HibernateSupport hibernate;
+
public String getName()
{
return super.getName() + "," + directoryServerConfigParameter.getName() + "," + directoryServerConfigParameter.getDescription();
@@ -112,20 +119,33 @@
this.directoryServerConfigParameter = directoryServerConfigParameter;
}
+ public DataSourceSupport.Config getDataSourceConfigParameter()
+ {
+ return dataSourceConfigParameter;
+ }
+
+ public void setDataSourceConfigParameter(DataSourceSupport.Config dataSourceConfig)
+ {
+ this.dataSourceConfigParameter = dataSourceConfig;
+ }
+
public void setUp() throws Exception
{
- /*if(directoryServerConfigParameter.isUseEmbedded())
- {
- embeddedDSService = new OpenDSService();
- //embeddedDSService.setRemoveWorkingDir(true);
- embeddedDSService.start();
- //give a chance to come up...
- //Thread.sleep(500);
- }*/
- //runtimeContext.start();
+ hibernate = new HibernateSupport();
+ runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
+ runtimeContext.addBean("LDAPTestBean", this);
- populate();
+ runtimeContext.addBean("DBTestBean", this);
+ runtimeContext.addBean("HibernateSupport", hibernate);
+ runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
+ HibernateSupport.Config config = HibernateSupport.getConfig(dataSourceConfigParameter.getName());
+ runtimeContext.addBean("HibernateConfig", config);
+ runtimeContext.start();
+
+ runtimeContext.start();
+
+ //populate();
}
public void tearDown() throws Exception
@@ -145,14 +165,13 @@
public void begin()
{
-
+ hibernate.openSession();
}
public void commit()
{
-
-
+ assertTrue(hibernate.commitTransaction());
}
protected void populate()
Added: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -0,0 +1,109 @@
+/*
+* 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.
+*/
+package org.jboss.portal.test.identity.ldap;
+
+import junit.framework.TestSuite;
+import org.jboss.portal.identity2.UserModule;
+import org.jboss.portal.identity2.RoleModule;
+import org.jboss.portal.identity2.MembershipModule;
+import org.jboss.portal.identity2.IdentityServiceControllerImpl;
+import org.jboss.portal.identity2.IdentityContext;
+import org.jboss.portal.identity2.UserProfileModule;
+import org.jboss.portal.identity2.User;
+import org.jboss.portal.identity2.ldap.LDAPRoleImpl;
+import org.jboss.portal.identity2.ldap.LDAPUserImpl;
+
+import java.util.Set;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.util.HashSet;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 1.1 $
+ */
+public class LDAPUserProfileModuleTestCase extends LDAPTestCase
+{
+
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPUserProfileModuleTestCase.class);
+
+ public static TestSuite suite() throws Exception
+ {
+ return createTestSuite(LDAPUserProfileModuleTestCase.class);
+ }
+
+ private UserModule userModule;
+
+ private RoleModule roleModule;
+
+ private MembershipModule membershipModule;
+
+ private UserProfileModule userProfileModule;
+
+ private String suffix;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ IdentityServiceControllerImpl controller = new IdentityServiceControllerImpl();
+ controller.setConfigFile(getDirectoryServerConfigParameter().getConfigFile());
+ controller.setDefaultConfigFile("test/config/standardidentity-config.xml");
+ controller.setRegisterMBeans(false);
+ controller.start();
+ identityContext = controller.getIdentityContext();
+ userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE);
+ roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE);
+ membershipModule = (MembershipModule)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ userProfileModule = (UserProfileModule)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
+
+ suffix = getDirectoryServerConfigParameter().getCleanUpDN();
+
+
+ populate();
+ }
+
+ public void testSetPropertyWithDB() throws Exception
+ {
+ begin();
+ LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
+ assertEquals("email at email.com", userProfileModule.getProperty(ldapu, User.INFO_USER_EMAIL_REAL));
+ userProfileModule.setProperty(ldapu, User.INFO_USER_EMAIL_REAL, "toto at toto.com");
+ assertEquals("toto at toto.com", userProfileModule.getProperty(ldapu, User.INFO_USER_EMAIL_REAL));
+
+// userProfileModule.setProperty(ldapu, User.INFO_USER_SIGNATURE, "sig sig");
+// assertEquals("sig sig", userProfileModule.getProperty(ldapu, User.INFO_USER_SIGNATURE));
+
+ userProfileModule.setProperty(ldapu, User.INFO_USER_IM_SKYPE, "skype me");
+ assertEquals("skype me", userProfileModule.getProperty(ldapu, User.INFO_USER_IM_SKYPE));
+
+ userProfileModule.setProperty(ldapu, User.INFO_USER_OCCUPATION, "krawiec");
+ assertEquals("krawiec", userProfileModule.getProperty(ldapu, User.INFO_USER_OCCUPATION));
+ commit();
+ }
+
+
+
+
+
+}
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 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -27,21 +27,23 @@
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">
+ <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>-->
+ </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>
@@ -55,24 +57,20 @@
<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">
+ <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>
<bean name="LDAPTestBean" class="org.jboss.portal.test.identity.ldap.LDAPUserTestCase">
Modified: trunk/identity/src/resources/test/config/db-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/db-config.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/test/config/db-config.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -51,7 +51,7 @@
</module>
<module>
<type>UserProfile</type>
- <implementation>DB</implementation>
+ <implementation>PORTAL</implementation>
<config>
<option>
<name>profileConfigFile</name>
@@ -60,5 +60,10 @@
</config>
</module>
+ <module>
+ <type>DBDelegateUserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
</modules>
</identity-configuration>
\ No newline at end of file
Modified: trunk/identity/src/resources/test/config/opends-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/opends-config.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/test/config/opends-config.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -62,8 +62,28 @@
<implementation>LDAP</implementation>
<config/>
</module>
+
<module>
<type>UserProfile</type>
+ <implementation>PORTAL</implementation>
+ <config>
+ <option>
+ <name>profileConfigFile</name>
+ <value>test/config/profile-config.xml</value>
+ </option>
+ <option>
+ <name>ldapModuleJNDIName</name>
+ <value>java:/portal/LDAPUserProfileModule</value>
+ </option>
+ </config>
+ </module>
+ <module>
+ <type>DBDelegateUserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>LDAPDelegateUserProfile</type>
<implementation>LDAP</implementation>
<config/>
</module>
Modified: trunk/identity/src/resources/test/config/profile-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/profile-config.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/test/config/profile-config.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -63,6 +63,9 @@
<type>column</type>
<value>jbp_realemail</value>
</database>
+ <ldap>
+ <value>mail</value>
+ </ldap>
</mapping>
</property>
<property>
Modified: trunk/identity/src/resources/test/config/rhds-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/rhds-config.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/test/config/rhds-config.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -64,6 +64,25 @@
</module>
<module>
<type>UserProfile</type>
+ <implementation>PORTAL</implementation>
+ <config>
+ <option>
+ <name>profileConfigFile</name>
+ <value>test/config/profile-config.xml</value>
+ </option>
+ <option>
+ <name>ldapModuleJNDIName</name>
+ <value>java:/portal/LDAPUserProfileModule</value>
+ </option>
+ </config>
+ </module>
+ <module>
+ <type>DBDelegateUserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>LDAPDelegateUserProfile</type>
<implementation>LDAP</implementation>
<config/>
</module>
Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/standardidentity-config.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -55,7 +55,7 @@
</option>
</config>
</datasource>
- <datasource>
+ <!--<datasource>
<name>DB</name>
<service-name>portal:service=Hibernate</service-name>
<class>org.jboss.portal.identity2.experimental.db.IdentitySessionFactoryBinder</class>
@@ -68,10 +68,10 @@
<name>configLocation</name>
<value>hibernate-single.cfg.xml</value>
</option>
- <!--<option>
+ --><!--<option>
<name>setupLocation</name>
<value>conf/hibernate/user/setup.txt</value>
- </option>-->
+ </option>--><!--
<option>
<name>jNDIName</name>
<value>java:/portal/UserSessionFactory</value>
@@ -93,18 +93,41 @@
<value><![CDATA[<property name="@name@" column="@column@" type="java.lang.String" update="true" insert="true" unique="false"/>]]></value>
</option>
</config>
- </datasource>
+ </datasource>-->
</datasources>
<modules>
+
<module>
<!--type used to correctly map in IdentityContext registry-->
+ <type>UserProfile</type>
+ <implementation>PORTAL</implementation>
+
+ <!--name of service and class for creating mbean-->
+ <service-name>portal:service=Module,type=UserProfile</service-name>
+ <class>org.jboss.portal.identity2.DelegatingUserProfileModuleImpl</class>
+ <!--set of options that are passed to a class constructor-->
+ <config>
+ <option>
+ <name>jndiName</name>
+ <value>java:/portal/UserProfileModule</value>
+ </option>
+ <option>
+ <name>dbModuleJNDIName</name>
+ <value>java:/portal/DBUserProfileModule</value>
+ </option>
+ </config>
+ </module>
+
+
+
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
<type>User</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.identity2.db.HibernateUserModuleImpl</class>
- <jndi-name>java:/portal/UserModule</jndi-name>
<!--set of options that are passed to a class constructor-->
<config>
@@ -127,7 +150,6 @@
<!--name of service and class for creating mbean-->
<service-name>portal:service=Module,type=Role</service-name>
<class>org.jboss.portal.identity2.db.HibernateRoleModuleImpl</class>
- <jndi-name>java:/portal/RoleModule</jndi-name>
<!--set of options that are passed to a class constructor-->
<config>
@@ -150,7 +172,6 @@
<!--name of service and class for creating mbean-->
<service-name>portal:service=Module,type=Membership</service-name>
<class>org.jboss.portal.identity2.db.HibernateMembershipModuleImpl</class>
- <jndi-name>java:/portal/MembershipModule</jndi-name>
<!--set of options that are passed to a class constructor-->
<config>
@@ -167,13 +188,12 @@
<module>
<!--type used to correctly map in IdentityContext registry-->
- <type>UserProfile</type>
+ <type>DBDelegateUserProfile</type>
<implementation>DB</implementation>
<!--name of service and class for creating mbean-->
- <service-name>portal:service=Module,type=UserProfile</service-name>
+ <service-name>portal:service=Module,type=DBUserProfile</service-name>
<class>org.jboss.portal.identity2.db.HibernateUserProfileModuleImpl</class>
- <jndi-name>java:/portal/UserProfileModule</jndi-name>
<!--set of options that are passed to a class constructor-->
<config>
@@ -183,7 +203,7 @@
</option>
<option>
<name>jndiName</name>
- <value>java:/portal/UserProfileModule</value>
+ <value>java:/portal/DBUserProfileModule</value>
</option>
</config>
</module>
@@ -197,7 +217,6 @@
<!--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>
@@ -220,7 +239,6 @@
<!--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>
@@ -243,7 +261,6 @@
<!--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>
@@ -260,13 +277,12 @@
<module>
<!--type used to correctly map in IdentityContext registry-->
- <type>UserProfile</type>
+ <type>LDAPDelegateUserProfile</type>
<implementation>LDAP</implementation>
<!--name of service and class for creating mbean-->
- <service-name>portal:service=Module,type=UserProfile</service-name>
+ <service-name>portal:service=Module,type=LDAPUserProfile</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>
@@ -285,7 +301,7 @@
</option>-->
<option>
<name>jndiName</name>
- <value>java:/portal/UserProfileModule</value>
+ <value>java:/portal/LDAPUserProfileModule</value>
</option>
<option>
<name>connectionJNDIName</name>
Modified: trunk/test/src/etc/directories.xml
===================================================================
--- trunk/test/src/etc/directories.xml 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/test/src/etc/directories.xml 2006-12-14 00:37:26 UTC (rev 5853)
@@ -26,7 +26,7 @@
<directory-name>OpenDS</directory-name>
<description>OpenDS service deployed on JBoss AS as an mbean</description>
<!--identity configuration file-->
- <config-file>identityconfig/opends-config.xml</config-file>
+ <config-file>test/config/opends-config.xml</config-file>
<host>localhost</host>
<port>10389</port>
<context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
@@ -37,11 +37,11 @@
<!--DN that will be removed to perform cleanup after each test-->
<cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
</directory>
- <!--<directory> in
+ <!--<directory>
<directory-name>RedHatDS</directory-name>
<description>RedHat Directory in QA Labs (need vpn access)</description>
- <config-file>identityconfig/rhds-config.xml</config-file>
+ <config-file>test/config/rhds-config.xml</config-file>
<host>dev39.qa.atl.jboss.com</host>
<port>10389</port>
<context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
Modified: trunk/test/src/etc/ldap/ldif/initial-tests.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/initial-tests.ldif 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/test/src/etc/ldap/ldif/initial-tests.ldif 2006-12-14 00:37:26 UTC (rev 5853)
@@ -18,6 +18,7 @@
cn: Java Duke
sn: Duke
userPassword: theduke
+mail: email at email.com
dn: uid=jduke1,ou=People,dc=jboss,dc=org
objectclass: top
Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-12-13 22:47:58 UTC (rev 5852)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-12-14 00:37:26 UTC (rev 5853)
@@ -98,15 +98,17 @@
public String toString()
{
- return new StringBuffer().//append(name).
+ return new StringBuffer().append("[").
+ //append(name).
//append("-").
append(description).
+ append("]/[").
//append(";").
- //append(host).
- //append(":").
- //append(port).
- append("/").
- append(configFile).
+ append(host).
+ append(":").
+ append(port).
+ //append(configFile).
+ append("]").
toString();
}
More information about the portal-commits
mailing list