4:33 p.m.
Author: bdaw
Date: 2007-03-07 17:33:06 -0500 (Wed, 07 Mar 2007)
New Revision: 6586
Removed:
trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml
Modified:
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java
trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml
Log:
- corrected bug in identity 'db' testsuite
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2007-03-07 22:08:39 UTC (rev 6585)
+++ trunk/identity/build.xml 2007-03-07 22:33:06 UTC (rev 6586)
@@ -452,9 +452,9 @@
<x-test>
- <!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>
- <test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/>-->
- <test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/>
+ <test todir="${test.reports}"
name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>
+ <!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/>-->
+ <!--<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"/>
Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java
===================================================================
---
trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2007-03-07
22:08:39 UTC (rev 6585)
+++
trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2007-03-07
22:33:06 UTC (rev 6586)
@@ -68,7 +68,7 @@
public static final String USER_PASSWORD_ATTRIBUTE_ID =
"passwordAttributeID";
- public static final String USER_EMAIL_ATTRIBUTE_ID = "emailAttributeID";
+ //public static final String USER_EMAIL_ATTRIBUTE_ID = "emailAttributeID";
public static final String USER_CONTEXT_DN = "userCtxDN";
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 2007-03-07
22:08:39 UTC (rev 6585)
+++
trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml 2007-03-07
22:33:06 UTC (rev 6586)
@@ -72,7 +72,7 @@
</property>
</bean>
- <bean name="DBTestBean"
class="org.jboss.portal.test.identity.db_old.DBUserTestCase">
+ <bean name="DBTestBean"
class="org.jboss.portal.test.identity.db.DBIdentityTestCase">
<constructor factoryMethod="getBean">
<factory bean="BeanFactory"/>
<parameter>DBTestBean</parameter>
Deleted:
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 2007-03-07
22:08:39 UTC (rev 6585)
+++
trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db_old-beans.xml 2007-03-07
22:33:06 UTC (rev 6586)
@@ -1,78 +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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<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>