[portal-commits] JBoss Portal SVN: r6287 - in trunk: core/src/resources/portal-core-sar/conf and 5 other directories.

Author: bdaw Date: 2007-02-14 21:22:12 -0500 (Wed, 14 Feb 2007) New Revision: 6287 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml trunk/core/src/resources/portal-core-sar/conf/login-config.xml trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java trunk/identity/src/resources/example/portal-sample-local.ldif trunk/identity/src/resources/example/portal-sample-qa.ldif Log: - stupid bug setting ldap user password to random one... Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-02-15 02:22:12 UTC (rev 6287) @@ -689,7 +689,9 @@ { try { + user = userModule.createUser(uname, pass1); + setProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, realEmail); //user.setFakeEmail(fakeEmail); setProperty(user,User.INFO_USER_EMAIL_FAKE, fakeEmail); Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-02-15 02:22:12 UTC (rev 6287) @@ -37,20 +37,20 @@ </option> <option> <name>port</name> - <value>389</value> + <value>10389</value> </option> <option> <name>adminDN</name> - <value>cn=Manager,dc=my-domain,dc=com</value> + <value>cn=Directory Manager</value> </option> <option> <name>adminPassword</name> - <value>secret</value> + <value>password</value> </option> - <option> + <!--<option> <name>protocol</name> <value>ssl</value> - </option> + </option>--> </config> </datasource> </datasources> @@ -103,11 +103,11 @@ <group-name>common</group-name> <option> <name>userCtxDN</name> - <value>ou=People,o=portal,dc=my-domain,dc=com</value> + <value>ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,o=portal,dc=my-domain,dc=com</value> + <value>ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> <option-group> @@ -140,7 +140,7 @@ <!--For safety reasons point to the admin user here--> <option> <name>member</name> - <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> + <value>uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> </options> Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-15 02:22:12 UTC (rev 6287) @@ -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-02-15 01:13:17 UTC (rev 6286) +++ trunk/identity/build.xml 2007-02-15 02:22:12 UTC (rev 6287) @@ -452,15 +452,15 @@ <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.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.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"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/>--> </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-02-15 02:22:12 UTC (rev 6287) @@ -224,7 +224,7 @@ //user.updatePassword(user.getPassword()); if (defaultSynchronizePassword != null) { - user.updatePassword(getDefaultSynchronizePassword()); + hu.updatePassword(getDefaultSynchronizePassword()); } //really dummy password generation //TODO: make something more sophisticated (risk of this part is documented) @@ -236,7 +236,7 @@ { password.append(r.nextDouble()); } - user.updatePassword(password.toString()); + hu.updatePassword(password.toString()); } session = getCurrentSession(); session.save(hu); Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-15 02:22:12 UTC (rev 6287) @@ -184,6 +184,8 @@ throw new IdentityException("Failed to create user", e); } User u = findUserByUserName(userName); + + fireUserCreatedEvent(u.getId(), u.getUserName()); return u; } Modified: trunk/identity/src/resources/example/portal-sample-local.ldif =================================================================== --- trunk/identity/src/resources/example/portal-sample-local.ldif 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/identity/src/resources/example/portal-sample-local.ldif 2007-02-15 02:22:12 UTC (rev 6287) @@ -1,15 +1,15 @@ -dn: o=portal,dc=my-domain,dc=com +dn: o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: organization -o: portal +o: test -dn: ou=People,o=portal,dc=my-domain,dc=com +dn: ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: organizationalUnit ou: People -dn: uid=admin,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -19,7 +19,7 @@ userPassword: admin mail: email(a)email.com -dn: uid=user,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=user,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -29,7 +29,7 @@ userPassword: user mail: email(a)email.com -dn: uid=jduke,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -39,7 +39,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke1,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -50,7 +50,7 @@ mail: email(a)email.com -dn: uid=jduke2,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -60,7 +60,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke3,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -70,7 +70,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,o=portal,dc=my-domain,dc=com +dn: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -80,54 +80,54 @@ userPassword: theduke mail: email(a)email.com -dn: ou=Roles,o=portal,dc=my-domain,dc=com +dn: ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: organizationalUnit ou: Roles -dn: cn=Admin,ou=Roles,o=portal,dc=my-domain,dc=com +dn: cn=Admin,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: top objectClass: groupOfNames cn: Admin description: Portal admin role -member: uid=admin,ou=People,o=portal,dc=my-domain,dc=com +member: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -dn: cn=User,ou=Roles,o=portal,dc=my-domain,dc=com +dn: cn=User,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: top objectClass: groupOfNames cn: User description: Portal user role -member: uid=admin,ou=People,o=portal,dc=my-domain,dc=com -member: uid=user,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke1,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke2,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke3,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke4,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke5,ou=People,o=portal,dc=my-domain,dc=com +member: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=user,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -dn: cn=Echo,ou=Roles,o=portal,dc=my-domain,dc=com + +dn: cn=Echo,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: top objectClass: groupOfNames cn: Echo description: the JBossAdmin group -member: uid=jduke1,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke3,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke4,ou=People,o=portal,dc=my-domain,dc=com +member: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -dn: cn=Echo1,ou=Roles,o=portal,dc=my-domain,dc=com +dn: cn=Echo1,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: top objectClass: groupOfNames cn: Echo1 description: the JBossAdmin group 2 -member: uid=jduke2,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke3,ou=People,o=portal,dc=my-domain,dc=com -member: uid=jduke5,ou=People,o=portal,dc=my-domain,dc=com +member: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke5,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -dn: cn=TheDuke,ou=Roles,o=portal,dc=my-domain,dc=com +dn: cn=TheDuke,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: groupOfNames objectClass: top cn: TheDuke description: TheDuke role context -member: uid=jduke,ou=People,o=portal,dc=my-domain,dc=com \ No newline at end of file +member: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com \ No newline at end of file Modified: trunk/identity/src/resources/example/portal-sample-qa.ldif =================================================================== --- trunk/identity/src/resources/example/portal-sample-qa.ldif 2007-02-15 01:13:17 UTC (rev 6286) +++ trunk/identity/src/resources/example/portal-sample-qa.ldif 2007-02-15 02:22:12 UTC (rev 6287) @@ -106,7 +106,21 @@ member: uid=jduke4,ou=People,o=qa,dc=portal,dc=my-domain,dc=com member: uid=jduke5,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +dn: cn=common,ou=Roles,o=qa,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: User +description: Portal user role +member: uid=admin,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=user,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke1,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke2,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,o=qa,dc=portal,dc=my-domain,dc=com +member: uid=jduke5,ou=People,o=qa,dc=portal,dc=my-domain,dc=com + dn: cn=Echo,ou=Roles,o=qa,dc=portal,dc=my-domain,dc=com objectClass: top objectClass: groupOfNames