Commits

Anonymous committed d2d7ec4

- Jalopy reformatting issues.

Comments (0)

Files changed (18)

src/java/com/opensymphony/user/User.java

  */
 package com.opensymphony.user;
 
+import com.opensymphony.user.provider.CredentialsProvider;
+
 import java.io.Serializable;
+
 import java.security.Principal;
+
 import java.util.Collections;
 import java.util.List;
 
-import com.opensymphony.user.provider.CredentialsProvider;
-
 
 /**
  * Entity to represent an actual User of the system.
  * <p>Refer to Entity for more information.</p>
  *
  * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
  * @see com.opensymphony.user.Entity
  */

src/java/com/opensymphony/user/UserManager.java

         if (logger.isDebugEnabled()) {
             logger.debug("loading using config : " + loc);
         }
-        if(in==null){
-        	throw new UserManagerImplementationException("The configuration file " + filename +" could not be found.");
+
+        if (in == null) {
+            throw new UserManagerImplementationException("The configuration file " + filename + " could not be found.");
         }
+
         configLoader.load(in, this);
 
         if (logger.isDebugEnabled()) {

src/java/com/opensymphony/user/adapter/jboss/OSUserLoginModule.java

  */
 package com.opensymphony.user.adapter.jboss;
 
+import com.opensymphony.user.EntityNotFoundException;
+import com.opensymphony.user.User;
+import com.opensymphony.user.UserManager;
+
+import org.jboss.security.SimpleGroup;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
+
 import java.security.acl.Group;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginException;
 
-import org.jboss.security.SimpleGroup;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
-
-import com.opensymphony.user.EntityNotFoundException;
-import com.opensymphony.user.User;
-import com.opensymphony.user.UserManager;
-
 
 /**
  * DOCUMENT ME!
  *
  * @author $author$
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class OSUserLoginModule extends UsernamePasswordLoginModule {
     //~ Static fields/initializers /////////////////////////////////////////////

src/java/com/opensymphony/user/adapter/resin/ResinAuthenticatorAdapter.java

  * User: mike
  * Date: Dec 27, 2001
  * Time: 12:31:57 PM
- * CVS Revision: $Revision: 1.2 $
- * Last CVS Commit: $Date: 2003-10-15 18:38:34 $
- * Author of last CVS Commit: $Author: dep4b $
+ * CVS Revision: $Revision: 1.3 $
+ * Last CVS Commit: $Date: 2003-11-26 17:07:27 $
+ * Author of last CVS Commit: $Author: matthew $
  */
 package com.opensymphony.user.adapter.resin;
 
+import com.caucho.http.security.AbstractAuthenticator;
+
+import com.opensymphony.user.EntityNotFoundException;
+import com.opensymphony.user.User;
+import com.opensymphony.user.UserManager;
+
 import java.security.Principal;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.caucho.http.security.AbstractAuthenticator;
-import com.opensymphony.user.EntityNotFoundException;
-import com.opensymphony.user.User;
-import com.opensymphony.user.UserManager;
-
 
 /**
  * A ResinAuthenticatorAdapter for OSUser.
         return super.isUserInRole(request, response, context, principal, s);
     }
 
-	/**
-	 * Initializes this Authenticator.
-	 */
+    /**
+     * Initializes this Authenticator.
+     */
     public void init() throws ServletException {
         super.init();
         userManager = UserManager.getInstance();

src/java/com/opensymphony/user/adapter/weblogic61/OSUserRealm.java

  */
 package com.opensymphony.user.adapter.weblogic61;
 
-import java.security.acl.Group;
-import java.security.acl.NotOwnerException;
-import java.util.Enumeration;
-import java.util.Iterator;
+import com.opensymphony.user.DuplicateEntityException;
+import com.opensymphony.user.EntityNotFoundException;
+import com.opensymphony.user.ImmutableException;
+import com.opensymphony.user.UserManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import weblogic.logging.LogOutputStream;
+
 import weblogic.security.acl.AbstractManageableRealm;
 import weblogic.security.acl.DebuggableRealm;
 import weblogic.security.acl.Everyone;
 import weblogic.security.acl.User;
 
-import com.opensymphony.user.DuplicateEntityException;
-import com.opensymphony.user.EntityNotFoundException;
-import com.opensymphony.user.ImmutableException;
-import com.opensymphony.user.UserManager;
+import java.security.acl.Group;
+import java.security.acl.NotOwnerException;
+
+import java.util.Enumeration;
+import java.util.Iterator;
 
 
 /** This class implements a WebLogic security realm which bridges to the OSUser
  * <LI>Restart WebLogic.
  *
  * @author <a href="mailto:steveebersole@austin.rr.com">Steve Ebersole</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class OSUserRealm extends AbstractManageableRealm implements DebuggableRealm {
     //~ Static fields/initializers /////////////////////////////////////////////

src/java/com/opensymphony/user/adapter/weblogic61/OSUserRealmGroup.java

  */
 package com.opensymphony.user.adapter.weblogic61;
 
-import java.security.Principal;
-import java.security.acl.Group;
+import com.opensymphony.user.EntityNotFoundException;
+import com.opensymphony.user.UserManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import weblogic.security.acl.FlatGroup;
 
-import com.opensymphony.user.EntityNotFoundException;
-import com.opensymphony.user.UserManager;
+import java.security.Principal;
+import java.security.acl.Group;
 
 
 /** Wraps an OSUser group within the WebLogic security-realm.
  *
  * @author <a href="mailto:steveebersole@austin.rr.com">Steve Ebersole</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class OSUserRealmGroup extends FlatGroup implements Group {
     //~ Static fields/initializers /////////////////////////////////////////////

src/java/com/opensymphony/user/authenticator/AbstractAuthenticator.java

 package com.opensymphony.user.authenticator;
 
 import java.io.Serializable;
+
 import java.util.Properties;
 
 

src/java/com/opensymphony/user/authenticator/Authenticator.java

 
 /**
  * Interface describing how to authenicate a user.
- * 
+ *
  * @author <a href="mailto:mike@atlassian.com">Mike Cannon-Brookes</a>
  */
 public interface Authenticator {

src/java/com/opensymphony/user/provider/CredentialsProvider.java

 package com.opensymphony.user.provider;
 
 
-
 /**
  * The CredentialsProvider is a UserProvider specifically used for storing
  * details for authenticating Users. All Entities referred to are of type
  * User, and all Entity.Accessor objects can be safely cast to User.Accessor
  *
  * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
  * @see com.opensymphony.user.provider.UserProvider
  * @see com.opensymphony.user.User

src/java/com/opensymphony/user/provider/UserProvider.java

  */
 package com.opensymphony.user.provider;
 
+import com.opensymphony.user.Entity;
+
 import java.io.Serializable;
+
 import java.util.List;
 import java.util.Properties;
 
-import com.opensymphony.user.Entity;
-
 
 /**
  * A UserProvider is a plug-in implementation that allows a UserManager to access
  * was successful.</p>
  *
  * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
  * @see com.opensymphony.user.provider.CredentialsProvider
  * @see com.opensymphony.user.provider.AccessProvider

src/java/com/opensymphony/user/provider/castor/CastorBaseProvider.java

  */
 package com.opensymphony.user.provider.castor;
 
-import java.util.Properties;
+import com.opensymphony.user.Entity;
+import com.opensymphony.user.provider.castor.entity.CastorGroup;
+import com.opensymphony.user.provider.castor.entity.CastorUser;
 
 import org.exolab.castor.jdo.Database;
 import org.exolab.castor.jdo.OQLQuery;
 import org.exolab.castor.jdo.PersistenceException;
 import org.exolab.castor.jdo.QueryResults;
 
-import com.opensymphony.user.Entity;
-import com.opensymphony.user.provider.castor.entity.CastorGroup;
-import com.opensymphony.user.provider.castor.entity.CastorUser;
+import java.util.Properties;
 
 
 /**

src/java/com/opensymphony/user/provider/castor/CastorProfileProvider.java

  */
 package com.opensymphony.user.provider.castor;
 
-import java.util.List;
+import com.opensymphony.module.propertyset.PropertySet;
 
-import com.opensymphony.module.propertyset.PropertySet;
 import com.opensymphony.user.Entity;
 import com.opensymphony.user.provider.ProfileProvider;
 
+import java.util.List;
+
 
 /**
  * @author <a href="mailto:dan@chowda.net">Dan Bachelder</a>

src/java/com/opensymphony/user/provider/castor/entity/CastorUser.java

  */
 package com.opensymphony.user.provider.castor.entity;
 
-import java.util.ArrayList;
-
 import com.opensymphony.user.provider.ejb.util.Base64;
 import com.opensymphony.user.provider.ejb.util.PasswordDigester;
 
+import java.util.ArrayList;
+
 
 /**
  * This class is mapped to the database in the castor mapping.xml file

src/java/com/opensymphony/user/provider/ejb/EJBCredentialsProvider.java

  */
 package com.opensymphony.user.provider.ejb;
 
+import com.opensymphony.user.Entity;
+import com.opensymphony.user.UserManagerImplementationException;
+import com.opensymphony.user.provider.CredentialsProvider;
+import com.opensymphony.user.provider.ejb.entity.MembershipHome;
+import com.opensymphony.user.provider.ejb.entity.MembershipRemote;
+import com.opensymphony.user.provider.ejb.entity.UserHome;
+import com.opensymphony.user.provider.ejb.entity.UserRemote;
+
+import com.opensymphony.util.EJBUtils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.rmi.RemoteException;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import javax.ejb.CreateException;
 import javax.ejb.ObjectNotFoundException;
 import javax.ejb.RemoveException;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.user.Entity;
-import com.opensymphony.user.UserManagerImplementationException;
-import com.opensymphony.user.provider.CredentialsProvider;
-import com.opensymphony.user.provider.ejb.entity.MembershipHome;
-import com.opensymphony.user.provider.ejb.entity.MembershipRemote;
-import com.opensymphony.user.provider.ejb.entity.UserHome;
-import com.opensymphony.user.provider.ejb.entity.UserRemote;
-import com.opensymphony.util.EJBUtils;
-
 
 /**
  * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
  * @author <a href="mailto:mike@atlassian.com">Mike Cannon-Brookes</a>
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  */
 public class EJBCredentialsProvider implements CredentialsProvider {
     //~ Static fields/initializers /////////////////////////////////////////////

src/java/com/opensymphony/user/provider/ejb/EJBProfileProvider.java

  */
 package com.opensymphony.user.provider.ejb;
 
-import java.util.List;
-import java.util.Properties;
+import com.opensymphony.module.propertyset.PropertySet;
 
-import javax.ejb.ObjectNotFoundException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.module.propertyset.PropertySet;
 import com.opensymphony.user.Entity;
 import com.opensymphony.user.UserManagerImplementationException;
 import com.opensymphony.user.provider.ProfileProvider;
 import com.opensymphony.user.provider.ejb.entity.GroupHome;
 import com.opensymphony.user.provider.ejb.entity.UserHome;
+
 import com.opensymphony.util.EJBUtils;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.List;
+import java.util.Properties;
+
+import javax.ejb.ObjectNotFoundException;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 
 /**
  * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
  * @author <a href="mailto:mike@atlassian.com">Mike Cannon-Brookes</a>
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  */
 public class EJBProfileProvider implements ProfileProvider {
     //~ Static fields/initializers /////////////////////////////////////////////

src/java/com/opensymphony/user/provider/hibernate/impl/OSUserHibernateConfigurationProviderImpl.java

  */
 package com.opensymphony.user.provider.hibernate.impl;
 
-import java.util.Iterator;
-import java.util.Map;
+import com.opensymphony.module.propertyset.hibernate.DefaultHibernateConfigurationProvider;
+import com.opensymphony.module.propertyset.hibernate.PropertySetItem;
+
+import com.opensymphony.user.provider.hibernate.OSUserHibernateConfigurationProvider;
+import com.opensymphony.user.provider.hibernate.dao.HibernateGroupDAO;
+import com.opensymphony.user.provider.hibernate.dao.HibernateUserDAO;
+import com.opensymphony.user.provider.hibernate.dao.SessionManager;
+import com.opensymphony.user.provider.hibernate.entity.HibernateGroup;
+import com.opensymphony.user.provider.hibernate.entity.HibernateUser;
 
 import net.sf.hibernate.HibernateException;
 import net.sf.hibernate.MappingException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.module.propertyset.hibernate.DefaultHibernateConfigurationProvider;
-import com.opensymphony.module.propertyset.hibernate.PropertySetItem;
-import com.opensymphony.user.provider.hibernate.OSUserHibernateConfigurationProvider;
-import com.opensymphony.user.provider.hibernate.dao.HibernateGroupDAO;
-import com.opensymphony.user.provider.hibernate.dao.HibernateUserDAO;
-import com.opensymphony.user.provider.hibernate.dao.SessionManager;
-import com.opensymphony.user.provider.hibernate.entity.HibernateGroup;
-import com.opensymphony.user.provider.hibernate.entity.HibernateUser;
+import java.util.Iterator;
+import java.util.Map;
 
 
 /**
         return configuration;
     }
 
-	/**
-	 * Return the Group DAO
-	 */
+    /**
+     * Return the Group DAO
+     */
     public HibernateGroupDAO getGroupDAO() {
         if (groupDAO == null) {
             groupDAO = new HibernateGroupDAOImpl(sessionManager);
         return groupDAO;
     }
 
-	/**
-	 * Return the User DAO.
-	 */
+    /**
+     * Return the User DAO.
+     */
     public HibernateUserDAO getUserDAO() {
         if (userDAO == null) {
             userDAO = new HibernateUserDAOImpl(sessionManager);
 
         return userDAO;
     }
-	
-	/**
-	 * Pass in the configuration values required to create a new
-	 * SessionManager.
-	 */
+
+    /**
+     * Pass in the configuration values required to create a new
+     * SessionManager.
+     */
     public void setupConfiguration(Map configurationProperties) {
         if (configuration == null) {
             configuration = new Configuration();

src/java/com/opensymphony/user/provider/jdbc/JDBCProfileProvider.java

  */
 package com.opensymphony.user.provider.jdbc;
 
+import com.opensymphony.module.propertyset.PropertySet;
+import com.opensymphony.module.propertyset.PropertySetManager;
+
+import com.opensymphony.user.provider.ProfileProvider;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.module.propertyset.PropertySet;
-import com.opensymphony.module.propertyset.PropertySetManager;
-import com.opensymphony.user.provider.ProfileProvider;
-
 
 /**
  * Profile provider that is back by a JDBC datasource.
  *
  * @author $author$
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class JDBCProfileProvider extends BaseJDBCProvider implements ProfileProvider {
     //~ Static fields/initializers /////////////////////////////////////////////
 
     //~ Methods ////////////////////////////////////////////////////////////////
 
-	/**
-	 * Returns a jdbc style PropertySet.
-	 */
+    /**
+     * Returns a jdbc style PropertySet.
+     */
     public PropertySet getPropertySet(String name) {
         HashMap args = new HashMap();
         args.put("globalKey", "OSUser_" + name);
         return PropertySetManager.getInstance("jdbc", args);
     }
 
-	/**
-	 * Returns whether a user is found in the database.
-	 */
+    /**
+     * Returns whether a user is found in the database.
+     */
     public boolean handles(String name) {
         boolean handles = false;
 
         return handles;
     }
 
-	/**
-	 * Doesn't do anything.
-	 */
+    /**
+     * Doesn't do anything.
+     */
     public List list() {
         return null;
     }

src/java/com/opensymphony/user/provider/ofbiz/OFBizAbstractProvider.java

  */
 package com.opensymphony.user.provider.ofbiz;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import com.opensymphony.user.Entity;
+import com.opensymphony.user.provider.UserProvider;
 
 import org.apache.log4j.Category;
+
 import org.ofbiz.core.entity.EntityUtil;
 import org.ofbiz.core.entity.GenericDelegator;
 import org.ofbiz.core.entity.GenericEntityException;
 import org.ofbiz.core.entity.GenericValue;
 import org.ofbiz.core.util.UtilMisc;
 
-import com.opensymphony.user.Entity;
-import com.opensymphony.user.provider.UserProvider;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
 
 /**