From 31584fabde883dec6f3a76e237dc57b060a84e9e Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 3 Apr 2008 11:18:42 +0000
Subject: [PATCH] RESOLVED - issue BATCH-552: Fix samples-14 CI build
 (MBeanServer not automatically created in Java 1.4)

Added explicit MBeanServerFactoryBean.
---
 .../resources/adhoc-job-launcher-context.xml  | 55 +++++++------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
index 4282d83ec..0422cd898 100644
--- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
@@ -1,64 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:aop="http://www.springframework.org/schema/aop"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
        	http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        	http://www.springframework.org/schema/aop
  		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-	<import resource="simple-job-launcher-context.xml" />
-
+	<import resource="simple-job-launcher-context.xml" />
+	
+	<!--  For Java 1.4 we need to ceate teh mbean server explicitly -->
+	<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
+		<property name="locateExistingServerIfPossible" value="true"/>
+	</bean>
 	<bean class="org.springframework.jmx.export.MBeanExporter">
+		<property name="server" ref="mbeanServer" />
 		<property name="beans">
 			<map>
 				<entry key="spring:service=batch,bean=jobLauncher">
-					<bean
-						class="org.springframework.batch.core.launch.support.SimpleExportedJobLauncher">
+					<bean class="org.springframework.batch.core.launch.support.SimpleExportedJobLauncher">
 						<property name="launcher" ref="jobLauncher" />
-						<property name="jobLocator"
-							ref="jobRegistry" />
+						<property name="jobLocator" ref="jobRegistry" />
 					</bean>
 				</entry>
-				<entry
-					key="spring:service=batch,bean=notificationPublisher"
-					value-ref="notificationPublisher" />
-				<entry
-					key="spring:service=batch,bean=jobLoader"
-					value-ref="loader" />
+				<entry key="spring:service=batch,bean=notificationPublisher" value-ref="notificationPublisher" />
+				<entry key="spring:service=batch,bean=jobLoader" value-ref="loader" />
 			</map>
 		</property>
 		<property name="assembler">
-			<bean
-				class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
+			<bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
 				<property name="interfaceMappings">
 					<map>
-						<entry
-							key="spring:service=batch,bean=jobLauncher"
-							value="org.springframework.batch.core.launch.support.ExportedJobLauncher" />
-						<entry key="spring:service=batch,bean=jobLoader"
-							value="org.springframework.batch.sample.launch.JobLoader" />
+						<entry key="spring:service=batch,bean=jobLauncher" value="org.springframework.batch.core.launch.support.ExportedJobLauncher" />
+						<entry key="spring:service=batch,bean=jobLoader" value="org.springframework.batch.sample.launch.JobLoader" />
 					</map>
 				</property>
 			</bean>
 		</property>
 	</bean>
-
-	<bean id="notificationPublisher"
-		class="org.springframework.batch.sample.advice.JobExecutionNotificationPublisher" />
-
-	<bean id="jobLauncher"
-		class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
+	<bean id="notificationPublisher" class="org.springframework.batch.sample.advice.JobExecutionNotificationPublisher" />
+	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="taskExecutor">
-			<bean
-				class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
+			<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
 		</property>
 	</bean>
-
-	<bean id="loader"
-		class="org.springframework.batch.sample.launch.DefaultJobLoader">
+	<bean id="loader" class="org.springframework.batch.sample.launch.DefaultJobLoader">
 		<property name="registry" ref="jobRegistry" />
 	</bean>
-
-</beans>
+</beans>
\ No newline at end of file