[jboss-svn-commits] JBL Code SVN: r14324 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/schedule and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2007-08-16 16:03:28 -0400 (Thu, 16 Aug 2007)
New Revision: 14324

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/config-01.xml
Log:
Sorted out unique trigger name issue: http://jira.jboss.com/jira/browse/JBESB-827

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2007-08-16 19:16:17 UTC (rev 14323)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2007-08-16 20:03:28 UTC (rev 14324)
@@ -90,7 +90,7 @@
             trigger.setEndTime(schedule.getEndDate().getTime());
         }
 
-        addListener(listener, trigger, (listener.toString() + scheduleId));
+        addListener(listener, trigger);
     }
 
     public void addListener(ScheduledEventListener listener, long scheduleFrequency) throws SchedulingException {
@@ -99,13 +99,22 @@
 
         trigger.setName(name);
         trigger.setStartTime(new Date());
-        addListener(listener, trigger, name);
+        addListener(listener, trigger);
     }
 
-    private void addListener(ScheduledEventListener listener, Trigger trigger, String name) throws SchedulingException {
-        JobDetail jobDetail = new JobDetail("JBossESB", name, ESBScheduledJob.class);
+    private static int nameDelta = 1; 
+    private void addListener(ScheduledEventListener listener, Trigger trigger) throws SchedulingException {
         JobDataMap jobDataMap = new JobDataMap();
+        JobDetail jobDetail;
 
+        String name = trigger.getName();
+
+        // this is just to make sure they're unique - i.e. so as 1+
+        // "things" can listen to the same schedule...
+        name += ("-" + nameDelta++);
+        trigger.setName(name);
+
+        jobDetail = new JobDetail("JBossESB", name, ESBScheduledJob.class);
         jobDataMap.put(ScheduledEventListener.class.getName(), listener);
         jobDetail.setJobDataMap(jobDataMap);
         try {

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java	2007-08-16 19:16:17 UTC (rev 14323)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java	2007-08-16 20:03:28 UTC (rev 14324)
@@ -55,9 +55,9 @@
 
         // Check that the scheduling happened as defined in the config...
         assertNotNull(MockScheduledEventMessageComposer.config);
-        assertEquals(2, MockScheduledEventMessageComposer.composedMessages.size());
+        assertEquals(4, MockScheduledEventMessageComposer.composedMessages.size());
         assertTrue(MockScheduledEventMessageComposer.uninitialised);
-        assertEquals(2, MockScheduledEventMessageComposer.completedMessage.size());
+        assertEquals(4, MockScheduledEventMessageComposer.completedMessage.size());
 
         // Check that the action pipeline was executed as expeected...
         assertNotNull(MockAction.message);

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/config-01.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/config-01.xml	2007-08-16 19:16:17 UTC (rev 14323)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/schedule/config-01.xml	2007-08-16 20:03:28 UTC (rev 14324)
@@ -8,7 +8,7 @@
     </providers>
 
     <services>
-        <service category="ServiceCat" name="ServiceName" description="Test Service">
+        <service category="ServiceCat" name="ServiceName-01" description="Test Service">
 
             <listeners>
                 <scheduled-listener name="simple-schedule-listener" scheduleidref="1-sec-trigger" composer="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" />
@@ -18,6 +18,16 @@
                 <action name="action" class="org.jboss.soa.esb.mock.MockAction" />
             </actions>			
         </service>
+        <service category="ServiceCat" name="ServiceName-02" description="Test Service">
+
+            <listeners>
+                <scheduled-listener name="simple-schedule-listener" scheduleidref="1-sec-trigger" composer="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" />
+            </listeners>
+
+            <actions>
+                <action name="action" class="org.jboss.soa.esb.mock.MockAction" />
+            </actions>
+        </service>
     </services>
 
 </jbossesb>
\ No newline at end of file