Author: bdaw Date: 2007-01-06 16:13:37 -0500 (Sat, 06 Jan 2007) New Revision: 5946 Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/UserModule.java trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.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/resources/test/config/db-config.xml trunk/identity/src/resources/test/config/opends-config.xml trunk/identity/src/resources/test/config/rhds-config.xml trunk/identity/src/resources/test/config/standardidentity-config.xml trunk/testsuite/build.xml Log: - correct and reenable identity testsuite Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -48,8 +48,8 @@ <module-option name="hashAlgorithm">MD5</module-option> <module-option name="hashEncoding">HEX</module-option> <module-option name="additionalRole">Authenticated</module-option> - </login-module> ---> + </login-module>--> + <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required"> <module-option name="unauthenticatedIdentity">guest</module-option> <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/build.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -309,7 +309,7 @@ <fileset dir="../test/output/etc/opends"/> </copy> <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/> - <sleep seconds="15"/> + <sleep seconds="25"/> </target> <!-- Undeployment of agent --> @@ -340,7 +340,9 @@ <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="${build.resources}/hibernate"/> + <pathelement location="${build.resources}"/> <path refid="apache.commons.classpath"/> @@ -390,6 +392,7 @@ <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> @@ -397,8 +400,9 @@ <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}"/> @@ -449,11 +453,11 @@ <!--<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.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.LDAPUserProfileModuleTestCase"/> </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> Modified: trunk/identity/src/main/org/jboss/portal/identity/UserModule.java =================================================================== 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-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-01-06 21:13:37 UTC (rev 5946) @@ -101,86 +101,86 @@ // -// 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 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 testStaticProperty() throws Exception { begin(); 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 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java 2007-01-06 21:13:37 UTC (rev 5946) @@ -27,6 +27,7 @@ import org.jboss.portal.identity.ldap.LDAPRoleImpl; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityServiceControllerImpl; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.test.identity.ldap.LDAPTestCase; import java.util.Set; @@ -109,8 +110,16 @@ assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles," + suffix); assertEquals(ldapr.getName(), "Echo"); roleModule.removeRole("Echo"); - ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo"); - assertNull(ldapr); + try + { + ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo"); + fail(); + } + catch (IdentityException e) + { + //expected + } + //assertNull(ldapr); } public void testCreateRole() throws Exception @@ -124,9 +133,18 @@ assertNotNull(ldapr); roleModule.removeRole("testRole"); - ldapr = (LDAPRoleImpl)roleModule.findRoleById("testRole"); - assertNull(ldapr); + try + { + ldapr = (LDAPRoleImpl)roleModule.findRoleById("testRole"); + fail(""); + } + catch (Exception e) + { + //expected + } + //assertNull(ldapr); + } public void testgetRoleCount() throws Exception 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 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2007-01-06 21:13:37 UTC (rev 5946) @@ -33,6 +33,7 @@ import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.UserProfileModule; import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.test.identity.ldap.LDAPTestCase; import java.util.Set; @@ -109,53 +110,69 @@ } -// public void testFirstSimple() throws Exception -// { -// log.info("test framework works ;]"); -// } + public void testFirstSimple() throws Exception + { + log.info("test framework works ;]"); + } -// public void testFindUserByName() throws Exception -// { -// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); -// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); -// assertEquals(ldapu.getUserName(), "jduke"); -// } -// -// public void testRemoveUser() throws Exception -// { -// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); -// assertNotNull(ldapu); -// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); -// userModule.removeUser("jduke"); -// ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); -// assertNull(ldapu); -// } -// -// public void testCreateUser() throws Exception -// { -// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser", "testPassword"); -// assertNotNull(ldapu); -// assertEquals("testUser", ldapu.getUserName()); -// -// ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); -// assertNotNull(ldapu); -// userModule.removeUser("testUser"); -// -// ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); -// assertNull(ldapu); -// -// } -// -// public void testgetUserCount() throws Exception -// { -// LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); -// assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); -// assertEquals(ldapu.getUserName(), "jduke"); -// -// int count = userModule.getUserCount(); -// assertEquals(5, count); -// } + public void testFindUserByName() throws Exception + { + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); + assertEquals(ldapu.getUserName(), "jduke"); + } + public void testRemoveUser() throws Exception + { + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + assertNotNull(ldapu); + assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); + userModule.removeUser("jduke"); + try + { + ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + fail(); + } + catch (IdentityException e) + { + //expected + } + //assertNull(ldapu); + } + + public void testCreateUser() throws Exception + { + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser", "testPassword"); + assertNotNull(ldapu); + assertEquals("testUser", ldapu.getUserName()); + + ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); + assertNotNull(ldapu); + userModule.removeUser("testUser"); + + try + { + ldapu = (LDAPUserImpl)userModule.findUserById("testUser"); + fail(); + } + catch (IdentityException e) + { + //expected + } + //assertNull(ldapu); + + } + + public void testgetUserCount() throws Exception + { + LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke"); + assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix); + assertEquals(ldapu.getUserName(), "jduke"); + + int count = userModule.getUserCount(); + assertEquals(5, count); + } + public void testPassword() throws Exception { userModule.createUser("testUser", "testPassword"); Modified: trunk/identity/src/resources/test/config/db-config.xml =================================================================== --- trunk/identity/src/resources/test/config/db-config.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/resources/test/config/db-config.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -22,18 +22,13 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE identity-configuration PUBLIC + <!--<!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> + <identity-configuration> - <datasources> - <!--in tests Hibernate SF is created separately--> - <!--<datasource> - <name>DB</name> - <config/> - </datasource>--> - </datasources> + <datasources/> <modules> <module> <!--type used to correctly map in IdentityContext registry--> @@ -41,7 +36,6 @@ <implementation>DB</implementation> <config/> </module> - <module> <!--type used to correctly map in IdentityContext registry--> <type>Role</type> @@ -55,8 +49,9 @@ <config/> </module> <module> + <!--type used to correctly map in IdentityContext registry--> <type>UserProfile</type> - <implementation>PORTAL</implementation> + <implementation>DELEGATING</implementation> <config> <option> <name>profileConfigFile</name> @@ -64,7 +59,6 @@ </option> </config> </module> - <module> <type>DBDelegateUserProfile</type> <implementation>DB</implementation> @@ -72,4 +66,4 @@ </module> </modules> <options/> -</identity-configuration> \ No newline at end of file +</identity-configuration> Modified: trunk/identity/src/resources/test/config/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/opends-config.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/resources/test/config/opends-config.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -22,9 +22,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE identity-configuration PUBLIC + <!--<!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> <identity-configuration> <datasources> @@ -70,7 +70,7 @@ <module> <type>UserProfile</type> - <implementation>PORTAL</implementation> + <implementation>DELEGATING</implementation> <config> <option> <name>profileConfigFile</name> Modified: trunk/identity/src/resources/test/config/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/rhds-config.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/resources/test/config/rhds-config.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -22,9 +22,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE identity-configuration PUBLIC + <!--<!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> <identity-configuration> <datasources> @@ -70,7 +70,7 @@ <module> <type>UserProfile</type> - <implementation>PORTAL</implementation> + <implementation>DELEGATING</implementation> <config> <option> <name>profileConfigFile</name> Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml =================================================================== --- trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -23,9 +23,9 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE identity-configuration PUBLIC +<!--<!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> <identity-configuration> <datasources> @@ -106,7 +106,7 @@ <module> <!--type used to correctly map in IdentityContext registry--> <type>UserProfile</type> - <implementation>PORTAL</implementation> + <implementation>DELEGATING</implementation> <!--name of service and class for creating mbean--> <service-name>portal:service=Module,type=UserProfile</service-name> @@ -121,6 +121,10 @@ <name>dbModuleJNDIName</name> <value>java:/portal/DBUserProfileModule</value> </option> + <option> + <name>profileConfigFile</name> + <value>conf/identity/profile-config.xml</value> + </option> </config> </module> @@ -234,7 +238,7 @@ <name>connectionJNDIName</name> <value>java:/portal/LDAPConnectionContext</value> </option> - </config> + </config> </module> <module> @@ -335,18 +339,6 @@ <value>userPassword</value> </option> <option> - <name>hashAlgorithm</name> - <value>MD5</value> - </option> - <option> - <name>hashEncoding</name> - <value>hex</value> - </option> - <option> - <name>encodePasswordOnUpdate</name> - <value>false</value> - </option> - <option> <name>roleContainerDN</name> <value>ou=Roles,dc=example,dc=com</value> </option> @@ -405,101 +397,25 @@ <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> </option> </option-group> - <option-group> - <group-name>userProfileMappings</group-name> - <option> - <name>portal.user.name.given</name> - <!--inetOrgPerson--> - <value>givenName</value> - </option> - <!--<option> - <name>portal.user.name.family</name> - <value></value> - </option> - <option> - <name>portal.user.location</name> - <value></value> - </option>--> - <option> - <name>portal.user.occupation</name> - <!--inetOrgPerson--> - <value>title</value> - </option> - <!--<option> - <name>portal.user.extra</name> - <value></value> - </option>--> - <option> - <name>portal.user.signature</name> - <!--newPilotPerson--> - <value>personalSignature</value> - </option> - <!--<option> - <name>portal.user.interests</name> - <value></value> - </option>--> - <option> - <name>portal.user.locale</name> - <!--inetOrgPerson--> - <value>localityName</value><!--or prefferedLanguage--> - </option> - <!--<option> - <name>portal.user.im.icq</name> - <value></value> - </option> - <option> - <name>portal.user.im.aim</name> - <value></value> - </option> - <option> - <name>portal.user.im.msnm</name> - <value></value> - </option> - <option> - <name>portal.user.im.yim</name> - <value></value> - </option> - <option> - <name>portal.user.im.skype</name> - <value></value> - </option>--> - <option> - <name>portal.user.homepage</name> - <!--inetOrgPerson--> - <value>seeAlso</value> - </option> - <!--<option> - <name>portal.user.time-zone-offset</name> - <value></value> - </option> - <option> - <name>portal.user.theme</name> - <value></value> - </option> - <option> - <name>portal.user.security.question</name> - <value></value> - </option> - <option> - <name>portal.user.security.answer</name> - <value></value> - </option> - <option> - <name>portal.user.email.fake</name> - <value></value> - </option> - <option> - <name>portal.user.email.view-real</name> - <value></value> - </option> - <option> - <name>portal.user.last-login-date</name> - <value></value> - </option> - <option> - <name>portal.user.registration-date</name> - <value></value> - </option>--> - </option-group> </options> -</identity-configuration> \ No newline at end of file +</identity-configuration> + + + + + + + + + + + + + + + + + + + + Modified: trunk/testsuite/build.xml =================================================================== --- trunk/testsuite/build.xml 2007-01-04 23:55:24 UTC (rev 5945) +++ trunk/testsuite/build.xml 2007-01-06 21:13:37 UTC (rev 5946) @@ -130,9 +130,9 @@ <antcall target="internal-test-module"> <param name="module" value="security"/> </antcall> - <!--<antcall target="internal-test-module"> + <antcall target="internal-test-module"> <param name="module" value="identity"/> - </antcall>--> + </antcall> <antcall target="internal-test-module"> <param name="module" value="server"/> </antcall> @@ -204,16 +204,6 @@ <undeploy file="../test/output/lib/portal-test.sar" config="default"/> </target> - - <!--<target name="deploy-identity"> - <ant antfile="../identity/build.xml" output="output.log" dir="../identity" target="deploy-ldap"/> - </target> - - - <target name="undeploy-identity"> - <ant antfile="../identity/build.xml" output="output.log" dir="../identity" target="undeploy-ldap"/> - </target>--> - <target name="help"> <echo message="To run individual module tests use the test-module target with -Dmodule=the module you want to test, e.g. ant -Dmodule=portlet test-module"/>