Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DB39CEC9 for ; Tue, 5 Jun 2012 13:00:34 +0000 (UTC) Received: (qmail 10934 invoked by uid 500); 5 Jun 2012 13:00:33 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 10873 invoked by uid 500); 5 Jun 2012 13:00:33 -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 10861 invoked by uid 99); 5 Jun 2012 13:00:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2012 13:00:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2012 13:00:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7A2662388A5B for ; Tue, 5 Jun 2012 13:00:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346376 - in /tomcat/trunk/java/org/apache/catalina: core/DefaultInstanceManager.java deploy/NamingResources.java startup/WebAnnotationSet.java util/Introspection.java Date: Tue, 05 Jun 2012 13:00:09 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120605130009.7A2662388A5B@eris.apache.org> Author: kkolinko Date: Tue Jun 5 13:00:08 2012 New Revision: 1346376 URL: http://svn.apache.org/viewvc?rev=1346376&view=rev Log: Review r1345367. Rename new public API method added in r1345367 so that the name were less ambiguous. Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java tomcat/trunk/java/org/apache/catalina/util/Introspection.java Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1346376&r1=1346375&r2=1346376&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Tue Jun 5 13:00:08 2012 @@ -337,7 +337,7 @@ public class DefaultInstanceManager impl // Resource injection only if JNDI is enabled if (injections != null && Introspection.isValidSetter(method)) { - String fieldName = Introspection.getName(method); + String fieldName = Introspection.getPropertyName(method); if (injections.containsKey(fieldName)) { annotations.add(new AnnotationCacheEntry( method.getName(), @@ -624,7 +624,7 @@ public class DefaultInstanceManager impl lookedupResource = context.lookup(normalizedName); } else { lookedupResource = context.lookup( - clazz.getName() + "/" + Introspection.getName(method)); + clazz.getName() + "/" + Introspection.getPropertyName(method)); } synchronized (method) { Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1346376&r1=1346375&r2=1346376&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Tue Jun 5 13:00:08 2012 @@ -1214,7 +1214,7 @@ public class NamingResources extends Lif if (methods != null && methods.length > 0) { for (Method method : methods) { if (Introspection.isValidSetter(method) && - Introspection.getName(method).equals(name)) { + Introspection.getPropertyName(method).equals(name)) { return method.getParameterTypes()[0]; } } Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1346376&r1=1346375&r2=1346376&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Tue Jun 5 13:00:08 2012 @@ -288,7 +288,7 @@ public class WebAnnotationSet { } String defaultName = classClass.getName() + SEPARATOR + - Introspection.getName(method); + Introspection.getPropertyName(method); String defaultType = (method.getParameterTypes()[0]).getCanonicalName(); Modified: tomcat/trunk/java/org/apache/catalina/util/Introspection.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Introspection.java?rev=1346376&r1=1346375&r2=1346376&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/Introspection.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/Introspection.java Tue Jun 5 13:00:08 2012 @@ -39,12 +39,12 @@ public class Introspection { /** - * Extract the Java Bean field name from the setter name. + * Extract the Java Bean property name from the setter name. * * Note: This method assumes that the method name has already been checked * for correctness. */ - public static String getName(Method setter) { + public static String getPropertyName(Method setter) { return Introspector.decapitalize(setter.getName().substring(3)); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org