Index: geronimo-spec-commonj/src/main/java/commonj/work/WorkItem.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/WorkItem.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/WorkItem.java	(working copy)
@@ -33,7 +33,7 @@
  */
 public interface WorkItem extends Comparable {
 
-    Work getResult();
+    Work getResult() throws WorkException;
     int getStatus();
 
 }
Index: geronimo-spec-commonj/src/main/java/commonj/work/WorkEvent.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/WorkEvent.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/WorkEvent.java	(working copy)
@@ -33,10 +33,10 @@
  */
 public interface WorkEvent {
 
-    static int WORK_ACCEPTED = 1;
-    static int WORK_COMPLETED = 4;
-    static int WORK_REJECTED = 2;
-    static int WORK_STARTED = 3;
+    static final int WORK_ACCEPTED = 1;
+    static final int WORK_REJECTED = 2;
+    static final int WORK_STARTED = 3;
+    static final int WORK_COMPLETED = 4;
 
     WorkException getException();
     int getType();
Index: geronimo-spec-commonj/src/main/java/commonj/work/WorkRejectedException.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/WorkRejectedException.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/WorkRejectedException.java	(working copy)
@@ -31,7 +31,7 @@
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
-public class WorkRejectedException extends Exception {
+public class WorkRejectedException extends WorkException {
 
 
     public WorkRejectedException() {
Index: geronimo-spec-commonj/src/main/java/commonj/work/RemoteWorkItem.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/RemoteWorkItem.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/RemoteWorkItem.java	(working copy)
@@ -33,7 +33,7 @@
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
-public interface RemoteWorkItem extends Comparable, WorkItem {
+public interface RemoteWorkItem extends WorkItem {
 
     WorkManager getPinnedWorkManager();
     void release();
Index: geronimo-spec-commonj/src/main/java/commonj/work/WorkManager.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/WorkManager.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/WorkManager.java	(working copy)
@@ -35,12 +35,12 @@
  */
 public interface WorkManager {
 
-    static long IMMEDIATE = 0;
-    static long INDEFINITE = java.lang.Long.MAX_VALUE;
+    static final long IMMEDIATE = 0;
+    static final long INDEFINITE = java.lang.Long.MAX_VALUE;
 
-    WorkItem schedule(Work work) throws IllegalArgumentException;
+    WorkItem schedule(Work work) throws WorkException, IllegalArgumentException;
 
-    WorkItem schedule(Work work, WorkListener listener) throws IllegalArgumentException;
+    WorkItem schedule(Work work, WorkListener listener) throws WorkException, IllegalArgumentException;
 
     boolean waitForAll(Collection workItems, long timeout) 
         throws InterruptedException, IllegalArgumentException;
Index: geronimo-spec-commonj/src/main/java/commonj/work/WorkCompletedException.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/work/WorkCompletedException.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/work/WorkCompletedException.java	(working copy)
@@ -28,22 +28,43 @@
 
 package commonj.work;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
-public class WorkCompletedException extends Exception {
+public class WorkCompletedException extends WorkException {
+    private final List exceptionList;
 
     public WorkCompletedException() {
         super();
+        exceptionList = Collections.emptyList();
     }
     public WorkCompletedException(String message) {
         super(message);
+        exceptionList = Collections.emptyList();
     }
     public WorkCompletedException(String message, Throwable cause) {
         super(message, cause);
+        exceptionList = Collections.singletonList(cause);
     }
     public WorkCompletedException(Throwable cause) {
         super(cause);
+        exceptionList = Collections.singletonList(cause);
     }
+    public WorkCompletedException(String message, List list) {
+        super(message);
+        if (list != null) {
+            initCause((Throwable) list.get(0));
+            exceptionList = Collections.unmodifiableList(new ArrayList(list));
+        } else {
+            exceptionList = Collections.emptyList();
+        }
+    }
 
+    public List getExceptionList() {
+        return exceptionList;
+    }
 }
Index: geronimo-spec-commonj/src/main/java/commonj/timers/TimerManager.java
===================================================================
--- geronimo-spec-commonj/src/main/java/commonj/timers/TimerManager.java	(revision 420330)
+++ geronimo-spec-commonj/src/main/java/commonj/timers/TimerManager.java	(working copy)
@@ -35,16 +35,16 @@
  */
 public interface TimerManager {
 
-    static long IMMEDIATE = 0;
-    static long INDEFINITE = java.lang.Long.MAX_VALUE;
+    static final long IMMEDIATE = 0;
+    static final long INDEFINITE = Long.MAX_VALUE;
 
-    boolean isStopped() throws IllegalStateException;
+    boolean isStopped();
 
-    boolean isStopping() throws IllegalStateException;
+    boolean isStopping();
 
-    boolean isSuspended() throws IllegalStateException;
+    boolean isSuspended();
 
-    boolean isSuspending() throws IllegalStateException;
+    boolean isSuspending();
 
     void resume() throws IllegalStateException;
 
@@ -68,12 +68,12 @@
 
     void stop() throws IllegalStateException;
 
-    void suspend() throws IllegalStateException;
+    void suspend();
 
-    boolean waitForStop(long timeOut)
+    boolean waitForStop(long timeout_ms)
         throws InterruptedException, IllegalArgumentException;
 
-    boolean waitForSuspend(long timOut)
+    boolean waitForSuspend(long timeout_ms)
         throws InterruptedException, IllegalStateException, IllegalArgumentException;
 
 }
Index: pom.xml
===================================================================
--- pom.xml	(revision 420330)
+++ pom.xml	(working copy)
@@ -39,7 +39,7 @@
     <geronimoSpecsVersion>1.2-SNAPSHOT</geronimoSpecsVersion>
 
     <geronimoSpecsActivationVersion>1.1</geronimoSpecsActivationVersion>
-    <geronimoSpecsCommonjVersion>1.0</geronimoSpecsCommonjVersion>
+    <geronimoSpecsCommonjVersion>1.0.1-SNAPSHOT</geronimoSpecsCommonjVersion>
     <geronimoSpecsCorbaVersion>1.0</geronimoSpecsCorbaVersion>
     <geronimoSpecsCorba30Version>1.1</geronimoSpecsCorba30Version>
     <geronimoSpecsCorba23Version>1.1</geronimoSpecsCorba23Version>