From b7e5ff13fb6d28cff19ba349bcfffd6da2a3dae7 Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 25 Jul 2008 12:16:10 +0000
Subject: [PATCH] IN PROGRESS - BATCH-693: Refactor samples along domain
 contours

---
 .../{advice => jmx}/JobExecutionNotificationPublisher.java      | 2 +-
 .../sample/{advice => jmx}/SimpleMessageApplicationEvent.java   | 2 +-
 .../{advice => jmx}/StepExecutionApplicationEventAdvice.java    | 2 +-
 .../src/main/resources/adhoc-job-launcher-context.xml           | 2 +-
 .../src/main/resources/simple-job-launcher-context.xml          | 2 +-
 .../sample/advice/JobExecutionNotificationPublisherTests.java   | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename spring-batch-samples/src/main/java/org/springframework/batch/sample/{advice => jmx}/JobExecutionNotificationPublisher.java (98%)
 rename spring-batch-samples/src/main/java/org/springframework/batch/sample/{advice => jmx}/SimpleMessageApplicationEvent.java (91%)
 rename spring-batch-samples/src/main/java/org/springframework/batch/sample/{advice => jmx}/StepExecutionApplicationEventAdvice.java (98%)

diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisher.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java
index b1741e3ce..1fd3658e7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisher.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.advice;
+package org.springframework.batch.sample.jmx;
 
 import javax.management.Notification;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/SimpleMessageApplicationEvent.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java
similarity index 91%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/SimpleMessageApplicationEvent.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java
index 8595c3fcb..e9e8034d7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/SimpleMessageApplicationEvent.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.advice;
+package org.springframework.batch.sample.jmx;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/StepExecutionApplicationEventAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/StepExecutionApplicationEventAdvice.java
rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java
index 492d004b2..404a975e2 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/StepExecutionApplicationEventAdvice.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.advice;
+package org.springframework.batch.sample.jmx;
 
 import org.aspectj.lang.JoinPoint;
 import org.springframework.batch.core.StepExecution;
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 af6d233ab..499ac6b31 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
@@ -44,7 +44,7 @@
 			</bean>
 		</property>
 	</bean>
-	<bean id="notificationPublisher" class="org.springframework.batch.sample.advice.JobExecutionNotificationPublisher" />
+	<bean id="notificationPublisher" class="org.springframework.batch.sample.jmx.JobExecutionNotificationPublisher" />
 	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
 	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index 6d2ce028c..3c56f9d32 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -26,6 +26,6 @@
 
 	<bean id="logAdvice" class="org.springframework.batch.sample.common.LogAdvice" />
 
-	<bean id="eventAdvice" class="org.springframework.batch.sample.advice.StepExecutionApplicationEventAdvice" />
+	<bean id="eventAdvice" class="org.springframework.batch.sample.jmx.StepExecutionApplicationEventAdvice" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
index 6250093f1..66761cf43 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
@@ -24,6 +24,8 @@ import java.util.List;
 import javax.management.Notification;
 
 import org.junit.Test;
+import org.springframework.batch.sample.jmx.JobExecutionNotificationPublisher;
+import org.springframework.batch.sample.jmx.SimpleMessageApplicationEvent;
 import org.springframework.jmx.export.notification.NotificationPublisher;
 import org.springframework.jmx.export.notification.UnableToSendNotificationException;