You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/02/19 16:15:37 UTC

svn commit: r629121 - in /incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work: Jsr237WorkScheduler.java ThreadPoolWorkManager.java

Author: antelder
Date: Tue Feb 19 07:15:36 2008
New Revision: 629121

URL: http://svn.apache.org/viewvc?rev=629121&view=rev
Log:
Start adding support for appserver work manager

Modified:
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java?rev=629121&r1=629120&r2=629121&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java Tue Feb 19 07:15:36 2008
@@ -18,12 +18,16 @@
  */
 package org.apache.tuscany.sca.core.work;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 import org.apache.tuscany.sca.work.NotificationListener;
 import org.apache.tuscany.sca.work.WorkScheduler;
 import org.apache.tuscany.sca.work.WorkSchedulerException;
 
 import commonj.work.WorkEvent;
 import commonj.work.WorkListener;
+import commonj.work.WorkManager;
 
 /**
  * A work scheduler implementation based on a JSR 237 work manager.
@@ -39,7 +43,7 @@
     /**
      * Underlying JSR-237 work manager
      */
-    private ThreadPoolWorkManager jsr237WorkManager;
+    private WorkManager jsr237WorkManager;
 
     /**
      * Initializes the JSR 237 work manager.
@@ -47,7 +51,16 @@
      * @param jsr237WorkManager JSR 237 work manager.
      */
     public Jsr237WorkScheduler() {
-        jsr237WorkManager = new ThreadPoolWorkManager(10);
+        
+        try {
+            InitialContext ctx  = new InitialContext();
+            jsr237WorkManager = (WorkManager) ctx.lookup("java:comp/env/wm/TuscanyWorkManager");
+        } catch (NamingException e) {
+            // ignore
+        }
+        if (jsr237WorkManager == null) {
+            jsr237WorkManager = new ThreadPoolWorkManager(10);
+        }
     }
 
     /**
@@ -94,7 +107,9 @@
     }
 
     public void destroy() {
-        jsr237WorkManager.destroy();
+        if (jsr237WorkManager instanceof ThreadPoolWorkManager) {
+            ((ThreadPoolWorkManager)jsr237WorkManager).destroy();
+        }
     }
 
     /*

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java?rev=629121&r1=629120&r2=629121&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java Tue Feb 19 07:15:36 2008
@@ -28,7 +28,6 @@
 import java.util.concurrent.ThreadFactory;
 
 import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Property;
 
 import commonj.work.Work;
 import commonj.work.WorkEvent;



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org