Generics changes for o.a.t.util.modeler
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 18 Nov 2008 00:47:36 +0000 (00:47 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 18 Nov 2008 00:47:36 +0000 (00:47 +0000)
commitd1330b3c3f7a839de3cb32f30552e4679f5eaff1
tree50920b360ca02f84a59d44d1eace1134fd356235
parent45f38ede1e66d0796de352c28efbd710ee831225
Generics changes for o.a.t.util.modeler
These changes identified a bunch of issues, the most serious of which was the loadDescriptors() method that sometimes returned List<ObjectName> and sometimes List<ManagedBean>. Some callers expected this, some didn't.
There are comments in the code identifying this as an issue. The fix I applied aligns with some commented out code that may have been part of an intended fix. There are still some deprecated methods that need to be cleaned up.
With these changes Tomcat starts without error and JConsole shows all the mbeans I expect to see.
There is plenty of further clean-up required here but I'll do that separately after the generics.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718452 13f79535-47bb-0310-9956-ffa450edef68
15 files changed:
java/org/apache/catalina/core/StandardEngine.java
java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
java/org/apache/tomcat/util/modeler/BaseModelMBean.java
java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
java/org/apache/tomcat/util/modeler/ManagedBean.java
java/org/apache/tomcat/util/modeler/Registry.java
java/org/apache/tomcat/util/modeler/RegistryMBean.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
java/org/apache/tomcat/util/modeler/modules/ModelerSource.java