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/12/29 17:09:52 UTC
svn commit: r729926 - in /tuscany/branches/sca-java-1.x/modules/core: ./
src/main/java/org/apache/tuscany/sca/core/work/
src/main/resources/META-INF/services/
src/test/java/org/apache/tuscany/sca/core/work/
Author: antelder
Date: Mon Dec 29 08:09:52 2008
New Revision: 729926
URL: http://svn.apache.org/viewvc?rev=729926&view=rev
Log:
Merge r720913 change to 1.x so we can start looking at a pluggable impl for the geronimo integration work and to remove the dependency from the compact distro
Added:
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
- copied unchanged from r720913, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
- copied unchanged from r720913, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
- copied unchanged from r720913, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
- copied unchanged from r720913, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
- copied unchanged from r720913, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
Removed:
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
Modified:
tuscany/branches/sca-java-1.x/modules/core/pom.xml
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
tuscany/branches/sca-java-1.x/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
Modified: tuscany/branches/sca-java-1.x/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/pom.xml?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/core/pom.xml Mon Dec 29 08:09:52 2008
@@ -60,12 +60,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-commonj_1.1_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.4</version>
Modified: tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java Mon Dec 29 08:09:52 2008
@@ -27,15 +27,9 @@
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadFactory;
+import org.apache.tuscany.sca.work.WorkSchedulerException;
import org.osoa.sca.annotations.Destroy;
-import commonj.work.Work;
-import commonj.work.WorkEvent;
-import commonj.work.WorkException;
-import commonj.work.WorkItem;
-import commonj.work.WorkListener;
-import commonj.work.WorkManager;
-
/**
* A thread-pool based implementation for the JSR-237 work manager.
* <p/>
@@ -46,10 +40,10 @@
*
* @version $Rev$ $Date$
*/
-public class ThreadPoolWorkManager implements WorkManager {
+public class ThreadPoolWorkManager {
// Map of work items currently handled by the work manager
- private Map<WorkItemImpl, WorkListener> workItems = new ConcurrentHashMap<WorkItemImpl, WorkListener>();
+ private Map<WorkItem, WorkListener> workItems = new ConcurrentHashMap<WorkItem, WorkListener>();
// Thread-pool
private ExecutorService executor;
@@ -96,7 +90,7 @@
*/
public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException {
- WorkItemImpl workItem = new WorkItemImpl(new UID().toString(), work);
+ WorkItem workItem = new WorkItem(new UID().toString(), work);
if (workListener != null) {
workItems.put(workItem, workListener);
}
@@ -106,7 +100,7 @@
} else {
workItem.setStatus(WorkEvent.WORK_REJECTED);
if (workListener != null) {
- workListener.workRejected(new WorkEventImpl(workItem));
+ workListener.workRejected(new WorkEvent(workItem));
}
throw new IllegalArgumentException("Unable to schedule work");
}
@@ -138,11 +132,11 @@
* @param workItem Work item representing the work that was accepted.
* @param work Work that was accepted.
*/
- private void workAccepted(final WorkItemImpl workItem, final Work work) {
+ private void workAccepted(final WorkItem workItem, final Work work) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_ACCEPTED);
- WorkEvent event = new WorkEventImpl(workItem);
+ WorkEvent event = new WorkEvent(workItem);
listener.workAccepted(event);
}
}
@@ -150,11 +144,11 @@
/*
* Method to indicate a work start.
*/
- private void workStarted(final WorkItemImpl workItem, final Work work) {
+ private void workStarted(final WorkItem workItem, final Work work) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_STARTED);
- WorkEvent event = new WorkEventImpl(workItem);
+ WorkEvent event = new WorkEvent(workItem);
listener.workStarted(event);
}
}
@@ -162,20 +156,20 @@
/*
* Method to indicate a work completion.
*/
- private void workCompleted(final WorkItemImpl workItem, final Work work) {
+ private void workCompleted(final WorkItem workItem, final Work work) {
workCompleted(workItem, work, null);
}
/*
* Method to indicate a work completion.
*/
- private void workCompleted(final WorkItemImpl workItem, final Work work, final WorkException exception) {
+ private void workCompleted(final WorkItem workItem, final Work work, final WorkSchedulerException exception) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_COMPLETED);
workItem.setResult(work);
workItem.setException(exception);
- WorkEvent event = new WorkEventImpl(workItem);
+ WorkEvent event = new WorkEvent(workItem);
listener.workCompleted(event);
workItems.remove(workItem);
}
@@ -184,7 +178,7 @@
/*
* Schedules the work using the ThreadPool.
*/
- private boolean scheduleWork(final Work work, final WorkItemImpl workItem) {
+ private boolean scheduleWork(final Work work, final WorkItem workItem) {
try {
executor.execute(new DecoratingWork(workItem, work));
return true;
@@ -199,7 +193,7 @@
private final class DecoratingWork implements Runnable {
// Work item for this work.
- private WorkItemImpl workItem;
+ private WorkItem workItem;
// The original work.
private Work decoratedWork;
@@ -207,7 +201,7 @@
/*
* Initializes the work item and underlying work.
*/
- private DecoratingWork(final WorkItemImpl workItem, final Work decoratedWork) {
+ private DecoratingWork(final WorkItem workItem, final Work decoratedWork) {
this.workItem = workItem;
this.decoratedWork = decoratedWork;
}
@@ -221,7 +215,7 @@
decoratedWork.run();
workCompleted(workItem, decoratedWork);
} catch (Throwable th) {
- workCompleted(workItem, decoratedWork, new WorkException(th.getMessage(), th));
+ workCompleted(workItem, decoratedWork, new WorkSchedulerException(th.getMessage(), th));
}
}
Modified: tuscany/branches/sca-java-1.x/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler Mon Dec 29 08:09:52 2008
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.core.work.Jsr237WorkScheduler
+org.apache.tuscany.sca.core.work.DefaultWorkScheduler
Modified: tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java Mon Dec 29 08:09:52 2008
@@ -18,14 +18,17 @@
*/
package org.apache.tuscany.sca.core.work;
-import commonj.work.Work;
/**
* Simple Work item that will throw an exception
*
* @version $Rev$ $Date$
*/
-public class FailingWork implements Work {
+public class FailingWork extends Work {
+
+ public FailingWork() {
+ super(null);
+ }
/**
* {@inheritDoc}
Modified: tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java Mon Dec 29 08:09:52 2008
@@ -38,14 +38,14 @@
/**
* This is the shared instance of the ThreadPoolWorkManager used by the tests
*/
- private static Jsr237WorkScheduler workSchedular = null;
+ private static DefaultWorkScheduler workSchedular = null;
/**
* Setup the Jsr237WorkScheduler
*/
@BeforeClass
public static void setup() {
- workSchedular = new Jsr237WorkScheduler();
+ workSchedular = new DefaultWorkScheduler();
}
/**
Modified: tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java Mon Dec 29 08:09:52 2008
@@ -23,12 +23,9 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.tuscany.sca.work.WorkSchedulerException;
import org.junit.Assert;
-import commonj.work.WorkEvent;
-import commonj.work.WorkException;
-import commonj.work.WorkListener;
-
/**
* A simple WorkListener that tracks invocations to it.
*
@@ -59,7 +56,7 @@
/**
* List of all exceptions thrown by Work items
*/
- private List<WorkException> workExceptions = Collections.synchronizedList(new ArrayList<WorkException>());
+ private List<WorkSchedulerException> workExceptions = Collections.synchronizedList(new ArrayList<WorkSchedulerException>());
/**
* {@inheritDoc}
@@ -150,7 +147,7 @@
*
* @return A List of all exceptions that are thrown by the Work items
*/
- public List<WorkException> getWorkExceptions() {
+ public List<WorkSchedulerException> getWorkExceptions() {
return Collections.unmodifiableList(workExceptions);
}
}
Modified: tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java?rev=729926&r1=729925&r2=729926&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java Mon Dec 29 08:09:52 2008
@@ -20,15 +20,13 @@
import java.util.concurrent.atomic.AtomicInteger;
-import commonj.work.Work;
-
/**
* Simple Work item that will sleep in the run() method for the specified
* period of time
*
* @version $Rev$ $Date$
*/
-public class TimeDelayWork implements Work {
+public class TimeDelayWork extends Work {
/**
* Count of completed run() method calls
@@ -46,6 +44,7 @@
* @param sleepTime The amount of time to sleep (in milliseconds) in the run() method
*/
public TimeDelayWork(long sleepTime) {
+ super(null);
this.sleepTime = sleepTime;
}