[jboss-cvs] JBossAS SVN: r102577 - in trunk: component-matrix and 2 other directories.

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

Author: pgier
Date: 2010-03-18 15:13:30 -0400 (Thu, 18 Mar 2010)
New Revision: 102577

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/connector/pom.xml
   trunk/connector/src/main/java/org/jboss/resource/adapter/quartz/inflow/JBossQuartzThreadPool.java
Log:
[JBAS-6133] Update to latest version of quartz.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-03-18 19:09:11 UTC (rev 102576)
+++ trunk/build/build.xml	2010-03-18 19:13:30 UTC (rev 102577)
@@ -1863,7 +1863,7 @@
       <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
       <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
       <fileset refid="org.jboss.logmanager:jboss-logmanager-log4j:jar"/>
-      <fileset refid="quartz:quartz:jar"/>
+      <fileset refid="org.quartz-scheduler:quartz:jar"/>
       <fileset refid="jaxen:jaxen:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-18 19:09:11 UTC (rev 102576)
+++ trunk/component-matrix/pom.xml	2010-03-18 19:13:30 UTC (rev 102577)
@@ -2727,9 +2727,9 @@
       </dependency>
       
       <dependency>
-        <groupId>quartz</groupId>
+        <groupId>org.quartz-scheduler</groupId>
         <artifactId>quartz</artifactId>
-        <version>1.5.2</version>
+        <version>1.7.3</version>
       </dependency>
       
       <dependency>

Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml	2010-03-18 19:09:11 UTC (rev 102576)
+++ trunk/connector/pom.xml	2010-03-18 19:13:30 UTC (rev 102577)
@@ -253,7 +253,7 @@
       <artifactId>jboss-threads</artifactId>
     </dependency>
     <dependency>
-      <groupId>quartz</groupId>
+      <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
     </dependency>
     <dependency>

Modified: trunk/connector/src/main/java/org/jboss/resource/adapter/quartz/inflow/JBossQuartzThreadPool.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/adapter/quartz/inflow/JBossQuartzThreadPool.java	2010-03-18 19:09:11 UTC (rev 102576)
+++ trunk/connector/src/main/java/org/jboss/resource/adapter/quartz/inflow/JBossQuartzThreadPool.java	2010-03-18 19:13:30 UTC (rev 102577)
@@ -40,16 +40,48 @@
  */
 public class JBossQuartzThreadPool implements org.quartz.spi.ThreadPool
 {
+
+   private String schedulerInstanceName;
+   
+   private String schedulerInstanceId;
+   
    private int poolSize = Integer.MAX_VALUE;
 
    private WorkManager workManager;
 
+   /**
+    * @see org.quartz.spi.ThreadPool#initialize()
+    */
    public void initialize() throws SchedulerConfigException
    {
       workManager = QuartzResourceAdapter.getConfigTimeWorkManager();
    }
 
    /**
+    * @see org.quartz.spi.ThreadPool#setInstanceId(String)
+    */
+   public void setInstanceId( String schedInstId )
+   {
+      this.schedulerInstanceId = schedInstId;
+   }
+   
+   /**
+    * @see org.quartz.spi.ThreadPool#setInstanceName(String)
+    */
+   public void setInstanceName( String schedName )
+   {
+      this.schedulerInstanceName = schedName;
+   }
+
+   /**
+    * @see org.quartz.spi.ThreadPool#blockForAvailableThreads()
+    */
+   public int blockForAvailableThreads()
+   {
+      return 1;
+   }
+   
+   /**
     * Currently this method is only used in metadata lookup.
     * Which is has no further use.
     * How to provide better estimate?
@@ -108,5 +140,5 @@
       }
 
    }
-
+   
 }