MBeanExporter detects FactoryBean-exported resources independent from declaration order

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java

@@ -57,6 +57,11 @@ public class AnnotationLazyInitMBeanTests extends TestCase {
 			String name = (String) server.getAttribute(oname, "Name");
 			assertEquals("Invalid name returned", "TEST", name);
 
+			oname = ObjectNameManager.getInstance("bean:name=testBean5");
+			assertNotNull(server.getObjectInstance(oname));
+			name = (String) server.getAttribute(oname, "Name");
+			assertEquals("Invalid name returned", "FACTORY", name);
+
 			oname = ObjectNameManager.getInstance("spring:mbean=true");
 			assertNotNull(server.getObjectInstance(oname));
 			name = (String) server.getAttribute(oname, "Name");

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jmx.export.annotation;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jmx.IJmxTestBean;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class AnnotationTestBeanFactory implements FactoryBean<IJmxTestBean> {
+
+	private final FactoryCreatedAnnotationTestBean instance = new FactoryCreatedAnnotationTestBean();
+
+	public AnnotationTestBeanFactory() {
+		this.instance.setName("FACTORY");
+	}
+
+	public IJmxTestBean getObject() throws Exception {
+		return this.instance;
+	}
+
+	public Class<? extends IJmxTestBean> getObjectType() {
+		return FactoryCreatedAnnotationTestBean.class;
+	}
+
+	public boolean isSingleton() {
+		return true;
+	}
+
+}

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jmx.export.annotation;
+
+/**
+ * @author Juergen Hoeller
+ */
+@ManagedResource(objectName = "bean:name=testBean5")
+public class FactoryCreatedAnnotationTestBean extends AnnotationTestBean {
+
+}

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml

@@ -5,21 +5,25 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-  <context:mbean-export server="server" registration="replaceExisting"/>
+	<context:mbean-export server="server" registration="replaceExisting"/>
 
-  <context:mbean-export server="server" registration="replaceExisting"/>
+	<context:mbean-export server="server" registration="replaceExisting"/>
 
-  <bean id="server" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
+	<bean id="server" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
 
-  <bean name="bean:name=testBean4" class="org.springframework.jmx.export.annotation.AnnotationTestBean" lazy-init="true">
+	<bean name="bean:name=testBean4" class="org.springframework.jmx.export.annotation.AnnotationTestBean" lazy-init="true">
 		<property name="name" value="TEST"/>
 		<property name="age" value="100"/>
 	</bean>
 
+	<bean name="bean:name=testBean5" class="org.springframework.jmx.export.annotation.AnnotationTestBeanFactory"/>
+
 	<bean name="spring:mbean=true" class="org.springframework.jmx.export.TestDynamicMBean" lazy-init="true"/>
 
 	<bean name="spring:mbean=another" class="org.springframework.jmx.export.MBeanExporterTests$Person" lazy-init="true">
 		<property name="name" value="Juergen Hoeller"/>
 	</bean>
 
+	<bean id="notLoadable" class="does.not.exist" lazy-init="true"/>
+
 </beans>

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml

@@ -5,9 +5,9 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-  <context:mbean-export server="server"/>
+	<context:mbean-export server="server"/>
 
-  <bean id="server" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
+	<bean id="server" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
 
 	<bean id="testBean" class="org.springframework.jmx.export.annotation.AnnotationTestBean" lazy-init="true">
 		<property name="name" value="TEST"/>