Author: kkolinko
Date: Tue Jun 5 13:05:49 2012
New Revision: 1346377
URL: http://svn.apache.org/viewvc?rev=1346377&view=rev
Log:
Merged revision 1346376 from tomcat/trunk:
Review of r1345367.
Rename new public API method added in r1345367 so that the name were less
ambiguous.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1346376
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1346377&r1=1346376&r2=1346377&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Tue Jun 5 13:05:49 2012
@@ -338,7 +338,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(),
@@ -625,7 +625,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/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1346377&r1=1346376&r2=1346377&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
Tue Jun 5 13:05:49 2012
@@ -1224,7 +1224,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/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1346377&r1=1346376&r2=1346377&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Tue Jun 5 13:05:49 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/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java?rev=1346377&r1=1346376&r2=1346377&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java Tue
Jun 5 13:05:49 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: [email protected]
For additional commands, e-mail: [email protected]
