[portal-commits] JBoss Portal SVN: r5847 - in trunk/identity: . src/main/org/jboss/portal/identity/db

[portal-commits at lists.jboss.org]

Author: bdaw
Date: 2006-12-13 11:06:20 -0500 (Wed, 13 Dec 2006)
New Revision: 5847

Modified:
   trunk/identity/build.xml
   trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java
Log:
cleanup and sync for previous commits

Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml	2006-12-13 15:59:34 UTC (rev 5846)
+++ trunk/identity/build.xml	2006-12-13 16:06:20 UTC (rev 5847)
@@ -334,7 +334,7 @@
 
 
          <x-test>
-            <test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBUserTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.identity.db_old.DBUserTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.lib}/portal-identity-lib.jar"/>
@@ -401,6 +401,7 @@
             <pathelement location="${build.resources}/hibernate"/>
 
 
+
             <path refid="apache.commons.classpath"/>
             <path refid="sun.opends.classpath"/>
             <path refid="dom4j.dom4j.classpath"/>
@@ -444,11 +445,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.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.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.LDAPStaticRoleMembershipModuleTestCase"/>-->
 
 
          </x-test>
@@ -456,10 +460,15 @@
             <pathelement location="${build.lib}/portal-identity-lib.jar"/>
             <pathelement location="${build.lib}/portal-identity-test-lib.jar"/>
             <pathelement location="${jboss.portal-test.root}/etc"/>
-            <pathelement location="${jboss.portal-identity.root}/resources/test"/>
+            <!--<pathelement location="${jboss.portal-identity.root}/resources/test"/>-->
             <pathelement location="${build.resources}/hibernate"/>
+            <pathelement location="${build.resources}"/>
 
+            <!--temp-->
+            <!--<pathelement location="/home/bdaw/Workshop/libs/mysql-connector-java-5.0.4/mysql-connector-java-5.0.4-bin.jar"/>-->
 
+
+            <path refid="beanshell.beanshell.classpath"/>
             <path refid="apache.commons.classpath"/>
             <path refid="sun.opends.classpath"/>
             <path refid="dom4j.dom4j.classpath"/>

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java
===================================================================