Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 22606 invoked from network); 2 Jun 2007 01:37:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jun 2007 01:37:35 -0000 Received: (qmail 52165 invoked by uid 500); 2 Jun 2007 01:37:37 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 51447 invoked by uid 500); 2 Jun 2007 01:37:35 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 51436 invoked by uid 500); 2 Jun 2007 01:37:34 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 51433 invoked by uid 99); 2 Jun 2007 01:37:34 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2007 18:37:34 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2007 18:37:30 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AA9CB1A981A; Fri, 1 Jun 2007 18:37:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r543691 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/ Date: Sat, 02 Jun 2007 01:37:09 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070602013709.AA9CB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Jun 1 18:37:08 2007 New Revision: 543691 URL: http://svn.apache.org/viewvc?view=rev&rev=543691 Log: Fix compiler warnings in o.a.c.realm Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Fri Jun 1 18:37:08 2007 @@ -345,7 +345,7 @@ return (null); } - ArrayList list = getRoles(dbConnection, username); + ArrayList list = getRoles(dbConnection, username); // Create and return a suitable Principal for this user return (new GenericPrincipal(this, username, credentials, list)); @@ -527,17 +527,17 @@ * @param dbConnection The database connection to be used * @param username Username for which roles should be retrieved */ - protected ArrayList getRoles(Connection dbConnection, + protected ArrayList getRoles(Connection dbConnection, String username) { ResultSet rs = null; PreparedStatement stmt = null; - ArrayList list = null; + ArrayList list = null; try { stmt = roles(dbConnection, username); rs = stmt.executeQuery(); - list = new ArrayList(); + list = new ArrayList(); while (rs.next()) { String role = rs.getString(1); Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Fri Jun 1 18:37:08 2007 @@ -65,7 +65,7 @@ * @param roles List of roles (must be Strings) possessed by this user */ public GenericPrincipal(Realm realm, String name, String password, - List roles) { + List roles) { this(realm, name, password, roles, null); } @@ -82,7 +82,7 @@ * getUserPrincipal call if not null; if null, this will be returned */ public GenericPrincipal(Realm realm, String name, String password, - List roles, Principal userPrincipal) { + List roles, Principal userPrincipal) { super(); this.realm = realm; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java Fri Jun 1 18:37:08 2007 @@ -27,8 +27,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.catalina.util.StringManager; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; /** *

Implementation of the JAAS CallbackHandler interface, @@ -49,7 +47,6 @@ */ public class JAASCallbackHandler implements CallbackHandler { - private static Log log = LogFactory.getLog(JAASCallbackHandler.class); // ------------------------------------------------------------ Constructor Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Fri Jun 1 18:37:08 2007 @@ -212,7 +212,7 @@ */ public SecurityConstraint [] findSecurityConstraints(Request request, Context context) { - ArrayList results = null; + ArrayList results = null; // Are there any defined security constraints? SecurityConstraint constraints[] = context.findConstraints(); if ((constraints == null) || (constraints.length == 0)) { @@ -235,7 +235,7 @@ constraints[i].included(uri, method)); if (constraints[i].included(uri, method)) { if(results == null) { - results = new ArrayList(); + results = new ArrayList(); } results.add(constraints[i]); } Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Jun 1 18:37:08 2007 @@ -457,7 +457,6 @@ */ protected Principal createPrincipal(String username, Subject subject) { // Prepare to scan the Principals for this Subject - String password = null; // Will not be carried forward List roles = new ArrayList(); Principal userPrincipal = null; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Fri Jun 1 18:37:08 2007 @@ -420,7 +420,7 @@ return (null); } - ArrayList roles = getRoles(username); + ArrayList roles = getRoles(username); // Create and return a suitable Principal for this user return (new GenericPrincipal(this, username, credentials, roles)); @@ -604,7 +604,7 @@ /** * Return the roles associated with the gven user name. */ - protected ArrayList getRoles(String username) { + protected ArrayList getRoles(String username) { PreparedStatement stmt = null; ResultSet rs = null; @@ -626,7 +626,7 @@ try { // Accumulate the user's roles - ArrayList roleList = new ArrayList(); + ArrayList roleList = new ArrayList(); stmt = roles(dbConnection, username); rs = stmt.executeQuery(); while (rs.next()) { Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Jun 1 18:37:08 2007 @@ -903,7 +903,7 @@ // Check the user's credentials if (checkCredentials(context, user, credentials)) { // Search for additional roles - List roles = getRoles(context, user); + List roles = getRoles(context, user); return (new GenericPrincipal(this, username, credentials, @@ -931,7 +931,7 @@ return (null); // Search for additional roles - List roles = getRoles(context, user); + List roles = getRoles(context, user); // Create and return a suitable Principal for this user return (new GenericPrincipal(this, username, credentials, roles)); @@ -961,7 +961,7 @@ User user = null; // Get attributes to retrieve from user entry - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); if (userPassword != null) list.add(userPassword); if (userRoleName != null) @@ -1020,7 +1020,7 @@ password = getAttributeValue(userPassword, attrs); // Retrieve values of userRoleName attribute - ArrayList roles = null; + ArrayList roles = null; if (userRoleName != null) roles = addAttributeValues(userRoleName, attrs, roles); @@ -1110,7 +1110,7 @@ password = getAttributeValue(userPassword, attrs); // Retrieve values of userRoleName attribute - ArrayList roles = null; + ArrayList roles = null; if (userRoleName != null) roles = addAttributeValues(userRoleName, attrs, roles); @@ -1264,7 +1264,6 @@ User user, String credentials) throws NamingException { - Attributes attr; if (credentials == null || user == null) return (false); @@ -1288,7 +1287,7 @@ if (containerLog.isTraceEnabled()) { containerLog.trace(" binding as " + dn); } - attr = context.getAttributes("", null); + context.getAttributes("", null); validated = true; } catch (AuthenticationException e) { @@ -1328,7 +1327,7 @@ * * @exception NamingException if a directory server error occurs */ - protected List getRoles(DirContext context, User user) + protected List getRoles(DirContext context, User user) throws NamingException { if (user == null) @@ -1344,9 +1343,9 @@ containerLog.trace(" getRoles(" + dn + ")"); // Start with roles retrieved from the user entry - ArrayList list = user.roles; + ArrayList list = user.roles; if (list == null) { - list = new ArrayList(); + list = new ArrayList(); } // Are we configured to do role searches? @@ -1433,9 +1432,9 @@ * * @exception NamingException if a directory server error occurs */ - private ArrayList addAttributeValues(String attrId, + private ArrayList addAttributeValues(String attrId, Attributes attrs, - ArrayList values) + ArrayList values) throws NamingException{ if (containerLog.isTraceEnabled()) @@ -1443,7 +1442,7 @@ if (attrId == null || attrs == null) return values; if (values == null) - values = new ArrayList(); + values = new ArrayList(); Attribute attr = attrs.get(attrId); if (attr == null) return (values); @@ -1620,7 +1619,7 @@ */ protected Hashtable getDirectoryContextEnvironment() { - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable(); // Configure our directory context environment. if (containerLog.isDebugEnabled() && connectionAttempt == 0) @@ -1714,7 +1713,7 @@ protected String[] parseUserPatternString(String userPatternString) { if (userPatternString != null) { - ArrayList pathList = new ArrayList(); + ArrayList pathList = new ArrayList(); int startParenLoc = userPatternString.indexOf('('); if (startParenLoc == -1) { // no parens here; return whole thing @@ -1802,10 +1801,11 @@ String username = null; String dn = null; String password = null; - ArrayList roles = null; + ArrayList roles = null; - User(String username, String dn, String password, ArrayList roles) { + User(String username, String dn, String password, + ArrayList roles) { this.username = username; this.dn = dn; this.password = password; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java Fri Jun 1 18:37:08 2007 @@ -82,7 +82,8 @@ /** * The set of valid Principals for this Realm, keyed by user name. */ - private Map principals = new HashMap(); + private Map principals = + new HashMap(); /** @@ -184,7 +185,7 @@ void addUser(String username, String password, String roles) { // Accumulate the list of roles for this user - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); roles += ","; while (true) { int comma = roles.indexOf(','); Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?view=diff&rev=543691&r1=543690&r2=543691 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Fri Jun 1 18:37:08 2007 @@ -214,7 +214,7 @@ return null; } - List roles = new ArrayList(); + List roles = new ArrayList(); Iterator uroles = user.getRoles(); while(uroles.hasNext()) { Role role = (Role)uroles.next(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org