Adjust the package names and move test cases around

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@724826 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 44 insertions, 34 deletions

diff --git a/java/sca/modules/core/META-INF/MANIFEST.MF b/java/sca/modules/core/META-INF/MANIFEST.MF
index a4fc2ccd70..f2e142e02b 100644
--- a/java/sca/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/modules/core/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;version="1.4";
    org.apache.tuscany.sca.provider,

    org.apache.tuscany.sca.core.scope.impl,

    org.apache.tuscany.sca.core.factory",

- org.apache.tuscany.sca.core.work;version="1.4";uses:="javax.naming,org.osoa.sca.annotations,org.apache.tuscany.sca.work"

+ org.apache.tuscany.sca.core.work.impl;version="1.4";uses:="javax.naming,org.osoa.sca.annotations,org.apache.tuscany.sca.work"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA Core Runtime

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

@@ -65,7 +65,7 @@ Import-Package: javax.naming,
  org.apache.tuscany.sca.core.invocation;version="1.4",

  org.apache.tuscany.sca.core.scope;version="1.4",

  org.apache.tuscany.sca.core.wire;version="1.4";resolution:=optional,

- org.apache.tuscany.sca.core.work;version="1.4",

+ org.apache.tuscany.sca.core.work.impl;version="1.4",

  org.apache.tuscany.sca.endpointresolver;version="1.4",

  org.apache.tuscany.sca.extensibility;version="1.4",

  org.apache.tuscany.sca.interfacedef;version="1.4",

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index 2085a796ab..3df2f7188b 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index dad5968f65..0da04d4646 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.rmi.server.UID;
 import java.util.Collection;
@@ -77,7 +77,7 @@ public class ThreadPoolWorkManager {
      * @param work Work that needs to be scheduled.
      * @return Work Work item representing the asynchronous work
      */
-    public WorkItem schedule(Work work) throws IllegalArgumentException {
+    public WorkItem schedule(Work<?> work) throws IllegalArgumentException {
         return schedule(work, null);
     }
 
@@ -88,7 +88,7 @@ public class ThreadPoolWorkManager {
      * @param workListener Work listener for callbacks.
      * @return Work Work item representing the asynchronous work
      */
-    public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException {
+    public WorkItem schedule(Work<?> work, WorkListener workListener) throws IllegalArgumentException {
 
         WorkItem workItem = new WorkItem(new UID().toString(), work);
         if (workListener != null) {
@@ -112,7 +112,7 @@ public class ThreadPoolWorkManager {
      * @param works   Units of the work that need to finish.
      * @param timeout Timeout for waiting for the units of work to finish.
      */
-    public boolean waitForAll(Collection works, long timeout) {
+    public boolean waitForAll(Collection<Work<?>> works, long timeout) {
         throw new UnsupportedOperationException("waitForAll not supported");
     }
 
@@ -122,7 +122,7 @@ public class ThreadPoolWorkManager {
      * @param works   Units of the work that need to finish.
      * @param timeout Timeout for waiting for the units of work to finish.
      */
-    public Collection waitForAny(Collection works, long timeout) {
+    public Collection<Work<?>> waitForAny(Collection<Work<?>> works, long timeout) {
         throw new UnsupportedOperationException("waitForAny not supported");
     }
 
@@ -132,7 +132,7 @@ public class ThreadPoolWorkManager {
      * @param workItem Work item representing the work that was accepted.
      * @param work     Work that was accepted.
      */
-    private void workAccepted(final WorkItem 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);
@@ -144,7 +144,7 @@ public class ThreadPoolWorkManager {
     /*
      * Method to indicate a work start.
      */
-    private void workStarted(final WorkItem 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);
@@ -156,14 +156,14 @@ public class ThreadPoolWorkManager {
     /*
      * Method to indicate a work completion.
      */
-    private void workCompleted(final WorkItem 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 WorkItem workItem, final Work work, final WorkSchedulerException 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);
@@ -178,7 +178,7 @@ public class ThreadPoolWorkManager {
     /*
      * Schedules the work using the ThreadPool.
      */
-    private boolean scheduleWork(final Work work, final WorkItem workItem) {
+    private boolean scheduleWork(final Work<?> work, final WorkItem workItem) {
         try {
             executor.execute(new DecoratingWork(workItem, work));
             return true;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
index c521c60f79..ca06d0e854 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 /**
  * JCA work wrapper.
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
index 8e9a3b4c53..4580011806 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import org.apache.tuscany.sca.work.WorkSchedulerException;
 
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
index 8320c7364f..0fc104d0fc 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import org.apache.tuscany.sca.work.WorkSchedulerException;
 
@@ -35,10 +35,10 @@ class WorkItem {
     private int status = -1;
 
     // Result
-    private Work result;
+    private Work<?> result;
     
     // Original work
-    private Work originalWork;
+    private Work<?> originalWork;
 
     // Exception
     private WorkSchedulerException exception;
@@ -48,7 +48,7 @@ class WorkItem {
      *
      * @param id of this work event.
      */
-    protected WorkItem(final String id, final Work orginalWork) {
+    protected WorkItem(final String id, final Work<?> orginalWork) {
         this.id = id;
         this.originalWork = orginalWork;
     }
@@ -67,7 +67,7 @@ class WorkItem {
      *
      * @return Original work.
      */
-    public Work getOriginalWork() {
+    public Work<?> getOriginalWork() {
         return originalWork;
     }
 
@@ -77,7 +77,7 @@ class WorkItem {
      * @return Work.
      * @throws WorkException If the work completed with an exception.
      */
-    public Work getResult() {
+    public Work<?> getResult() {
         return result;
     }
 
@@ -86,7 +86,7 @@ class WorkItem {
      *
      * @param result Result.
      */
-    protected void setResult(final Work result) {
+    protected void setResult(final Work<?> result) {
         this.result = result;
     }
 
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
index 90b11108e9..facb2dfe56 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
@@ -17,7 +17,7 @@
  * under the License.    

  */

 

-package org.apache.tuscany.sca.core.work;

+package org.apache.tuscany.sca.core.work.impl;

 

 public interface WorkListener {

 

diff --git a/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 93d93491a8..9923ba5927 100644
--- a/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License.

 

-org.apache.tuscany.sca.core.work.DefaultWorkScheduler

+org.apache.tuscany.sca.core.work.impl.DefaultWorkScheduler

diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
index 27985425bc..27985425bc 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
index cfd18ab18e..866b0994e7 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.core.wire;
+package org.apache.tuscany.sca.core.invocation.impl;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
index b8150d4edc..b8150d4edc 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
index c69a1908e8..fe29a9501f 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
+
+import org.apache.tuscany.sca.core.work.impl.Work;
 
 
 /**
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
index 91b45dfbcb..2d791e5012 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 /**
  * Simple Runnable that throws an IllegalArgumentException
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
index a7617f7a70..c0183b6f9b 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
index 75840efef4..307f24aca7 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
index 38c8459da8..851528b20c 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
+import org.apache.tuscany.sca.core.work.impl.DefaultWorkScheduler;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
index 58a1b87c48..24a91331a4 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.tuscany.sca.core.work.impl.WorkEvent;
+import org.apache.tuscany.sca.core.work.impl.WorkListener;
 import org.apache.tuscany.sca.work.WorkSchedulerException;
 import org.junit.Assert;
 
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
index 8e04579019..89fd74ef38 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
+import org.apache.tuscany.sca.core.work.impl.ThreadPoolWorkManager;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
index 6c10057046..bada856af3 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
+++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.core.work;
+package org.apache.tuscany.sca.core.work.impl;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.tuscany.sca.core.work.impl.Work;
+
 /**
  * Simple Work item that will sleep in the run() method for the specified 
  * period of time
diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
index d3e31eb570..9758cba3b4 100644
--- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
@@ -17,11 +17,13 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core;
+package org.apache.tuscany.sca.extensibility;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.junit.Before;
 import org.junit.Test;