Index: src/test/java/org/appfuse/service/impl/GenericManagerTest.java =================================================================== --- src/test/java/org/appfuse/service/impl/GenericManagerTest.java (revision 1953) +++ src/test/java/org/appfuse/service/impl/GenericManagerTest.java (working copy) @@ -1,6 +1,6 @@ package org.appfuse.service.impl; -import org.appfuse.dao.Dao; +import org.appfuse.dao.UniversalDao; import org.appfuse.model.User; import org.jmock.Mock; import org.springframework.orm.ObjectRetrievalFailureException; @@ -14,8 +14,8 @@ protected void setUp() throws Exception { super.setUp(); - dao = new Mock(Dao.class); - manager.setDao((Dao) dao.proxy()); + dao = new Mock(UniversalDao.class); + manager.setDao((UniversalDao) dao.proxy()); } protected void tearDown() throws Exception { @@ -33,7 +33,7 @@ // create // set expectations - dao.expects(once()).method("saveObject").isVoid(); + dao.expects(once()).method("save").isVoid(); manager.saveObject(user); dao.verify(); @@ -41,14 +41,14 @@ // retrieve dao.reset(); // expectations - dao.expects(once()).method("getObject").will(returnValue(user)); + dao.expects(once()).method("get").will(returnValue(user)); user = (User) manager.getObject(User.class, user.getUsername()); dao.verify(); // update dao.reset(); - dao.expects(once()).method("saveObject").isVoid(); + dao.expects(once()).method("save").isVoid(); user.getAddress().setCountry("USA"); manager.saveObject(user); dao.verify(); @@ -57,8 +57,8 @@ dao.reset(); // expectations Exception ex = new ObjectRetrievalFailureException(User.class, "foo"); - dao.expects(once()).method("removeObject").isVoid(); - dao.expects(once()).method("getObject").will(throwException(ex)); + dao.expects(once()).method("remove").isVoid(); + dao.expects(once()).method("get").will(throwException(ex)); manager.removeObject(User.class, "foo"); try { manager.getObject(User.class, "foo"); Index: src/test/java/org/appfuse/service/impl/UserManagerImplTest.java =================================================================== --- src/test/java/org/appfuse/service/impl/UserManagerImplTest.java (revision 1953) +++ src/test/java/org/appfuse/service/impl/UserManagerImplTest.java (working copy) @@ -35,7 +35,7 @@ User testData = new User("1"); testData.getRoles().add(new Role("user")); // set expected behavior on dao - userDao.expects(once()).method("getUser") + userDao.expects(once()).method("get") .with(eq(new Long(1))).will(returnValue(testData)); User user = userManager.getUser("1"); @@ -48,7 +48,7 @@ User testData = new User("1"); testData.getRoles().add(new Role("user")); // set expected behavior on dao - userDao.expects(once()).method("getUser") + userDao.expects(once()).method("get") .with(eq(new Long(1))).will(returnValue(testData)); User user = userManager.getUser("1"); @@ -91,13 +91,13 @@ // reset expectations userDao.reset(); - userDao.expects(once()).method("removeUser").with(eq(new Long(5))); + userDao.expects(once()).method("remove").with(eq(new Long(5))); userManager.removeUser("5"); userDao.verify(); // reset expectations userDao.reset(); - userDao.expects(once()).method("getUser").will(returnValue(null)); + userDao.expects(once()).method("get").will(returnValue(null)); user = userManager.getUser("5"); assertNull(user); userDao.verify(); Index: src/main/java/org/appfuse/service/impl/BaseManager.java =================================================================== --- src/main/java/org/appfuse/service/impl/BaseManager.java (revision 1953) +++ src/main/java/org/appfuse/service/impl/BaseManager.java (working copy) @@ -5,7 +5,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.appfuse.dao.Dao; +import org.appfuse.dao.UniversalDao; import org.appfuse.service.Manager; /** @@ -18,12 +18,12 @@ */ public class BaseManager implements Manager { protected final Log log = LogFactory.getLog(getClass()); - protected Dao dao = null; + protected UniversalDao dao = null; /** - * @see org.appfuse.service.Manager#setDao(org.appfuse.dao.Dao) + * @see org.appfuse.service.Manager#setDao(org.appfuse.dao.UniversalDao) */ - public void setDao(Dao dao) { + public void setDao(UniversalDao dao) { this.dao = dao; } @@ -31,27 +31,27 @@ * @see org.appfuse.service.Manager#getObject(java.lang.Class, java.io.Serializable) */ public Object getObject(Class clazz, Serializable id) { - return dao.getObject(clazz, id); + return dao.get(clazz, id); } /** * @see org.appfuse.service.Manager#getObjects(java.lang.Class) */ public List getObjects(Class clazz) { - return dao.getObjects(clazz); + return dao.getAll(clazz); } /** * @see org.appfuse.service.Manager#removeObject(java.lang.Class, java.io.Serializable) */ public void removeObject(Class clazz, Serializable id) { - dao.removeObject(clazz, id); + dao.remove(clazz, id); } /** * @see org.appfuse.service.Manager#saveObject(java.lang.Object) */ public void saveObject(Object o) { - dao.saveObject(o); + dao.save(o); } } Index: src/main/java/org/appfuse/service/impl/UserManagerImpl.java =================================================================== --- src/main/java/org/appfuse/service/impl/UserManagerImpl.java (revision 1953) +++ src/main/java/org/appfuse/service/impl/UserManagerImpl.java (working copy) @@ -34,14 +34,14 @@ * @see org.appfuse.service.UserManager#getUser(java.lang.String) */ public User getUser(String userId) { - return dao.getUser(new Long(userId)); + return dao.get(new Long(userId)); } /** * @see org.appfuse.service.UserManager#getUsers(org.appfuse.model.User) */ public List getUsers(User user) { - return dao.getUsers(user); + return dao.getUsers(); } /** @@ -67,7 +67,7 @@ log.debug("removing user: " + userId); } - dao.removeUser(new Long(userId)); + dao.remove(new Long(userId)); } public User getUserByUsername(String username) throws UsernameNotFoundException { Index: src/main/java/org/appfuse/service/impl/RoleManagerImpl.java =================================================================== --- src/main/java/org/appfuse/service/impl/RoleManagerImpl.java (revision 1953) +++ src/main/java/org/appfuse/service/impl/RoleManagerImpl.java (working copy) @@ -20,8 +20,8 @@ this.dao = dao; } - public List getRoles(Role role) { - return dao.getRoles(role); + public List getRoles(Role role) { + return dao.getAll(); } public Role getRole(String rolename) { @@ -29,7 +29,7 @@ } public void saveRole(Role role) { - dao.saveRole(role); + dao.save(role); } public void removeRole(String rolename) { Index: src/main/java/org/appfuse/service/Manager.java =================================================================== --- src/main/java/org/appfuse/service/Manager.java (revision 1953) +++ src/main/java/org/appfuse/service/Manager.java (working copy) @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import org.appfuse.dao.Dao; +import org.appfuse.dao.UniversalDao; public interface Manager { @@ -11,7 +11,7 @@ * Expose the setDao method for testing purposes * @param dao */ - public void setDao(Dao dao); + public void setDao(UniversalDao dao); /** * Generic method used to get a all objects of a particular type. Index: src/main/resources/applicationContext-service.xml =================================================================== --- src/main/resources/applicationContext-service.xml (revision 1953) +++ src/main/resources/applicationContext-service.xml (working copy) @@ -35,7 +35,7 @@ - +