Author: bdaw Date: 2006-12-15 10:15:26 -0500 (Fri, 15 Dec 2006) New Revision: 5871 Modified: trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java trunk/identity/src/main/org/jboss/portal/identity2/User.java trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java Log: - correct User interface Modified: trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java 2006-12-15 15:09:02 UTC (rev 5870) +++ trunk/identity/src/main/org/jboss/portal/identity2/IdentityServiceControllerImpl.java 2006-12-15 15:15:26 UTC (rev 5871) @@ -262,7 +262,7 @@ //moduleService.setIdentityContext(identityContext); //register as an mbean - if (isRegisterMBeans()) + if (isRegisterMBeans() && (ds.getServiceName() != null)) { getServer().registerMBean(datasource, new ObjectName(ds.getServiceName())); } @@ -342,7 +342,7 @@ //moduleService.setIdentityContext(identityContext); //register as an mbean - if (isRegisterMBeans()) + if (isRegisterMBeans() && (module.getServiceName() != null)) { getServer().registerMBean(moduleService, new ObjectName(module.getServiceName())); } Modified: trunk/identity/src/main/org/jboss/portal/identity2/User.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity2/User.java 2006-12-15 15:09:02 UTC (rev 5870) +++ trunk/identity/src/main/org/jboss/portal/identity2/User.java 2006-12-15 15:15:26 UTC (rev 5871) @@ -75,12 +75,6 @@ /** Set the password using proper encoding. */ public void updatePassword(String password); - /** Set the password value directly */ - public void setPassword(String password); - - /** Returns password value */ - public String getPassword(); - /** Return true if the password is valid. */ public boolean validatePassword(String password); } Modified: trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java 2006-12-15 15:09:02 UTC (rev 5870) +++ trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java 2006-12-15 15:15:26 UTC (rev 5871) @@ -61,6 +61,8 @@ private boolean acceptOtherImplementations = true; + private String defaultSynchronizePassword; + protected void startService() throws Exception { // @@ -211,7 +213,11 @@ try { hu = new HibernateUserImpl(user.getUserName()); - user.updatePassword(user.getPassword()); + //user.updatePassword(user.getPassword()); + if (defaultSynchronizePassword != null) + { + user.updatePassword(getDefaultSynchronizePassword()); + } session = getCurrentSession(); session.save(hu); return hu; @@ -274,4 +280,15 @@ { this.acceptOtherImplementations = acceptOtherImplementations; } + + public String getDefaultSynchronizePassword() + { + return defaultSynchronizePassword; + } + + public void setDefaultSynchronizePassword(String defaultSynchronizePassword) + { + this.defaultSynchronizePassword = defaultSynchronizePassword; + } } +