Author: bdaw Date: 2007-08-17 18:39:31 -0400 (Fri, 17 Aug 2007) New Revision: 7985 Modified: branches/JBoss_Portal_Branch_2_6/identity/build.xml branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java Log: - missing classpath Modified: branches/JBoss_Portal_Branch_2_6/identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-17 18:22:12 UTC (rev 7984) +++ branches/JBoss_Portal_Branch_2_6/identity/build.xml 2007-08-17 22:39:31 UTC (rev 7985) @@ -269,7 +269,7 @@ <!--test-identity.sar --> <jar jarfile="${build.lib}/test-identity.sar"> <fileset dir="${build.resources}/test-identity-sar"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-agent-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-agent-lib-jdk5.jar"/> <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/> <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/> </jar> @@ -429,6 +429,7 @@ <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> <pathelement location="${jboss.portal/modules/test.resources}"/> <!--<pathelement location="${jboss.portal-identity.root}/resources/test"/>--> + <pathelement location="${jboss.portal/modules/test.lib}/ldap.zip"/> <pathelement location="${build.resources}/hibernate"/> <pathelement location="${build.resources}"/> @@ -477,20 +478,21 @@ <x-test> - <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.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"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>--> - <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/> + <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"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/>--> </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> <pathelement location="${jboss.portal/modules/test.resources}"/> + <pathelement location="${jboss.portal/modules/test.lib}/ldap.zip"/> <!--<pathelement location="${jboss.portal-identity.root}/resources/test"/>--> <pathelement location="${build.resources}/hibernate"/> <pathelement location="${build.resources}"/> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-08-17 18:22:12 UTC (rev 7984) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-08-17 22:39:31 UTC (rev 7985) @@ -190,9 +190,14 @@ //URL ldif = tcl.getResource("ldap/ldif/example1.ldif"); URL ldif = tcl.getResource(directoryServerConfigParameter.getPopulateLdif()); + + if (ldif == null) + { + log.error("ldif not found: " + directoryServerConfigParameter.getPopulateLdif()); + } log.info("ldif to load by loader: " + ldif.getPath()); - /* LdifFileLoader loader = new LdifFileLoader(ctx, ldif.getPath()); + /* LdifFileLoader loader = new LdifFileLoader(ctx, ldi+f.getPath()); loader.execute();*/ //String fileurl = this.getResourceURL("security/opends/ldif/example1.ldif");