[seam-commits] [seam/cron] 7f5fb8: Merge remote-tracking branch 'upstream/develop' in...

Branch: refs/heads/develop Home: https://github.com/seam/cron Commit: 7f5fb8826ca37d24033b9c8006db18cf60a8d89e https://github.com/seam/cron/commit/7f5fb8826ca37d24033b9c8006db18cf60a8d89e Author: Dave Oxley <dave(a)daveoxley.co.uk&gt; Date: 2011-11-19 (Sat, 19 Nov 2011) Changed paths: M api/pom.xml M dist/pom.xml M docs/reference/pom.xml M examples/swing_memory_grapher/pom.xml M examples/swing_memory_grapher/src/main/java/org/jboss/seam/cron/examples/swinggrapher/SwingGrapher.java M examples/swing_memory_grapher/src/main/java/org/jboss/seam/cron/examples/swinggrapher/SwingGrapherForm.java M impl/pom.xml M pom.xml M providers/asynchronous/quartz/pom.xml M providers/asynchronous/quartz/src/main/java/org/jboss/seam/cron/asynchronous/threads/QuartzAsynchronousProvider.java M providers/asynchronous/quartz/src/test/java/org/jboss/seam/cron/asynchronous/test/QuartzAsynchronousTCKTest.java M providers/asynchronous/queuj/pom.xml M providers/asynchronous/queuj/src/main/java/org/jboss/seam/cron/asynchronous/queuj/QueuJAsynchronousProvider.java M providers/asynchronous/queuj/src/test/java/org/jboss/seam/cron/asynchronous/test/QueuJAsynchronousTCKTest.java M providers/asynchronous/threads/pom.xml M providers/asynchronous/threads/src/test/java/org/jboss/seam/cron/asynchronous/test/ThreadsAsynchronousTCKTest.java M providers/queue/queuj/pom.xml M providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/QueuJQueueProvider.java M providers/queue/queuj/src/test/java/org/jboss/seam/cron/queue/test/QueuJRestrictionTCKTest.java M providers/scheduling/quartz/pom.xml M providers/scheduling/quartz/src/main/java/org/jboss/seam/cron/scheduling/quartz/QuartzScheduleProvider.java M providers/scheduling/quartz/src/main/java/org/jboss/seam/cron/scheduling/quartz/TriggerJob.java M providers/scheduling/quartz/src/test/java/org/jboss/seam/cron/scheduling/test/quartz/QuartzSchedulingTCKTest.java M providers/scheduling/queuj/pom.xml M providers/scheduling/queuj/src/main/java/org/jboss/seam/cron/scheduling/queuj/QueuJScheduleProvider.java M providers/scheduling/queuj/src/test/java/org/jboss/seam/cron/scheduling/test/queuj/QueuJSchedulingTCKTest.java M readme.md A settings.xml M spi/pom.xml M spi/src/main/java/org/jboss/seam/cron/spi/SeamCronExtension.java M spi/src/main/java/org/jboss/seam/cron/spi/asynchronous/AsynchronousInterceptor.java M spi/src/main/java/org/jboss/seam/cron/spi/asynchronous/Invoker.java M spi/src/main/java/org/jboss/seam/cron/spi/queue/CronQueueInstaller.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/CronSchedulingInstaller.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/TriggerSupport.java M tck/pom.xml M tck/src/test/java/org/jboss/seam/cron/test/SeamCronTestBase.java M tck/src/test/java/org/jboss/seam/cron/test/asynchronous/beans/SomeAsynchMethods.java M tck/src/test/java/org/jboss/seam/cron/test/asynchronous/tck/SeamCronAsynchronousTCKTest.java M tck/src/test/java/org/jboss/seam/cron/test/restriction/beans/IntervalAndAsyncBean.java M tck/src/test/java/org/jboss/seam/cron/test/restriction/beans/SomeAsyncAndRestrictionMethods.java M tck/src/test/java/org/jboss/seam/cron/test/restriction/tck/SeamCronRestrictionTCKTest.java M tck/src/test/java/org/jboss/seam/cron/test/scheduling/beans/ScheduledBean.java M tck/src/test/java/org/jboss/seam/cron/test/scheduling/tck/IntervalScheduleTCKLongTest.java M tck/src/test/java/org/jboss/seam/cron/test/scheduling/tck/SeamCronSchedulingTCKTest.java Log Message: ----------- Merge remote-tracking branch 'upstream/develop' into SEAMCRON-33 Conflicts: providers/asynchronous/queuj/src/main/java/org/jboss/seam/cron/asynchronous/queuj/QueuJAsynchronousProvider.java spi/src/main/java/org/jboss/seam/cron/spi/scheduling/CronSchedulingInstaller.java tck/src/test/java/org/jboss/seam/cron/test/SeamCronTestBase.java Commit: 7384a386448d67a52140db1d888e0f590fe94353 https://github.com/seam/cron/commit/7384a386448d67a52140db1d888e0f590fe94353 Author: Dave Oxley <dave(a)daveoxley.co.uk&gt; Date: 2011-11-20 (Sun, 20 Nov 2011) Changed paths: M tck/src/test/java/org/jboss/seam/cron/test/restriction/tck/SeamCronRestrictionTCKTest.java Log Message: ----------- Add assertion to TCK to make sure concurrency increases above 1. Commit: 31aff66f0159434529f09eeaf00ec3712cb758f1 https://github.com/seam/cron/commit/31aff66f0159434529f09eeaf00ec3712cb758f1 Author: Dave Oxley <dave(a)daveoxley.co.uk&gt; Date: 2011-11-20 (Sun, 20 Nov 2011) Changed paths: M providers/queue/queuj/src/main/resources/META-INF/beans.xml A providers/queue/queuj/src/test/resources/META-INF/beans.xml M tck/src/test/java/org/jboss/seam/cron/test/SeamCronTestBase.java M tck/src/test/java/org/jboss/seam/cron/test/restriction/SeamCronRestrictionTestBase.java Log Message: ----------- Make sure the interceptor is installed for the TCK but not included in the queue provider jar as it's already included in the provider asyncrhonous jar. Commit: 1adbc157417211c4831fc877ce3b077822225390 https://github.com/seam/cron/commit/1adbc157417211c4831fc877ce3b077822225390 Author: Dave Oxley <dave(a)daveoxley.co.uk&gt; Date: 2011-11-25 (Fri, 25 Nov 2011) Changed paths: M pom.xml M providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/CronQueueRestriction.java M providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/QueuJStatusIndexes.java Log Message: ----------- Upgrade to QueuJ 1.1.0 fixing issue where concurrency occasionally exceeded limit set by restriction. Required code change for API change in new version. Commit: e0600223dbe5135e70d7aaa50f69619bb450d11b https://github.com/seam/cron/commit/e0600223dbe5135e70d7aaa50f69619bb450d11b Author: Pete Royle <pete(a)screamingcoder.com&gt; Date: 2011-12-18 (Sun, 18 Dec 2011) Changed paths: M api/pom.xml A api/src/main/java/org/jboss/seam/cron/api/queue/Queue.java A api/src/main/java/org/jboss/seam/cron/api/restriction/AsyncRestriction.java A api/src/main/java/org/jboss/seam/cron/api/restriction/StatusIndexes.java M pom.xml M providers/asynchronous/quartz/src/main/java/org/jboss/seam/cron/asynchronous/threads/QuartzAsynchronousProvider.java M providers/asynchronous/queuj/src/main/java/org/jboss/seam/cron/asynchronous/queuj/QueuJAsynchronousProvider.java M providers/asynchronous/threads/src/main/java/org/jboss/seam/cron/asynchronous/threads/ThreadsAsynchronousProvider.java A providers/queue/queuj/pom.xml A providers/queue/queuj/src/etc/header.txt A providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/CronIterativeCallback.java A providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/CronQueueRestriction.java A providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/QueuJQueueProvider.java A providers/queue/queuj/src/main/java/org/jboss/seam/cron/queue/queuj/QueuJStatusIndexes.java A providers/queue/queuj/src/main/resources/META-INF/beans.xml A providers/queue/queuj/src/test/java/org/jboss/seam/cron/queue/test/QueuJRestrictionTCKTest.java A providers/queue/queuj/src/test/resources/META-INF/beans.xml M providers/scheduling/quartz/src/main/java/org/jboss/seam/cron/scheduling/quartz/QuartzScheduleProvider.java M providers/scheduling/queuj/src/main/java/org/jboss/seam/cron/scheduling/queuj/QueuJScheduleProvider.java M spi/src/main/java/org/jboss/seam/cron/spi/SeamCronExtension.java M spi/src/main/java/org/jboss/seam/cron/spi/asynchronous/AsynchronousInterceptor.java M spi/src/main/java/org/jboss/seam/cron/spi/asynchronous/CronAsynchronousProvider.java A spi/src/main/java/org/jboss/seam/cron/spi/queue/CronQueueInstaller.java A spi/src/main/java/org/jboss/seam/cron/spi/queue/CronQueueProvider.java A spi/src/main/java/org/jboss/seam/cron/spi/queue/RestrictDetail.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/CronSchedulingInstaller.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/CronSchedulingProvider.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/IntervalTriggerDetail.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/ScheduledTriggerDetail.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/TriggerDetail.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/TriggerSupplies.java M spi/src/main/java/org/jboss/seam/cron/spi/scheduling/trigger/TriggerSupport.java M tck/pom.xml M tck/src/test/java/org/jboss/seam/cron/test/SeamCronTestBase.java M tck/src/test/java/org/jboss/seam/cron/test/asynchronous/tck/SeamCronAsynchronousTCKTest.java A tck/src/test/java/org/jboss/seam/cron/test/restriction/SeamCronRestrictionTestBase.java A tck/src/test/java/org/jboss/seam/cron/test/restriction/beans/IntervalAndAsyncBean.java A tck/src/test/java/org/jboss/seam/cron/test/restriction/beans/SomeAsyncAndRestrictionMethods.java A tck/src/test/java/org/jboss/seam/cron/test/restriction/tck/SeamCronRestrictionTCKTest.java Log Message: ----------- Merge commit 'daveoxley/SEAMCRON-33' into develop Conflicts: pom.xml providers/asynchronous/queuj/src/main/java/org/jboss/seam/cron/asynchronous/queuj/QueuJAsynchronousProvider.java spi/src/main/java/org/jboss/seam/cron/spi/scheduling/CronSchedulingInstaller.java tck/src/test/java/org/jboss/seam/cron/test/SeamCronTestBase.java Compare: https://github.com/seam/cron/compare/3dc6661...e060022