[portal-commits] JBoss Portal SVN: r6052 - in trunk/identity: src/main/org/jboss/portal/identity and 2 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Jan 19 16:37:47 EST 2007
Author: bdaw
Date: 2007-01-19 16:37:47 -0500 (Fri, 19 Jan 2007)
New Revision: 6052
Modified:
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.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/LDAPTestCase.java
Log:
- correct broken IdentityContextImpl because of tests were failing
- small corrections in build scripts to hopefully make them working in CC
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2007-01-19 21:37:46 UTC (rev 6051)
+++ trunk/identity/build.xml 2007-01-19 21:37:47 UTC (rev 6052)
@@ -303,19 +303,19 @@
<target name="help" depends="_default:help"/>
- <target name="deploy-ldap" depends="init" if="HAVE_JDK_1.5">
+ <target name="deploy-ldap" depends="init" if="HAVE_JDK_1.5" >
<mkdir dir="${jboss.home}/server/default/conf/opends"/>
- <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true">
+ <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true" failonerror="false">
<fileset dir="../test/output/etc/opends"/>
</copy>
- <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" failonerror="false"/>
<sleep seconds="25"/>
</target>
<!-- Undeployment of agent -->
<target name="undeploy-ldap" depends="init" if="HAVE_JDK_1.5">
- <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar"/>
- <delete dir="${jboss.home}/server/default/conf/opends"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar" failonerror="false"/>
+ <delete dir="${jboss.home}/server/default/conf/opends" failonerror="false"/>
</target>
<target name="tests" depends="init, tests15">
@@ -450,13 +450,13 @@
<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.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.LDAPUserProfileModuleTestCase"/>
</x-test>
<x-classpath>
Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.java 2007-01-19 21:37:46 UTC (rev 6051)
+++ trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.java 2007-01-19 21:37:47 UTC (rev 6052)
@@ -24,6 +24,8 @@
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.util.CopyOnWriteRegistry;
+import java.util.Collection;
+
/**
* Keeps references to all identity related modules to enable them interactions
*
@@ -42,13 +44,19 @@
public void register(Object object, String name) throws IdentityException
{
- registry.register(object, name);
+ if (!registry.register(name, object))
+ {
+ throw new IdentityException("Cannot register object in IdentityContext with name: " + name);
+ }
if (log.isDebugEnabled()) log.debug("registering object: " + name + " ; " + object.getClass());
}
public void unregister(String name)
{
- registry.unregister(name);
+ if (!registry.unregister(name))
+ {
+ log.error("Cannot unregister object from IdentityContext with name: " + name);
+ }
if (log.isDebugEnabled()) log.debug("unregistering object: " + name);
}
@@ -61,4 +69,14 @@
}
return o;
}
+
+ public Collection getKeys()
+ {
+ return registry.getKeys();
+ }
+
+ public Collection getValues()
+ {
+ return registry.getRegistrations();
+ }
}
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 2007-01-19 21:37:46 UTC (rev 6051)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-01-19 21:37:47 UTC (rev 6052)
@@ -21,11 +21,8 @@
*/
package org.jboss.portal.test.identity.db;
-import org.jboss.portal.identity.IdentityServiceControllerImpl;
-import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.db.HibernateUserImpl;
-import org.jboss.portal.identity.ProfileMap;
-import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.*;
import org.jboss.portal.identity.service.UserModuleService;
import org.jboss.portal.identity.service.UserProfileModuleService;
import org.jboss.portal.identity.service.MembershipModuleService;
@@ -35,6 +32,8 @@
import junit.framework.TestSuite;
import java.util.Date;
+import java.util.Collection;
+import java.util.Iterator;
import java.text.SimpleDateFormat;
/**
@@ -43,6 +42,7 @@
*/
public class DBIdentityTestCase extends DBTestCase
{
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DBTestCase.class);
public static TestSuite suite() throws Exception
{
@@ -75,6 +75,7 @@
controller.setRegisterMBeans(false);
controller.start();
identityContext = controller.getIdentityContext();
+
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);
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 2007-01-19 21:37:46 UTC (rev 6051)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2007-01-19 21:37:47 UTC (rev 6052)
@@ -56,7 +56,7 @@
Logger.getRoot().addAppender(appender);
Logger.getRoot().setLevel(Level.DEBUG);
Logger.getLogger("org.hibernate").setLevel(Level.ERROR);
- Logger.getLogger("org.jboss.portal.identity2").setLevel(Level.DEBUG);
+ Logger.getLogger("org.jboss.portal.identity").setLevel(Level.DEBUG);
}
public static TestSuite createTestSuite(Class clazz) throws Exception
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 2007-01-19 21:37:46 UTC (rev 6051)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-01-19 21:37:47 UTC (rev 6052)
@@ -66,7 +66,7 @@
Appender appender = new ConsoleAppender(new SimpleLayout());
Logger.getRoot().addAppender(appender);
Logger.getRoot().setLevel(Level.INFO);
- Logger.getLogger("org.jboss.portal.identity2").setLevel(Level.DEBUG);
+ Logger.getLogger("org.jboss.portal.identity").setLevel(Level.DEBUG);
}
public static TestSuite createTestSuite(Class clazz) throws Exception
More information about the portal-commits
mailing list