Index: service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java
===================================================================
--- service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java	(revision 2634)
+++ service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java	(working copy)
@@ -8,7 +8,6 @@
 import org.acegisecurity.context.SecurityContextHolder;
 import org.acegisecurity.context.SecurityContextImpl;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.dao.UserCache;
 import org.appfuse.Constants;
 import org.appfuse.dao.UserDao;
 import org.appfuse.model.Role;
Index: service/src/main/java/org/appfuse/service/LookupManager.java
===================================================================
--- service/src/main/java/org/appfuse/service/LookupManager.java	(revision 2634)
+++ service/src/main/java/org/appfuse/service/LookupManager.java	(working copy)
@@ -2,11 +2,8 @@
 
 import java.util.List;
 
-import org.appfuse.dao.LookupDao;
-import org.appfuse.model.Role;
 import org.appfuse.model.LabelValue;
 
-
 /**
  * Business Service Interface to talk to persistence layer and
  * retrieve values for drop-down choice lists.
Index: data/hibernate/src/main/java/org/appfuse/dao/hibernate/LookupDaoHibernate.java
===================================================================
--- data/hibernate/src/main/java/org/appfuse/dao/hibernate/LookupDaoHibernate.java	(revision 2634)
+++ data/hibernate/src/main/java/org/appfuse/dao/hibernate/LookupDaoHibernate.java	(working copy)
@@ -15,7 +15,8 @@
     /**
      * @see org.appfuse.dao.LookupDao#getRoles()
      */
-    public List<Role> getRoles() {
+    @SuppressWarnings("unchecked")
+	public List<Role> getRoles() {
         log.debug("retrieving all role names...");
 
         return getHibernateTemplate().find("from Role order by name");
Index: data/hibernate/src/main/java/org/appfuse/dao/hibernate/GenericDaoHibernate.java
===================================================================
--- data/hibernate/src/main/java/org/appfuse/dao/hibernate/GenericDaoHibernate.java	(revision 2634)
+++ data/hibernate/src/main/java/org/appfuse/dao/hibernate/GenericDaoHibernate.java	(working copy)
@@ -1,7 +1,6 @@
 package org.appfuse.dao.hibernate;
 
 import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -33,11 +32,13 @@
         this.persistentClass = persistentClass;
     }
 
-    public List<T> getAll() {
+    @SuppressWarnings("unchecked")
+	public List<T> getAll() {
         return super.getHibernateTemplate().loadAll(this.persistentClass);
     }
 
-    public T get(PK id) {
+    @SuppressWarnings("unchecked")
+	public T get(PK id) {
         T entity = (T) super.getHibernateTemplate().get(this.persistentClass, id);
 
         if (entity == null) {
@@ -48,7 +49,8 @@
         return entity;
     }
     
-    public boolean exists(PK id) {
+    @SuppressWarnings("unchecked")
+	public boolean exists(PK id) {
         T entity = (T) super.getHibernateTemplate().get(this.persistentClass, id);
         if (entity == null) {
             return false;
@@ -57,8 +59,9 @@
         }
     }
 
-    public T save(T object) {
-        return (T)super.getHibernateTemplate().merge(object);
+    @SuppressWarnings("unchecked")
+	public T save(T object) {
+        return (T) super.getHibernateTemplate().merge(object);
     }
 
     public void remove(PK id) {
Index: data/hibernate/src/main/java/org/appfuse/dao/hibernate/UserDaoHibernate.java
===================================================================
--- data/hibernate/src/main/java/org/appfuse/dao/hibernate/UserDaoHibernate.java	(revision 2634)
+++ data/hibernate/src/main/java/org/appfuse/dao/hibernate/UserDaoHibernate.java	(working copy)
@@ -27,7 +27,8 @@
     /**
      * @see org.appfuse.dao.UserDao#getUsers()
      */
-    public List<User> getUsers() {
+    @SuppressWarnings("unchecked")
+	public List<User> getUsers() {
         return getHibernateTemplate().find("from User u order by upper(u.username)");
     }
 
Index: data/hibernate/src/main/java/org/appfuse/dao/spring/HibernateExtensionPostProcessor.java
===================================================================
--- data/hibernate/src/main/java/org/appfuse/dao/spring/HibernateExtensionPostProcessor.java	(revision 2634)
+++ data/hibernate/src/main/java/org/appfuse/dao/spring/HibernateExtensionPostProcessor.java	(working copy)
@@ -55,7 +55,8 @@
     /**
      * Adds the annotated classes and the mapping resources to the existing Session Factory configuration.
      */
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory configurableListableBeanFactory) throws BeansException {
+    @SuppressWarnings("unchecked")
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory configurableListableBeanFactory) throws BeansException {
         if (configurableListableBeanFactory.containsBean(sessionFactoryBeanName)) {
             BeanDefinition sessionFactoryBeanDefinition = configurableListableBeanFactory.getBeanDefinition(sessionFactoryBeanName);
             MutablePropertyValues propertyValues = sessionFactoryBeanDefinition.getPropertyValues();
Index: data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnGetterSubclass.java
===================================================================
--- data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnGetterSubclass.java	(revision 2634)
+++ data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnGetterSubclass.java	(working copy)
@@ -1,7 +1,6 @@
 package org.appfuse.dao.jpa.mock;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 
 import org.appfuse.model.Role;
 
Index: data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubSubclass.java
===================================================================
--- data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubSubclass.java	(revision 2634)
+++ data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubSubclass.java	(working copy)
@@ -1,7 +1,6 @@
 package org.appfuse.dao.jpa.mock;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 
 /**
  * @author <a href="mailto:bwnoll@gmail.com">Bryan Noll</a>
Index: data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubclass.java
===================================================================
--- data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubclass.java	(revision 2634)
+++ data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleIdOnAttributeSubclass.java	(working copy)
@@ -1,7 +1,6 @@
 package org.appfuse.dao.jpa.mock;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 
 /**
  * @author <a href="mailto:bwnoll@gmail.com">Bryan Noll</a>
Index: data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRole.java
===================================================================
--- data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRole.java	(revision 2634)
+++ data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRole.java	(working copy)
@@ -1,11 +1,9 @@
 package org.appfuse.dao.jpa.mock;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
Index: data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleBadGetter.java
===================================================================
--- data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleBadGetter.java	(revision 2634)
+++ data/jpa-hibernate/src/test/java/org/appfuse/dao/jpa/mock/MockRoleBadGetter.java	(working copy)
@@ -1,11 +1,9 @@
 package org.appfuse.dao.jpa.mock;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
Index: data/jpa-hibernate/src/main/java/org/appfuse/dao/BaseDaoTestCase.java
===================================================================
--- data/jpa-hibernate/src/main/java/org/appfuse/dao/BaseDaoTestCase.java	(revision 2634)
+++ data/jpa-hibernate/src/main/java/org/appfuse/dao/BaseDaoTestCase.java	(working copy)
@@ -9,7 +9,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 import org.springframework.test.jpa.AbstractJpaTests;
 
 /**
Index: data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UniversalDaoJpa.java
===================================================================
--- data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UniversalDaoJpa.java	(revision 2634)
+++ data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UniversalDaoJpa.java	(working copy)
@@ -37,7 +37,8 @@
     /**
      * @see org.appfuse.dao.UniversalDao#get(java.lang.Class, java.io.Serializable)
      */
-    public Object get(Class clazz, Serializable id) {
+    @SuppressWarnings("unchecked")
+	public Object get(Class clazz, Serializable id) {
         Object o = this.entityManager.find(clazz, id);
 
         if (o == null) {
Index: data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/LookupDaoJpa.java
===================================================================
--- data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/LookupDaoJpa.java	(revision 2634)
+++ data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/LookupDaoJpa.java	(working copy)
@@ -15,7 +15,8 @@
     /**
      * @see org.appfuse.dao.LookupDao#getRoles()
      */
-    public List<Role> getRoles() {
+    @SuppressWarnings("unchecked")
+	public List<Role> getRoles() {
         log.debug("retrieving all role names...");
 
         return super.entityManager.createQuery(
Index: data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/GenericDaoJpa.java
===================================================================
--- data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/GenericDaoJpa.java	(revision 2634)
+++ data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/GenericDaoJpa.java	(working copy)
@@ -40,7 +40,8 @@
         this.entityManager = entityManager;
     }
 
-    public List<T> getAll() {
+    @SuppressWarnings("unchecked")
+	public List<T> getAll() {
         return this.entityManager.createQuery(
                 "select obj from " + this.persistentClass.getName() + " obj")
                 .getResultList();
Index: data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UserDaoJpa.java
===================================================================
--- data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UserDaoJpa.java	(revision 2634)
+++ data/jpa-hibernate/src/main/java/org/appfuse/dao/jpa/UserDaoJpa.java	(working copy)
@@ -30,7 +30,8 @@
     /**
      * @see org.appfuse.dao.UserDao#getUsers()
      */
-    public List getUsers() {
+    @SuppressWarnings("unchecked")
+	public List<User> getUsers() {
         Query q = this.entityManager.createQuery("select u from User u order by upper(u.username)");
         return q.getResultList();
     }
@@ -38,15 +39,16 @@
     /** 
     * @see org.acegisecurity.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
     */
-    @Transactional
+    @SuppressWarnings("unchecked")
+	@Transactional
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         Query q = this.entityManager.createQuery("select u from User u where username=?");
         q.setParameter(1, username);
-        List users = q.getResultList();
+        List<User> users = q.getResultList();
         if (users == null || users.isEmpty()) {
             throw new UsernameNotFoundException("user '" + username + "' not found...");
         } else {
-            return (UserDetails) users.get(0);
+            return users.get(0);
         }
     }
     
Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/iBatisDaoUtils.java
===================================================================
--- data/ibatis/src/main/java/org/appfuse/dao/ibatis/iBatisDaoUtils.java	(revision 2634)
+++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/iBatisDaoUtils.java	(working copy)
@@ -36,8 +36,8 @@
         String getterMethod = "get" + Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); 
         
         try {
-            Method getMethod = o.getClass().getMethod(getterMethod, null);
-            return getMethod.invoke(o, null);
+            Method getMethod = o.getClass().getMethod(getterMethod, (Class[]) null);
+            return getMethod.invoke(o, (Object[]) null);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("Could not invoke method '" + getterMethod + "' on " + ClassUtils.getShortName(o.getClass()));
@@ -51,8 +51,8 @@
             for (Field fld : fieldlist) {
                 String fieldName = fld.getName();
                 if (fieldName.equals("version")) {
-                    Method setMethod = o.getClass().getMethod("setVersion", Integer.class);
-                    Object value = o.getClass().getMethod("getVersion", null).invoke(o, null);
+                    Method setMethod = o.getClass().getMethod("setVersion", new Class[] {Integer.class});
+                    Object value = o.getClass().getMethod("getVersion", (Class[]) null).invoke(o, (Object[]) null);
                     if (value == null) {
                         setMethod.invoke(o, 1);
                     } else {
Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/UniversalDaoiBatis.java
===================================================================
--- data/ibatis/src/main/java/org/appfuse/dao/ibatis/UniversalDaoiBatis.java	(revision 2634)
+++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/UniversalDaoiBatis.java	(working copy)
@@ -1,8 +1,6 @@
 package org.appfuse.dao.ibatis;
 
 import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/LookupDaoiBatis.java
===================================================================
--- data/ibatis/src/main/java/org/appfuse/dao/ibatis/LookupDaoiBatis.java	(revision 2634)
+++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/LookupDaoiBatis.java	(working copy)
@@ -15,7 +15,8 @@
     /**
      * @see org.appfuse.dao.LookupDao#getRoles()
      */
-    public List<Role> getRoles() {
+    @SuppressWarnings("unchecked")
+	public List<Role> getRoles() {
         logger.debug("retrieving all role names...");
 
         return getSqlMapClientTemplate().queryForList("getRoles", null);
Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java
===================================================================
--- data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java	(revision 2634)
+++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java	(working copy)
@@ -34,11 +34,13 @@
         this.persistentClass = persistentClass;
     }
 
-    public List<T> getAll() {
+    @SuppressWarnings("unchecked")
+	public List<T> getAll() {
         return getSqlMapClientTemplate().queryForList(iBatisDaoUtils.getSelectQuery(ClassUtils.getShortName(this.persistentClass)), null);
     }
 
-    public T get(PK id) {
+    @SuppressWarnings("unchecked")
+	public T get(PK id) {
         T object = (T) getSqlMapClientTemplate().queryForObject(iBatisDaoUtils.getFindQuery(ClassUtils.getShortName(this.persistentClass)), id);
         if (object == null) {
             log.warn("Uh oh, '" + this.persistentClass + "' object with id '" + id + "' not found...");
@@ -47,7 +49,8 @@
         return object;
     }
     
-    public boolean exists(PK id) {
+    @SuppressWarnings("unchecked")
+	public boolean exists(PK id) {
         T object = (T) getSqlMapClientTemplate().queryForObject(iBatisDaoUtils.getFindQuery(ClassUtils.getShortName(this.persistentClass)), id);
         if (object == null) {
             return false;
Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/UserDaoiBatis.java
===================================================================
--- data/ibatis/src/main/java/org/appfuse/dao/ibatis/UserDaoiBatis.java	(revision 2634)
+++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/UserDaoiBatis.java	(working copy)
@@ -31,7 +31,8 @@
      * @param userId the user's id
      * @return a populated user object
      */
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     public User get(Long userId) {
         User user = (User) getSqlMapClientTemplate().queryForObject("getUser", userId);
 
@@ -49,7 +50,8 @@
     /**
      * @see org.appfuse.dao.UserDao#getUsers()
      */
-    public List<User> getUsers() {
+    @SuppressWarnings("unchecked")
+	public List<User> getUsers() {
         List users = getSqlMapClientTemplate().queryForList("getUsers", null);
 
         // get the roles for each user
@@ -115,7 +117,8 @@
     /** 
      * @see org.acegisecurity.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
      */
-     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+     @SuppressWarnings("unchecked")
+	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
          User user = (User) getSqlMapClientTemplate().queryForObject("getUserByUsername", username);
 
          if (user == null) {
Index: web/jsf/src/main/java/org/appfuse/webapp/action/UserForm.java
===================================================================
--- web/jsf/src/main/java/org/appfuse/webapp/action/UserForm.java	(revision 2634)
+++ web/jsf/src/main/java/org/appfuse/webapp/action/UserForm.java	(working copy)
@@ -187,7 +187,8 @@
     }
 
     // Form Controls ==========================================================
-    public Map<String, String> getAvailableRoles() {
+    @SuppressWarnings("unchecked")
+	public Map<String, String> getAvailableRoles() {
         if (availableRoles == null) {
             List roles = (List) getServletContext().getAttribute(Constants.AVAILABLE_ROLES);
             availableRoles = ConvertUtil.convertListToMap(roles);
Index: web/jsf/src/main/java/org/appfuse/webapp/action/CountryModel.java
===================================================================
--- web/jsf/src/main/java/org/appfuse/webapp/action/CountryModel.java	(revision 2634)
+++ web/jsf/src/main/java/org/appfuse/webapp/action/CountryModel.java	(working copy)
@@ -23,7 +23,8 @@
      *
      * @return List of LabelValues for all available countries.
      */
-    public Map<String, String> getCountries(Locale locale) {
+    @SuppressWarnings("unchecked")
+	public Map<String, String> getCountries(Locale locale) {
         if (availableCountries == null) {
             final String EMPTY = "";
             final Locale[] available = Locale.getAvailableLocales();
Index: web/jsf/src/main/java/org/appfuse/webapp/action/ActiveUserList.java
===================================================================
--- web/jsf/src/main/java/org/appfuse/webapp/action/ActiveUserList.java	(revision 2634)
+++ web/jsf/src/main/java/org/appfuse/webapp/action/ActiveUserList.java	(working copy)
@@ -15,7 +15,8 @@
         setSortColumn("username");
     }
     
-    public List getUsers() {
+    @SuppressWarnings("unchecked")
+	public List getUsers() {
         Set users = (Set) getServletContext().getAttribute(UserCounterListener.USERS_KEY);
         if (users != null) {
             return sort(new ArrayList<User>(users));
Index: web/jsf/src/main/java/org/appfuse/webapp/action/BasePage.java
===================================================================
--- web/jsf/src/main/java/org/appfuse/webapp/action/BasePage.java	(revision 2634)
+++ web/jsf/src/main/java/org/appfuse/webapp/action/BasePage.java	(working copy)
@@ -115,7 +115,8 @@
         }
     }
 
-    protected void addMessage(String key, Object arg) {
+    @SuppressWarnings("unchecked")
+	protected void addMessage(String key, Object arg) {
         // JSF Success Messages won't live past a redirect, so it's not used
         // FacesUtils.addInfoMessage(formatMessage(key, arg));
         List<String> messages = (List) getSession().getAttribute("messages");
@@ -132,7 +133,8 @@
         addMessage(key, null);
     }
 
-    protected void addError(String key, Object arg) {
+    @SuppressWarnings("unchecked")
+	protected void addError(String key, Object arg) {
         // The "JSF Way" doesn't allow you to put HTML in your error messages, so I don't use it.
         // FacesUtils.addErrorMessage(formatMessage(key, arg));
         List<String> errors = (List) getSession().getAttribute("errors");
Index: web/jsf/src/main/java/org/appfuse/webapp/util/FacesUtils.java
===================================================================
--- web/jsf/src/main/java/org/appfuse/webapp/util/FacesUtils.java	(revision 2634)
+++ web/jsf/src/main/java/org/appfuse/webapp/util/FacesUtils.java	(working copy)
@@ -58,7 +58,8 @@
      * @param beanName the name of the managed bean to be stored
      * @param managedBean the managed bean to be stored
      */
-    public static void setManagedBeanInSession(String beanName,
+    @SuppressWarnings("unchecked")
+	public static void setManagedBeanInSession(String beanName,
                                                Object managedBean) {
         FacesContext.getCurrentInstance().getExternalContext().getSessionMap()
                     .put(beanName, managedBean);
Index: web/spring/src/main/java/org/appfuse/webapp/controller/BaseFormController.java
===================================================================
--- web/spring/src/main/java/org/appfuse/webapp/controller/BaseFormController.java	(revision 2634)
+++ web/spring/src/main/java/org/appfuse/webapp/controller/BaseFormController.java	(working copy)
@@ -57,7 +57,8 @@
         return this.userManager;
     }
 
-    public void saveMessage(HttpServletRequest request, String msg) {
+    @SuppressWarnings("unchecked")
+	public void saveMessage(HttpServletRequest request, String msg) {
         List messages = (List) request.getSession().getAttribute(MESSAGES_KEY);
 
         if (messages == null) {
Index: web/spring/src/main/java/org/appfuse/webapp/controller/UserFormController.java
===================================================================
--- web/spring/src/main/java/org/appfuse/webapp/controller/UserFormController.java	(revision 2634)
+++ web/spring/src/main/java/org/appfuse/webapp/controller/UserFormController.java	(working copy)
@@ -24,8 +24,6 @@
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
-import org.springframework.web.bind.RequestUtils;
-import org.springframework.web.bind.ServletRequestUtils;
 
 /**
  * Implementation of <strong>SimpleFormController</strong> that interacts with
Index: web/spring/src/main/java/org/appfuse/webapp/controller/PasswordHintController.java
===================================================================
--- web/spring/src/main/java/org/appfuse/webapp/controller/PasswordHintController.java	(revision 2634)
+++ web/spring/src/main/java/org/appfuse/webapp/controller/PasswordHintController.java	(working copy)
@@ -95,7 +95,8 @@
         return new ModelAndView(new RedirectView(request.getContextPath()));
     }
 
-    public void saveError(HttpServletRequest request, String error) {
+    @SuppressWarnings("unchecked")
+	public void saveError(HttpServletRequest request, String error) {
         List errors = (List) request.getSession().getAttribute("errors");
         if (errors == null) {
             errors = new ArrayList();
@@ -105,7 +106,8 @@
     }
 
     // this method is also in BaseForm Controller
-    public void saveMessage(HttpServletRequest request, String msg) {
+    @SuppressWarnings("unchecked")
+	public void saveMessage(HttpServletRequest request, String msg) {
         List messages = (List) request.getSession().getAttribute(BaseFormController.MESSAGES_KEY);
         if (messages == null) {
             messages = new ArrayList();
Index: web/spring/src/main/java/org/appfuse/webapp/controller/ReloadController.java
===================================================================
--- web/spring/src/main/java/org/appfuse/webapp/controller/ReloadController.java	(revision 2634)
+++ web/spring/src/main/java/org/appfuse/webapp/controller/ReloadController.java	(working copy)
@@ -40,7 +40,7 @@
 
         if (referer != null) {
             log.info("reload complete, reloading user back to: " + referer);
-            List messages = new ArrayList();
+            List<String> messages = new ArrayList<String>();
             messages.add("Reloading options completed successfully.");
             request.getSession().setAttribute("messages", messages);
             response.sendRedirect(response.encodeRedirectURL(referer));
Index: web/struts/src/main/java/org/appfuse/webapp/taglib/CountryTag.java
===================================================================
--- web/struts/src/main/java/org/appfuse/webapp/taglib/CountryTag.java	(revision 2634)
+++ web/struts/src/main/java/org/appfuse/webapp/taglib/CountryTag.java	(working copy)
@@ -156,11 +156,12 @@
      *
      * @return List of LabelValues for all available countries.
      */
-    protected List buildCountryList(Locale locale) {
+    @SuppressWarnings("unchecked")
+	protected List<LabelValue> buildCountryList(Locale locale) {
         final String EMPTY = "";
         final Locale[] available = Locale.getAvailableLocales();
 
-        List countries = new ArrayList();
+        List<LabelValue> countries = new ArrayList<LabelValue>();
 
         for (int i = 0; i < available.length; i++) {
             final String iso = available[i].getCountry();
@@ -204,7 +205,8 @@
          *
          * @return The value returned by comparing the localized labels.
          */
-        public final int compare(Object o1, Object o2) {
+        @SuppressWarnings("unchecked")
+		public final int compare(Object o1, Object o2) {
             LabelValue lhs = (LabelValue) o1;
             LabelValue rhs = (LabelValue) o2;
 
Index: web/struts/src/main/java/org/appfuse/webapp/action/PasswordHintAction.java
===================================================================
--- web/struts/src/main/java/org/appfuse/webapp/action/PasswordHintAction.java	(revision 2634)
+++ web/struts/src/main/java/org/appfuse/webapp/action/PasswordHintAction.java	(working copy)
@@ -27,7 +27,7 @@
     }
 
     public String execute() {
-        List args = new ArrayList();
+        List<String> args = new ArrayList<String>();
         
         // ensure that the username has been sent
         if (username == null) {
Index: web/struts/src/main/java/org/appfuse/webapp/action/BaseAction.java
===================================================================
--- web/struts/src/main/java/org/appfuse/webapp/action/BaseAction.java	(revision 2634)
+++ web/struts/src/main/java/org/appfuse/webapp/action/BaseAction.java	(working copy)
@@ -52,7 +52,8 @@
         return CANCEL;
     }
     
-    protected void saveMessage(String msg) {
+    @SuppressWarnings("unchecked")
+	protected void saveMessage(String msg) {
         List messages = (List) getRequest().getSession().getAttribute("messages");
         if (messages == null) {
             messages = new ArrayList();
@@ -106,7 +107,7 @@
 
         mailMessage.setTo(user.getFullName() + "<" + user.getEmail() + ">");
 
-        Map model = new HashMap();
+        Map<String, Object> model = new HashMap<String, Object>();
         model.put("user", user);
         // TODO: figure out how to get bundle specified in webwork.properties
         // model.put("bundle", getTexts());
Index: web/common/src/test/java/org/appfuse/webapp/filter/LocaleFilterTest.java
===================================================================
--- web/common/src/test/java/org/appfuse/webapp/filter/LocaleFilterTest.java	(revision 2634)
+++ web/common/src/test/java/org/appfuse/webapp/filter/LocaleFilterTest.java	(working copy)
@@ -16,9 +16,9 @@
 public class LocaleFilterTest extends TestCase {
     private LocaleFilter filter = null;
     
-    protected void setUp() {
+    protected void setUp() throws Exception {
         filter = new LocaleFilter();
-        filter.setFilterConfig(new MockFilterConfig());
+        filter.init(new MockFilterConfig());
     }
     
     public void testSetLocaleInSessionWhenSessionIsNull() throws Exception {
Index: web/common/src/main/java/org/appfuse/webapp/listener/UserCounterListener.java
===================================================================
--- web/common/src/main/java/org/appfuse/webapp/listener/UserCounterListener.java	(revision 2634)
+++ web/common/src/main/java/org/appfuse/webapp/listener/UserCounterListener.java	(working copy)
@@ -15,8 +15,6 @@
 import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
 import org.acegisecurity.context.SecurityContext;
 import org.acegisecurity.context.SecurityContextHolder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.appfuse.model.User;
 
 
@@ -32,7 +30,6 @@
     public static final String COUNT_KEY = "userCounter";
     public static final String USERS_KEY = "userNames";
     public static final String EVENT_KEY = HttpSessionContextIntegrationFilter.ACEGI_SECURITY_CONTEXT_KEY;
-    private final transient Log log = LogFactory.getLog(UserCounterListener.class);
     private transient ServletContext servletContext;
     private int counter;
     private Set users;
@@ -67,7 +64,8 @@
         //log.debug("User Count: " + counter);
     }
 
-    synchronized void addUsername(Object user) {
+    @SuppressWarnings("unchecked")
+	synchronized void addUsername(Object user) {
         users = (Set) servletContext.getAttribute(USERS_KEY);
 
         if (users == null) {
Index: web/common/src/main/java/org/appfuse/webapp/filter/LocaleFilter.java
===================================================================
--- web/common/src/main/java/org/appfuse/webapp/filter/LocaleFilter.java	(revision 2634)
+++ web/common/src/main/java/org/appfuse/webapp/filter/LocaleFilter.java	(working copy)
@@ -20,7 +20,8 @@
  */
 public class LocaleFilter extends OncePerRequestFilter {
 
-    public void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+    @SuppressWarnings("unchecked")
+	public void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
                                  FilterChain chain)
             throws IOException, ServletException {
 
@@ -56,7 +57,7 @@
 
         String theme = request.getParameter("theme");
         if (theme != null && request.isUserInRole(Constants.ADMIN_ROLE)) {
-            Map config = (Map) getServletContext().getAttribute(Constants.CONFIG);
+            Map<String, Object> config = (Map) getServletContext().getAttribute(Constants.CONFIG);
             config.put(Constants.CSS_THEME, theme);
         }
 
Index: web/common/src/main/java/org/appfuse/webapp/filter/LocaleRequestWrapper.java
===================================================================
--- web/common/src/main/java/org/appfuse/webapp/filter/LocaleRequestWrapper.java	(revision 2634)
+++ web/common/src/main/java/org/appfuse/webapp/filter/LocaleRequestWrapper.java	(working copy)
@@ -41,9 +41,10 @@
     /**
      * @see javax.servlet.ServletRequestWrapper#getLocales()
      */
-    public Enumeration getLocales() {
+    @SuppressWarnings("unchecked")
+	public Enumeration<Locale> getLocales() {
         if (null != preferredLocale) {
-            List l = Collections.list(super.getLocales());
+            List<Locale> l = Collections.list(super.getLocales());
             if(l.contains(preferredLocale))
             {
                 l.remove(preferredLocale);
Index: web/tapestry/src/main/java/org/appfuse/webapp/pages/CountryModel.java
===================================================================
--- web/tapestry/src/main/java/org/appfuse/webapp/pages/CountryModel.java	(revision 2634)
+++ web/tapestry/src/main/java/org/appfuse/webapp/pages/CountryModel.java	(working copy)
@@ -25,7 +25,8 @@
      *
      * @return List of LabelValues for all available countries.
      */
-    public List getCountries(Locale locale) {
+    @SuppressWarnings("unchecked")
+	public List getCountries(Locale locale) {
         final String EMPTY = "";
         final Locale[] available = Locale.getAvailableLocales();
 
@@ -74,7 +75,8 @@
          *
          * @return The value returned by comparing the localized labels.
          */
-        public final int compare(Object o1, Object o2) {
+        @SuppressWarnings("unchecked")
+		public final int compare(Object o1, Object o2) {
             LabelValue lhs = (LabelValue) o1;
             LabelValue rhs = (LabelValue) o2;
 
Index: web/tapestry/src/main/java/org/appfuse/webapp/pages/FileUpload.java
===================================================================
--- web/tapestry/src/main/java/org/appfuse/webapp/pages/FileUpload.java	(revision 2634)
+++ web/tapestry/src/main/java/org/appfuse/webapp/pages/FileUpload.java	(working copy)
@@ -7,7 +7,6 @@
 import java.io.OutputStream;
 
 import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.annotations.InjectPage;
 import org.apache.tapestry.request.IUploadFile;
 import org.appfuse.Constants;