[jboss-svn-commits] JBL Code SVN: r33137 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: java/org/jboss/labs/sbs/plugin/nukesauth/dao and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri May 28 06:09:20 EDT 2010


Author: lkrzyzanek
Date: 2010-05-28 06:09:19 -0400 (Fri, 28 May 2010)
New Revision: 33137

Added:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java
Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
Log:
ORG-606 - Implemented:
Synchronizing SBS password from nukes
Set synchronized to true after successful synchronization
NukesUserDAO 

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -25,8 +25,10 @@
 import java.util.List;
 
 import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.providers.encoding.PasswordEncoder;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
+import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUserDAO;
 
 /**
  * Database implementation of manager
@@ -35,11 +37,23 @@
  */
 public class NukesAccountManagerImpl implements NukesAccountManager {
 
+  private NukesUserDAO nukesUserDAO;
+
+  private PasswordEncoder passwordEncoder;
+
   @Override
   public void authenticateNukesUser(String username, String password) throws UsernameNotFoundException,
       BadCredentialsException {
-    // TODO Auto-generated method stub
+    NukesUser nukesUser = nukesUserDAO.getNukesUser(username);
+    if (nukesUser == null) {
+      throw new UsernameNotFoundException("User '" + username + "' not found.");
+    }
 
+    String hash = passwordEncoder.encodePassword(password, null);
+
+    if (!hash.equals(nukesUser.getPasswordHash())) {
+      throw new BadCredentialsException("Password is not valid for specified username");
+    }
   }
 
   @Override
@@ -50,7 +64,16 @@
 
   @Override
   public List<NukesUser> getNukesAccountsByEmail(String email) {
+    // TODO Implement
     return new ArrayList<NukesUser>();
   }
 
+  public void setNukesUserDAO(NukesUserDAO nukesUserDAO) {
+    this.nukesUserDAO = nukesUserDAO;
+  }
+
+  public void setPasswordEncoder(PasswordEncoder passwordEncoder) {
+    this.passwordEncoder = passwordEncoder;
+  }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManager.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -23,7 +23,7 @@
 
 import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
 
-import com.jivesoftware.base.User;
+import com.jivesoftware.base.UserNotFoundException;
 
 /**
  * Manager for SBS Accounts
@@ -38,11 +38,12 @@
   public void createAccount(NukesUser nukesUser);
 
   /**
-   * Update password. No events is not fired
+   * Update password.
    * 
-   * @param user
+   * @param username
    * @param password
+   * @throws UserNotFoundException
    */
-  public void updatePassword(User user, String password);
+  public void updatePassword(String username, String password) throws UserNotFoundException;
 
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -21,10 +21,16 @@
  */
 package org.jboss.labs.sbs.plugin.nukesauth;
 
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
 
 import com.jivesoftware.base.User;
+import com.jivesoftware.base.UserAlreadyExistsException;
 import com.jivesoftware.base.UserManager;
+import com.jivesoftware.base.UserNotFoundException;
+import com.jivesoftware.base.UserTemplate;
+import com.jivesoftware.community.JiveRuntimeException;
 
 /**
  * Implementation of SBS Account manager
@@ -32,7 +38,7 @@
  * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
  */
 public class SbsAccountManagerImpl implements SbsAccountManager {
-
+  private static final Logger log = LogManager.getLogger(SbsAccountManagerImpl.class);
   private UserManager userManager;
 
   @Override
@@ -42,9 +48,17 @@
   }
 
   @Override
-  public void updatePassword(User user, String password) {
-    // TODO Auto-generated method stub
-
+  public void updatePassword(String username, String password) throws UserNotFoundException {
+    User user = userManager.getUser(username);
+    UserTemplate userTemplate = new UserTemplate(user);
+    userTemplate.setPassword(password);
+    try {
+      userManager.updateUser(userTemplate);
+    } catch (UserAlreadyExistsException e) {
+      // throws only when username is changed.
+      // It's not this case.
+      throw new JiveRuntimeException(e);
+    }
   }
 
   public void setUserManager(UserManager userManager) {

Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -0,0 +1,47 @@
+/*
+ * JBoss Community http://jboss.org/
+ *
+ * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT A WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License, v.2.1 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Red Hat Author(s): Libor Krzyzanek
+ */
+package org.jboss.labs.sbs.plugin.nukesauth.dao;
+
+import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
+
+/**
+ * Database implementation of {@link NukesUserDAO}
+ * 
+ * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
+ */
+public class DbNukesUserDAOImpl extends SimpleJdbcDaoSupport implements NukesUserDAO {
+
+  private static final String SELECT_USER_BY_USERNAME = "SELECT * FROM nuke_users WHERE pn_uname = ?";
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUserDAO#getNukesUser(java.
+   * lang.String)
+   */
+  @Override
+  public NukesUser getNukesUser(String username) {
+    return getSimpleJdbcTemplate().queryForObject(SELECT_USER_BY_USERNAME, new NukesUserMapper(), username);
+  }
+
+}


Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUser.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -31,6 +31,10 @@
   private String username;
 
   private String email;
+  
+  private String password;
+  
+  private String passwordHash;
 
   public String getUsername() {
     return username;
@@ -48,4 +52,20 @@
     this.email = email;
   }
 
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPasswordHash(String passwordHash) {
+    this.passwordHash = passwordHash;
+  }
+
+  public String getPasswordHash() {
+    return passwordHash;
+  }
+
 }

Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -0,0 +1,39 @@
+/*
+ * JBoss Community http://jboss.org/
+ *
+ * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT A WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License, v.2.1 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Red Hat Author(s): Libor Krzyzanek
+ */
+package org.jboss.labs.sbs.plugin.nukesauth.dao;
+
+/**
+ * DAO for {@link NukesUser} object
+ * 
+ * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
+ */
+public interface NukesUserDAO {
+
+  /**
+   * Get NukesUser
+   * 
+   * @param username
+   * @return nukes user or null if no account matches username
+   */
+  public NukesUser getNukesUser(String username);
+
+}


Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserDAO.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -0,0 +1,47 @@
+/*
+ * JBoss Community http://jboss.org/
+ *
+ * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT A WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License, v.2.1 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Red Hat Author(s): Libor Krzyzanek
+ */
+package org.jboss.labs.sbs.plugin.nukesauth.dao;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+
+/**
+ * Spring Mapper between result set and {@link NukesUser} bean
+ * 
+ * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
+ */
+public class NukesUserMapper implements ParameterizedRowMapper<NukesUser> {
+
+  @Override
+  public NukesUser mapRow(ResultSet rs, int rowNum) throws SQLException {
+    NukesUser bean = new NukesUser();
+
+    bean.setUsername(rs.getString("pn_uname"));
+    bean.setEmail(rs.getString("pn_email"));
+    bean.setPasswordHash(rs.getString("pn_pass"));
+
+    return bean;
+  }
+
+}


Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/NukesUserMapper.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java	2010-05-28 10:09:19 UTC (rev 33137)
@@ -43,6 +43,7 @@
 import com.jivesoftware.base.UserManager;
 import com.jivesoftware.base.UserNotFoundException;
 import com.jivesoftware.community.aaa.JiveAuthenticationProcessingFilter;
+import com.jivesoftware.community.user.profile.ProfileField;
 import com.jivesoftware.community.user.profile.ProfileFieldValue;
 import com.jivesoftware.community.user.profile.ProfileManager;
 
@@ -86,8 +87,8 @@
     HttpServletResponse httpResponse = (HttpServletResponse) response;
 
     if (requiresAuthentication(httpRequest, httpResponse)) {
-      String username = obtainUsername(httpRequest);
-      String password = obtainPassword(httpRequest);
+      final String username = obtainUsername(httpRequest);
+      final String password = obtainPassword(httpRequest);
 
       if ("admin".equals(username)) {
         chain.doFilter(request, response);
@@ -102,6 +103,11 @@
           chain.doFilter(request, response);
           return;
         }
+        if (!user.isEnabled()) {
+          log.debug("User is disabled");
+          chain.doFilter(request, response);
+          return;
+        }
       } catch (UserNotFoundException e) {
         // let continue and try nukes authentication
       }
@@ -109,43 +115,63 @@
       if (log.isInfoEnabled()) {
         log.info("Synchronize Nukes account: " + username);
       }
+      boolean setSynchronized = true;
       try {
         nukesAccountManager.authenticateNukesUser(username, password);
+        log.info("Nukes account successfuly authenticated");
       } catch (AuthenticationException failed) {
+        log.info("Cannot authenticate nukes user. " + failed.getMessage());
         // Authentication failed - let following filters to handle 'not
         // authorized' action
         chain.doFilter(request, response);
         return;
       }
 
-      if (user != null) {
-        log.debug("SBS account exists");
-        List<NukesUser> nukesAccounts = nukesAccountManager.getNukesAccountsByEmail(user.getEmail());
+      try {
+        if (user != null) {
+          log.debug("SBS account exists");
+          List<NukesUser> nukesAccounts = nukesAccountManager.getNukesAccountsByEmail(user.getEmail());
 
-        if (nukesAccounts.size() > 1) {
-          // TODO: handle one SBS account and more nukes accounts
+          if (nukesAccounts.size() > 1) {
+            // TODO: handle one SBS account and more nukes accounts
 
-          // update Nukes duplicate accounts
+            // update Nukes duplicate accounts
+          } else {
+            sbsAccountManager.updatePassword(username, password);
+          }
         } else {
-          sbsAccountManager.updatePassword(user, password);
+          log.debug("SBS account does NOT exist");
+          NukesUser nukesUser = nukesAccountManager.getAccountByUsername(username);
+
+          List<NukesUser> dupliciteAccounts = nukesAccountManager.getNukesAccountsByEmail(nukesUser.getEmail());
+          // TODO: Check if we don't have SBS accounts without Nukes account
+          if (dupliciteAccounts.size() > 1) {
+            // TODO: Handle No SBS account and duplicate Nukes accounts.
+          } else {
+            log.info("No SBS accoutn and one nukes account. Going to create SBS account");
+            sbsAccountManager.createAccount(nukesUser);
+          }
         }
-      } else {
-        log.debug("SBS account does NOT exist");
-        NukesUser nukesUser = nukesAccountManager.getAccountByUsername(username);
+      } catch (Exception e) {
+        log.fatal("Cannot synchronize nukes user account.", e);
+        setSynchronized = false;
+      }
 
-        List<NukesUser> dupliciteAccounts = nukesAccountManager.getNukesAccountsByEmail(nukesUser.getEmail());
-        // TODO: Check if we don't have SBS accounts without Nukes account
-        if (dupliciteAccounts.size() > 1) {
-          // TODO: Handle No SBS account and duplicate Nukes accounts.
-        } else {
-          log.info("No SBS accoutn and one nukes account. Going to create SBS account");
-          sbsAccountManager.createAccount(nukesUser);
+      if (setSynchronized) {
+        log.trace("set account synchronized flag to true");
+        Map<Long, ProfileFieldValue> profile = profileManager.getProfile(user);
+        ProfileFieldValue accountSync = profile.get(accountSynchronizedFiled);
+        if (accountSync == null) {
+          accountSync = new ProfileFieldValue(accountSynchronizedFiled, ProfileField.Type.BOOLEAN.getID());
         }
+        accountSync.setValue("true");
+        profile.put(accountSynchronizedFiled, accountSync);
+        profileManager.setProfile(user, profile.values());
+        log.info("Account is fully synchronized");
+      } else {
+        log.fatal("Error occured during synchronization of user: " + username);
       }
 
-      // TODO set account synchronized flag to true
-      log.info("Account is fully synchronized");
-
     }
     chain.doFilter(request, response);
   }
@@ -153,7 +179,6 @@
   private boolean isAccountSynchronized(User user) {
     Map<Long, ProfileFieldValue> profile = profileManager.getProfile(user);
     ProfileFieldValue accountSync = profile.get(accountSynchronizedFiled);
-    log.info("accountSync: " + accountSync);
 
     if (accountSync != null && "true".equalsIgnoreCase(accountSync.getValue())) {
       return true;

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml	2010-05-27 22:13:13 UTC (rev 33136)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml	2010-05-28 10:09:19 UTC (rev 33137)
@@ -15,20 +15,32 @@
     <property name="nukesAccountManager" ref="nukesAccountManager" />
     <property name="sbsAccountManager" ref="sbsAccountManager" />
     <property name="userManager" ref="userManager" />
-    <property name="profileManager" ref="profileManager" />
+    <property name="profileManager" ref="profileManagerImpl" />
     <property name="filterProcessesUrl">
       <value>/cs_login</value>     <!-- Must be exactly same like in formAuthenticationFilter -->
     </property>
   </bean>
 
+  <bean id="nukesPasswordEncoder"
+    class="org.acegisecurity.providers.encoding.Md5PasswordEncoder">
+  </bean>
+
   <bean id="nukesAccountManager"
     class="org.jboss.labs.sbs.plugin.nukesauth.NukesAccountManagerImpl">
+    <property name="nukesUserDAO" ref="nukesUserDAO" />
+    <property name="passwordEncoder" ref="nukesPasswordEncoder" />
   </bean>
 
   <bean id="sbsAccountManager"
     class="org.jboss.labs.sbs.plugin.nukesauth.SbsAccountManagerImpl">
-    <property name="userManager" ref="userManager" />
+    <property name="userManager" ref="userManagerImpl" />
   </bean>
 
 
+  <bean id="nukesUserDAO"
+    class="org.jboss.labs.sbs.plugin.nukesauth.dao.DbNukesUserDAOImpl">
+    <property name="dataSource" ref="nukesUsersDataSource" />
+  </bean>
+
+
 </beans>



More information about the jboss-svn-commits mailing list