Author: bdaw Date: 2007-05-17 06:27:41 -0400 (Thu, 17 May 2007) New Revision: 7269 Modified: trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java Log: - make LDAP synchronized users enabled by default in database Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-05-17 10:17:48 UTC (rev 7268) +++ trunk/identity/build.xml 2007-05-17 10:27:41 UTC (rev 7269) @@ -275,6 +275,18 @@ </jar> </target> + + <target name="package-opends" depends="init, output" if="HAVE_JDK_1.5"> + + <!--test-identity.sar --> + <jar jarfile="${build.lib}/opends.sar"> + <fileset dir="${build.resources}/opends-sar"/> + <fileset dir="../test/output/lib" includes="portal-test-agent-lib.jar"/> + <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/> + <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/> + </jar> + </target> + <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> @@ -304,6 +316,20 @@ <target name="help" depends="_default:help"/> + + <target name="deploy-opends" depends="init, package-opends" if="HAVE_JDK_1.5" > + <mkdir dir="${jboss.home}/server/default/conf/opends"/> + <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true" failonerror="false"> + <fileset dir="../test/output/etc/opends"/> + </copy> + <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true" failonerror="false"> + <fileset dir="./output/etc/opends"/> + </copy> + <copy file="${build.lib}/opends.sar" todir="${jboss.home}/server/${portal.deploy.dir}" failonerror="false"/> + </target> + + + <target name="deploy-ldap" depends="init, package-tests" if="HAVE_JDK_1.5" > <mkdir dir="${jboss.home}/server/default/conf/opends"/> <copy todir="${jboss.home}/server/default/conf/opends" overwrite="true" failonerror="false"> Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-05-17 10:17:48 UTC (rev 7268) +++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-05-17 10:27:41 UTC (rev 7269) @@ -60,6 +60,8 @@ private boolean synchronizeNonExistingUsers = true; + private boolean enableSynchronizedUsers = true; + private boolean acceptOtherImplementations = true; private String defaultSynchronizePassword; @@ -234,7 +236,14 @@ hu.updatePassword(password.toString()); } session = getCurrentSession(); + + //so if we synchronize from LDAP lets make the user enabled + if (isEnableSynchronizedUsers()) + { + hu.setEnabled(true); + } session.save(hu); + return hu; } catch (HibernateException e) @@ -285,7 +294,16 @@ this.synchronizeNonExistingUsers = synchronizeNonExistingUsers; } + public boolean isEnableSynchronizedUsers() + { + return enableSynchronizedUsers; + } + public void setEnableSynchronizedUsers(boolean enableSynchronizedUsers) + { + this.enableSynchronizedUsers = enableSynchronizedUsers; + } + public boolean isAcceptOtherImplementations() { return acceptOtherImplementations;