You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/12/05 10:56:35 UTC
svn commit: r1548053 - in /tomee/tomee/trunk:
container/openejb-core/src/main/java/org/apache/openejb/core/timer/
container/openejb-core/src/test/java/org/apache/openejb/timer/
deps/quartz-openejb-shade/ deps/quartz-openejb-shade/src/
deps/quartz-opene...
Author: rmannibucau
Date: Thu Dec 5 09:56:35 2013
New Revision: 1548053
URL: http://svn.apache.org/r1548053
Log:
fixing quartz default in our shade + fixing quartz ra sample
Added:
tomee/tomee/trunk/deps/quartz-openejb-shade/src/
tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/
tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/
tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/quartz.properties
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/QuartzPersistenceForEJBTimersTest.java
tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml
tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml
tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/JobBean.java
tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/QuartzMdb.java
tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml
tomee/tomee/trunk/examples/quartz-app/quartz-ra/src/main/resources/META-INF/ra.xml
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=1548053&r1=1548052&r2=1548053&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:56:35 2013
@@ -47,12 +47,12 @@ public class DefaultTimerThreadPoolAdapt
private String instanceName;
/**
- * Mock support for property: org.apache.openejb.quartz.threadPool.threadCount
+ * Mock support for property: org.quartz.threadPool.threadCount
*/
private int threadCount = 3;
/**
- * Mock support for property: org.apache.openejb.quartz.threadPool.threadPriority
+ * Mock support for property: org.quartz.threadPool.threadPriority
*/
private int threadPriority = Thread.NORM_PRIORITY;
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=1548053&r1=1548052&r2=1548053&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:56:35 2013
@@ -74,22 +74,22 @@ public class QuartzPersistenceForEJBTime
ejbModule.getEjbJar().addEnterpriseBean(new SingletonBean(MyTimedEjb.class).localBean());
final Properties quartzConfig = new PropertiesBuilder()
- .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")
+ .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")
.build();
Modified: 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=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml (original)
+++ tomee/tomee/trunk/deps/quartz-openejb-shade/pom.xml Thu Dec 5 09:56:35 2013
@@ -51,6 +51,27 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ <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>
@@ -66,6 +87,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createSourcesJar>true</createSourcesJar>
<relocations>
<relocation>
<pattern>org.quartz</pattern>
Added: tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/quartz.properties
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/quartz.properties?rev=1548053&view=auto
==============================================================================
--- tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/quartz.properties (added)
+++ tomee/tomee/trunk/deps/quartz-openejb-shade/src/main/resources/quartz.properties Thu Dec 5 09:56:35 2013
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+org.apache.openejb.quartz.scheduler.instanceName: DefaultQuartzScheduler
+org.apache.openejb.quartz.scheduler.rmi.export: false
+org.apache.openejb.quartz.scheduler.rmi.proxy: false
+org.apache.openejb.quartz.scheduler.wrapJobExecutionInUserTransaction: false
+
+org.apache.openejb.quartz.threadPool.class: org.apache.openejb.quartz.simpl.SimpleThreadPool
+org.apache.openejb.quartz.threadPool.threadCount: 10
+org.apache.openejb.quartz.threadPool.threadPriority: 5
+org.apache.openejb.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
+
+org.apache.openejb.quartz.jobStore.misfireThreshold: 60000
+
+org.apache.openejb.quartz.jobStore.class: org.apache.openejb.quartz.simpl.RAMJobStore
+
+# default config
+org.quartz.scheduler.instanceName: DefaultQuartzScheduler
+org.quartz.scheduler.rmi.export: false
+org.quartz.scheduler.rmi.proxy: false
+org.quartz.scheduler.wrapJobExecutionInUserTransaction: false
+
+org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount: 10
+org.quartz.threadPool.threadPriority: 5
+org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
+
+org.quartz.jobStore.misfireThreshold: 60000
+
+org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore
+
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml?rev=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml Thu Dec 5 09:56:35 2013
@@ -34,8 +34,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
+ <groupId>org.apache.openejb.shade</groupId>
+ <artifactId>quartz-openejb-shade</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/JobBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/JobBean.java?rev=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/JobBean.java (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/JobBean.java Thu Dec 5 09:56:35 2013
@@ -17,15 +17,15 @@
package org.superbiz.quartz;
import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
-import org.quartz.Job;
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.Scheduler;
-import org.quartz.SimpleScheduleBuilder;
-import org.quartz.SimpleTrigger;
-import org.quartz.TriggerBuilder;
+import org.apache.openejb.quartz.Job;
+import org.apache.openejb.quartz.JobBuilder;
+import org.apache.openejb.quartz.JobDetail;
+import org.apache.openejb.quartz.JobExecutionContext;
+import org.apache.openejb.quartz.JobExecutionException;
+import org.apache.openejb.quartz.Scheduler;
+import org.apache.openejb.quartz.SimpleScheduleBuilder;
+import org.apache.openejb.quartz.SimpleTrigger;
+import org.apache.openejb.quartz.TriggerBuilder;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/QuartzMdb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/QuartzMdb.java?rev=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/QuartzMdb.java (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-beans/src/main/java/org/superbiz/quartz/QuartzMdb.java Thu Dec 5 09:56:35 2013
@@ -16,15 +16,15 @@
*/
package org.superbiz.quartz;
-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.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
@MessageDriven(activationConfig = {
- @ActivationConfigProperty(propertyName = "cronExpression", propertyValue = "* * * * * ?")
+ @ActivationConfigProperty(propertyName = "cronExpression", propertyValue = "* * * * * ?")
})
public class QuartzMdb implements Job {
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml?rev=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml Thu Dec 5 09:56:35 2013
@@ -32,8 +32,8 @@
</description>
<dependencies>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
+ <groupId>org.apache.openejb.shade</groupId>
+ <artifactId>quartz-openejb-shade</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-ra/src/main/resources/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-ra/src/main/resources/META-INF/ra.xml?rev=1548053&r1=1548052&r2=1548053&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-ra/src/main/resources/META-INF/ra.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-ra/src/main/resources/META-INF/ra.xml Thu Dec 5 09:56:35 2013
@@ -34,7 +34,7 @@
<inbound-resourceadapter>
<messageadapter>
<messagelistener>
- <messagelistener-type>org.quartz.Job</messagelistener-type>
+ <messagelistener-type>org.apache.openejb.quartz.Job</messagelistener-type>
<activationspec>
<activationspec-class>org.apache.openejb.resource.quartz.JobSpec</activationspec-class>
</activationspec>