You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/12/09 19:56:14 UTC
svn commit: r724826 - in /tuscany/java/sca/modules: core/META-INF/
core/src/main/java/org/apache/tuscany/sca/core/work/
core/src/main/java/org/apache/tuscany/sca/core/work/impl/
core/src/main/resources/META-INF/services/ core/src/test/java/org/apache/t...
Author: rfeng
Date: Tue Dec 9 10:56:13 2008
New Revision: 724826
URL: http://svn.apache.org/viewvc?rev=724826&view=rev
Log:
Adjust the package names and move test cases around
Added:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme (props changed)
- copied unchanged from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme (props changed)
- copied unchanged from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java (contents, props changed)
- copied, changed from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
Removed:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
Modified:
tuscany/java/sca/modules/core/META-INF/MANIFEST.MF
tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
Modified: tuscany/java/sca/modules/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/META-INF/MANIFEST.MF?rev=724826&r1=724825&r2=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/core/META-INF/MANIFEST.MF Tue Dec 9 10:56:13 2008
@@ -36,7 +36,7 @@
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 @@
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",
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java Tue Dec 9 10:56:13 2008
@@ -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;
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java Tue Dec 9 10:56:13 2008
@@ -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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
/*
* 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 @@
/*
* 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 @@
/*
* 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;
Propchange: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java:713805-714043
+/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java Tue Dec 9 10:56:13 2008
@@ -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.
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java Tue Dec 9 10:56:13 2008
@@ -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;
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java Tue Dec 9 10:56:13 2008
@@ -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 @@
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 @@
*
* @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 @@
*
* @return Original work.
*/
- public Work getOriginalWork() {
+ public Work<?> getOriginalWork() {
return originalWork;
}
@@ -77,7 +77,7 @@
* @return Work.
* @throws WorkException If the work completed with an exception.
*/
- public Work getResult() {
+ public Work<?> getResult() {
return result;
}
@@ -86,7 +86,7 @@
*
* @param result Result.
*/
- protected void setResult(final Work result) {
+ protected void setResult(final Work<?> result) {
this.result = result;
}
Copied: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java (from r724799, tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java?p2=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java&p1=tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java Tue Dec 9 10:56:13 2008
@@ -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 {
Propchange: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java:713805-714043
+/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java:694816-713804
Modified: tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler?rev=724826&r1=724825&r2=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (original)
+++ tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler Tue Dec 9 10:56:13 2008
@@ -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
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java:694816-713804
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/NonBlockingInterceptorTestCase.java.fixme
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java Tue Dec 9 10:56:13 2008
@@ -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;
/**
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java Tue Dec 9 10:56:13 2008
@@ -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
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java:694816-713804
Copied: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java?p2=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java (original)
+++ tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java Tue Dec 9 10:56:13 2008
@@ -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
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java:694816-713804
Copied: tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java (from r724799, tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java?p2=tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java&p1=tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java&r1=724799&r2=724826&rev=724826&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java (original)
+++ tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java Tue Dec 9 10:56:13 2008
@@ -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;
Propchange: tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 9 10:56:13 2008
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java:671193
+/tuscany/branches/sca-java-1.x/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java:713805-714043
+/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java:694816-713804