Author: rmannibucau Date: Thu Dec 5 09:06:22 2013 New Revision: 1548044 URL: http://svn.apache.org/r1548044 Log: TOMEE-1092 shade quartz
Added: tomee/tomee/trunk/deps/quartz-openejb-shade/ tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml Modified: tomee/tomee/trunk/container/openejb-core/pom.xml tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTriggerPersistenceDelegate.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimeoutJob.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/IntervalTimerData.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/SingleActionTimerData.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/PatchedStdJDBCDelegate.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/QuartzObjectInputStream.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java tomee/tomee/trunk/deps/pom.xml tomee/tomee/trunk/pom.xml Modified: tomee/tomee/trunk/container/openejb-core/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/pom.xml (original) +++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu Dec 5 09:06:22 2013 @@ -207,9 +207,9 @@ org.testng;resolution:=optional, org.omg.CORBA, org.osgi.framework, - org.quartz;resolution:=optional, - org.quartz.impl;resolution:=optional, - org.quartz.spi;resolution:=optional, + org.apache.openejb.quartz;resolution:=optional, + org.apache.openejb.quartz.impl;resolution:=optional, + org.apache.openejb.quartz.spi;resolution:=optional, org.slf4j;resolution:=optional;version="[1.6,4)", org.w3c.dom, org.w3c.dom.ls, @@ -607,8 +607,9 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> + <groupId>org.apache.openejb.shade</groupId> + <artifactId>quartz-openejb-shade</artifactId> + <version>${quartz.version}</version> </dependency> <!-- Dependency of Quartz --> <dependency> Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Dec 5 09:06:22 2013 @@ -99,6 +99,7 @@ import org.apache.openejb.monitoring.rem import org.apache.openejb.observer.Observes; import org.apache.openejb.persistence.JtaEntityManagerRegistry; import org.apache.openejb.persistence.PersistenceClassLoaderHandler; +import org.apache.openejb.quartz.Scheduler; import org.apache.openejb.resource.GeronimoConnectionManagerFactory; import org.apache.openejb.resource.PropertiesFactory; import org.apache.openejb.resource.jdbc.DataSourceFactory; @@ -138,7 +139,6 @@ import org.apache.xbean.finder.UrlSet; import org.apache.xbean.recipe.ObjectRecipe; import org.apache.xbean.recipe.Option; import org.apache.xbean.recipe.UnsetPropertiesRecipe; -import org.quartz.Scheduler; import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java Thu Dec 5 09:06:22 2013 @@ -18,7 +18,7 @@ package org.apache.openejb.core.timer; import org.apache.openejb.core.timer.EJBCronTrigger.ParseException; -import org.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; import javax.ejb.ScheduleExpression; import javax.ejb.TimerConfig; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java Thu Dec 5 09:06:22 2013 @@ -21,8 +21,8 @@ import org.apache.openejb.loader.SystemI import org.apache.openejb.util.ExecutorBuilder; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; -import org.quartz.SchedulerConfigException; -import org.quartz.spi.ThreadPool; +import org.apache.openejb.quartz.SchedulerConfigException; +import org.apache.openejb.quartz.spi.ThreadPool; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; @@ -47,12 +47,12 @@ public class DefaultTimerThreadPoolAdapt private String instanceName; /** - * Mock support for property: org.quartz.threadPool.threadCount + * Mock support for property: org.apache.openejb.quartz.threadPool.threadCount */ private int threadCount = 3; /** - * Mock support for property: org.quartz.threadPool.threadPriority + * Mock support for property: org.apache.openejb.quartz.threadPool.threadPriority */ private int threadPriority = Thread.NORM_PRIORITY; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java Thu Dec 5 09:06:22 2013 @@ -18,7 +18,7 @@ package org.apache.openejb.core.timer; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; -import org.quartz.impl.triggers.CronTriggerImpl; +import org.apache.openejb.quartz.impl.triggers.CronTriggerImpl; import javax.ejb.ScheduleExpression; import java.io.Serializable; @@ -40,7 +40,7 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class EJBCronTrigger extends CronTriggerImpl { +public class EJBCronTrigger extends CronTriggerImpl { private static final long serialVersionUID = 1L; private static final Logger log = Logger.getInstance(LogCategory.TIMER, EJBCronTrigger.class); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTriggerPersistenceDelegate.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTriggerPersistenceDelegate.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTriggerPersistenceDelegate.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTriggerPersistenceDelegate.java Thu Dec 5 09:06:22 2013 @@ -16,13 +16,13 @@ */ package org.apache.openejb.core.timer; -import org.quartz.JobDetail; -import org.quartz.ScheduleBuilder; -import org.quartz.TriggerKey; -import org.quartz.impl.jdbcjobstore.CronTriggerPersistenceDelegate; -import org.quartz.impl.jdbcjobstore.Util; -import org.quartz.spi.MutableTrigger; -import org.quartz.spi.OperableTrigger; +import org.apache.openejb.quartz.JobDetail; +import org.apache.openejb.quartz.ScheduleBuilder; +import org.apache.openejb.quartz.TriggerKey; +import org.apache.openejb.quartz.impl.jdbcjobstore.CronTriggerPersistenceDelegate; +import org.apache.openejb.quartz.impl.jdbcjobstore.Util; +import org.apache.openejb.quartz.spi.MutableTrigger; +import org.apache.openejb.quartz.spi.OperableTrigger; import javax.ejb.ScheduleExpression; import java.io.IOException; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimeoutJob.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimeoutJob.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimeoutJob.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimeoutJob.java Thu Dec 5 09:06:22 2013 @@ -17,10 +17,10 @@ package org.apache.openejb.core.timer; -import org.quartz.Job; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; +import org.apache.openejb.quartz.Job; +import org.apache.openejb.quartz.JobDataMap; +import org.apache.openejb.quartz.JobExecutionContext; +import org.apache.openejb.quartz.JobExecutionException; /** * @version $Rev$ $Date$ Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Thu Dec 5 09:06:22 2013 @@ -31,19 +31,19 @@ import org.apache.openejb.spi.ContainerS import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; import org.apache.openejb.util.SetAccessible; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; -import org.quartz.TriggerKey; -import org.quartz.impl.StdSchedulerFactory; -import org.quartz.impl.jdbcjobstore.JobStoreSupport; -import org.quartz.impl.jdbcjobstore.StdJDBCDelegate; -import org.quartz.impl.triggers.AbstractTrigger; -import org.quartz.listeners.SchedulerListenerSupport; -import org.quartz.simpl.RAMJobStore; +import org.apache.openejb.quartz.JobBuilder; +import org.apache.openejb.quartz.JobDataMap; +import org.apache.openejb.quartz.JobDetail; +import org.apache.openejb.quartz.Scheduler; +import org.apache.openejb.quartz.SchedulerException; +import org.apache.openejb.quartz.Trigger; +import org.apache.openejb.quartz.TriggerKey; +import org.apache.openejb.quartz.impl.StdSchedulerFactory; +import org.apache.openejb.quartz.impl.jdbcjobstore.JobStoreSupport; +import org.apache.openejb.quartz.impl.jdbcjobstore.StdJDBCDelegate; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.listeners.SchedulerListenerSupport; +import org.apache.openejb.quartz.simpl.RAMJobStore; import javax.ejb.EJBContext; import javax.ejb.EJBException; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/IntervalTimerData.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/IntervalTimerData.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/IntervalTimerData.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/IntervalTimerData.java Thu Dec 5 09:06:22 2013 @@ -17,9 +17,9 @@ package org.apache.openejb.core.timer; -import org.quartz.SimpleTrigger; -import org.quartz.impl.triggers.AbstractTrigger; -import org.quartz.impl.triggers.SimpleTriggerImpl; +import org.apache.openejb.quartz.SimpleTrigger; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.impl.triggers.SimpleTriggerImpl; import javax.ejb.TimerConfig; import java.lang.reflect.Method; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/SingleActionTimerData.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/SingleActionTimerData.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/SingleActionTimerData.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/SingleActionTimerData.java Thu Dec 5 09:06:22 2013 @@ -17,8 +17,8 @@ package org.apache.openejb.core.timer; -import org.quartz.impl.triggers.AbstractTrigger; -import org.quartz.impl.triggers.SimpleTriggerImpl; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.impl.triggers.SimpleTriggerImpl; import javax.ejb.TimerConfig; import java.lang.reflect.Method; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java Thu Dec 5 09:06:22 2013 @@ -23,11 +23,11 @@ import org.apache.openejb.loader.SystemI import org.apache.openejb.spi.ContainerSystem; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; -import org.quartz.TriggerKey; -import org.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.Scheduler; +import org.apache.openejb.quartz.SchedulerException; +import org.apache.openejb.quartz.Trigger; +import org.apache.openejb.quartz.TriggerKey; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; import javax.ejb.EJBException; import javax.ejb.Timer; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/PatchedStdJDBCDelegate.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/PatchedStdJDBCDelegate.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/PatchedStdJDBCDelegate.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/PatchedStdJDBCDelegate.java Thu Dec 5 09:06:22 2013 @@ -16,9 +16,9 @@ */ package org.apache.openejb.core.timer.quartz; -import org.quartz.impl.jdbcjobstore.NoSuchDelegateException; -import org.quartz.impl.jdbcjobstore.StdJDBCDelegate; -import org.quartz.spi.ClassLoadHelper; +import org.apache.openejb.quartz.impl.jdbcjobstore.NoSuchDelegateException; +import org.apache.openejb.quartz.impl.jdbcjobstore.StdJDBCDelegate; +import org.apache.openejb.quartz.spi.ClassLoadHelper; import org.slf4j.Logger; import java.io.ByteArrayInputStream; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/QuartzObjectInputStream.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/QuartzObjectInputStream.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/QuartzObjectInputStream.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/quartz/QuartzObjectInputStream.java Thu Dec 5 09:06:22 2013 @@ -16,7 +16,7 @@ */ package org.apache.openejb.core.timer.quartz; -import org.quartz.spi.ClassLoadHelper; +import org.apache.openejb.quartz.spi.ClassLoadHelper; import java.io.IOException; import java.io.InputStream; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/JobSpec.java Thu Dec 5 09:06:22 2013 @@ -16,16 +16,16 @@ */ package org.apache.openejb.resource.quartz; -import org.quartz.CronScheduleBuilder; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import org.quartz.impl.triggers.CronTriggerImpl; +import org.apache.openejb.quartz.CronScheduleBuilder; +import org.apache.openejb.quartz.JobBuilder; +import org.apache.openejb.quartz.JobDetail; +import org.apache.openejb.quartz.JobKey; +import org.apache.openejb.quartz.Scheduler; +import org.apache.openejb.quartz.SchedulerException; +import org.apache.openejb.quartz.Trigger; +import org.apache.openejb.quartz.TriggerBuilder; +import org.apache.openejb.quartz.TriggerKey; +import org.apache.openejb.quartz.impl.triggers.CronTriggerImpl; import javax.resource.spi.ActivationSpec; import javax.resource.spi.InvalidPropertyException; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java Thu Dec 5 09:06:22 2013 @@ -19,14 +19,14 @@ package org.apache.openejb.resource.quar import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; -import org.quartz.Job; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.impl.StdSchedulerFactory; -import org.quartz.listeners.SchedulerListenerSupport; +import org.apache.openejb.quartz.Job; +import org.apache.openejb.quartz.JobDataMap; +import org.apache.openejb.quartz.JobExecutionContext; +import org.apache.openejb.quartz.JobExecutionException; +import org.apache.openejb.quartz.Scheduler; +import org.apache.openejb.quartz.SchedulerException; +import org.apache.openejb.quartz.impl.StdSchedulerFactory; +import org.apache.openejb.quartz.listeners.SchedulerListenerSupport; import javax.resource.ResourceException; import javax.resource.spi.ActivationSpec; @@ -73,7 +73,7 @@ public class QuartzResourceAdapter imple timeout = 60000L; } - //Allow org.quartz.InterruptableJob implementors to be interrupted on shutdown + //Allow org.apache.openejb.quartz.InterruptableJob implementors to be interrupted on shutdown System.setProperty(StdSchedulerFactory.PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN , System.getProperty(StdSchedulerFactory.PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN, "true")); System.setProperty(StdSchedulerFactory.PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN_WITH_WAIT Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java Thu Dec 5 09:06:22 2013 @@ -36,9 +36,9 @@ import org.apache.openejb.jee.MessageLis import org.apache.openejb.jee.ResourceAdapter; import org.apache.openejb.resource.quartz.JobSpec; import org.apache.openejb.resource.quartz.QuartzResourceAdapter; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; +import org.apache.openejb.quartz.Job; +import org.apache.openejb.quartz.JobExecutionContext; +import org.apache.openejb.quartz.JobExecutionException; import javax.annotation.PostConstruct; import javax.annotation.Resource; Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java Thu Dec 5 09:06:22 2013 @@ -32,8 +32,8 @@ import org.apache.openejb.spi.ContainerS import org.apache.openejb.testing.Module; import org.junit.Test; import org.junit.runner.RunWith; -import org.quartz.JobDataMap; -import org.quartz.impl.triggers.AbstractTrigger; +import org.apache.openejb.quartz.JobDataMap; +import org.apache.openejb.quartz.impl.triggers.AbstractTrigger; import javax.ejb.Schedule; import javax.ejb.Stateless; Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java Thu Dec 5 09:06:22 2013 @@ -26,9 +26,9 @@ import org.apache.openejb.testing.Module import org.apache.openejb.testng.PropertiesBuilder; import org.junit.Test; import org.junit.runner.RunWith; -import org.quartz.impl.jdbcjobstore.HSQLDBDelegate; -import org.quartz.impl.jdbcjobstore.JobStoreCMT; -import org.quartz.simpl.SimpleThreadPool; +import org.apache.openejb.quartz.impl.jdbcjobstore.HSQLDBDelegate; +import org.apache.openejb.quartz.impl.jdbcjobstore.JobStoreCMT; +import org.apache.openejb.quartz.simpl.SimpleThreadPool; import javax.annotation.PreDestroy; import javax.annotation.Resource; @@ -74,22 +74,22 @@ public class QuartzPersistenceForEJBTime ejbModule.getEjbJar().addEnterpriseBean(new SingletonBean(MyTimedEjb.class).localBean()); final Properties quartzConfig = new PropertiesBuilder() - .p("org.quartz.scheduler.instanceName", "TestScheduler") - .p("org.quartz.scheduler.instanceId", "AUTO") - .p("org.quartz.threadPool.class", SimpleThreadPool.class.getName()) - .p("org.quartz.threadPool.threadCount", "4") - .p("org.quartz.threadPool.threadPriority", "5") - .p("org.quartz.jobStore.class", JobStoreCMT.class.getName()) - .p("org.quartz.jobStore.driverDelegateClass", HSQLDBDelegate.class.getName()) - .p("org.quartz.jobStore.dataSource", "QUARTZ") - .p("org.quartz.jobStore.nonManagedTXDataSource", "QUARTZ_NOTX") - .p("org.quartz.jobStore.tablePrefix", "qrtz_") - .p("org.quartz.jobStore.isClustered", "true") - .p("org.quartz.jobStore.clusterCheckinInterval", "60000") - .p("org.quartz.jobStore.txIsolationLevelSerializable", "true") - .p("org.quartz.jobStore.maxMisfiresToHandleAtATime", "100") - .p("org.quartz.dataSource.QUARTZ.jndiURL", "openejb:Resource/QuartzPersistenceForEJBTimersDB") - .p("org.quartz.dataSource.QUARTZ_NOTX.jndiURL", "openejb:Resource/QuartzPersistenceForEJBTimersDBNoTx") + .p("org.apache.openejb.quartz.scheduler.instanceName", "TestScheduler") + .p("org.apache.openejb.quartz.scheduler.instanceId", "AUTO") + .p("org.apache.openejb.quartz.threadPool.class", SimpleThreadPool.class.getName()) + .p("org.apache.openejb.quartz.threadPool.threadCount", "4") + .p("org.apache.openejb.quartz.threadPool.threadPriority", "5") + .p("org.apache.openejb.quartz.jobStore.class", JobStoreCMT.class.getName()) + .p("org.apache.openejb.quartz.jobStore.driverDelegateClass", HSQLDBDelegate.class.getName()) + .p("org.apache.openejb.quartz.jobStore.dataSource", "QUARTZ") + .p("org.apache.openejb.quartz.jobStore.nonManagedTXDataSource", "QUARTZ_NOTX") + .p("org.apache.openejb.quartz.jobStore.tablePrefix", "qrtz_") + .p("org.apache.openejb.quartz.jobStore.isClustered", "true") + .p("org.apache.openejb.quartz.jobStore.clusterCheckinInterval", "60000") + .p("org.apache.openejb.quartz.jobStore.txIsolationLevelSerializable", "true") + .p("org.apache.openejb.quartz.jobStore.maxMisfiresToHandleAtATime", "100") + .p("org.apache.openejb.quartz.dataSource.QUARTZ.jndiURL", "openejb:Resource/QuartzPersistenceForEJBTimersDB") + .p("org.apache.openejb.quartz.dataSource.QUARTZ_NOTX.jndiURL", "openejb:Resource/QuartzPersistenceForEJBTimersDBNoTx") .build(); Modified: tomee/tomee/trunk/deps/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/deps/pom.xml?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/deps/pom.xml (original) +++ tomee/tomee/trunk/deps/pom.xml Thu Dec 5 09:06:22 2013 @@ -29,5 +29,6 @@ <modules> <module>mbean-annotation-api</module> + <module>quartz-openejb-shade</module> </modules> </project> Added: tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml?rev=1548044&view=auto ============================================================================== --- tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml (added) +++ tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml Thu Dec 5 09:06:22 2013 @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>deps</artifactId> + <groupId>org.apache.openejb</groupId> + <version>4.6.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.openejb.shade</groupId> + <artifactId>quartz-openejb-shade</artifactId> + <version>2.2.0</version> + <name>OpenEJB :: Dependencies :: Quartz Shade</name> + + <dependencies> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <version>${quartz.version}</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <relocations> + <relocation> + <pattern>org.quartz</pattern> + <shadedPattern>org.apache.openejb.quartz</shadedPattern> + </relocation> + <relocation> + <pattern>org.terracotta</pattern> + <shadedPattern>org.apache.openejb.terracotta</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: tomee/tomee/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1548044&r1=1548043&r2=1548044&view=diff ============================================================================== --- tomee/tomee/trunk/pom.xml (original) +++ tomee/tomee/trunk/pom.xml Thu Dec 5 09:06:22 2013 @@ -1388,6 +1388,7 @@ <artifactId>tomcat-catalina</artifactId> <version>${tomcat.version}</version> </dependency> + <!-- we now use our shade <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> @@ -1407,6 +1408,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId>