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 2007/03/24 03:34:03 UTC
svn commit: r521966 - in /incubator/tuscany/sandbox/rfeng/minicore/src:
main/java/org/apache/tuscany/core/component/
main/java/org/apache/tuscany/core/policy/
test/java/org/apache/tuscany/core/component/
test/java/org/apache/tuscany/core/component/scope/
Author: rfeng
Date: Fri Mar 23 19:34:02 2007
New Revision: 521966
URL: http://svn.apache.org/viewvc?view=rev&rev=521966
Log:
Further clean up
Removed:
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/CallableReferenceImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/CallbackReferenceImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/ComponentContextImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/InstanceFactory.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/ServiceReferenceImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/sandbox/rfeng/minicore/src/main/java/org/apache/tuscany/core/policy/
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/WorkContextImplTestCase.java
Modified:
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerDestroyOnExpirationTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java Fri Mar 23 19:34:02 2007
@@ -18,15 +18,15 @@
*/
package org.apache.tuscany.core.component.scope;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.SimpleWorkContext;
+import org.apache.tuscany.core.services.store.memory.MemoryStore;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.services.store.StoreMonitor;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.services.store.memory.MemoryStore;
import org.easymock.EasyMock;
/**
@@ -88,7 +88,7 @@
monitor.start(EasyMock.isA(String.class));
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
- workContext = new WorkContextImpl();
+ workContext = new SimpleWorkContext();
scopeContainer = new ConversationalScopeContainer(store, workContext, null);
scopeContainer.start();
}
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java Fri Mar 23 19:34:02 2007
@@ -19,14 +19,14 @@
package org.apache.tuscany.core.component.scope;
import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.easymock.EasyMock;
/**
* @version $$Rev$$ $$Date$$
@@ -207,7 +207,7 @@
component = EasyMock.createStrictMock(AtomicComponent.class);
wrapper = EasyMock.createStrictMock(InstanceWrapper.class);
- workContext = new WorkContextImpl();
+ workContext = new SimpleWorkContext();
monitor = EasyMock.createStrictMock(ScopeContainerMonitor.class);
scopeContainer = new HttpSessionScopeContainer(workContext, monitor);
scopeContainer.start();
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerDestroyOnExpirationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerDestroyOnExpirationTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerDestroyOnExpirationTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerDestroyOnExpirationTestCase.java Fri Mar 23 19:34:02 2007
@@ -19,16 +19,16 @@
package org.apache.tuscany.core.component.scope;
import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.services.store.Store;
import org.apache.tuscany.spi.services.store.StoreExpirationEvent;
+import org.easymock.EasyMock;
+import org.easymock.IAnswer;
/**
* @version $Rev$ $Date$
@@ -67,6 +67,6 @@
store = EasyMock.createMock(Store.class);
wrapper = EasyMock.createMock(InstanceWrapper.class);
component = EasyMock.createMock(AtomicComponent.class);
- context = new WorkContextImpl();
+ context = new SimpleWorkContext();
}
}
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java Fri Mar 23 19:34:02 2007
@@ -18,17 +18,17 @@
*/
package org.apache.tuscany.core.component.scope;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.store.Store;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.easymock.EasyMock;
/**
@@ -52,7 +52,7 @@
protected void setUp() throws Exception {
super.setUp();
- context = new WorkContextImpl();
+ context = new SimpleWorkContext();
component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getMaxIdleTime()).andReturn(-1L).atLeastOnce();
EasyMock.expect(component.getMaxAge()).andReturn(600000L).atLeastOnce();
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java Fri Mar 23 19:34:02 2007
@@ -18,17 +18,17 @@
*/
package org.apache.tuscany.core.component.scope;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.event.RuntimeEventListener;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.store.Store;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.easymock.EasyMock;
/**
@@ -53,7 +53,7 @@
protected void setUp() throws Exception {
super.setUp();
wrapper = EasyMock.createMock(InstanceWrapper.class);
- context = new WorkContextImpl();
+ context = new SimpleWorkContext();
component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getMaxIdleTime()).andStubReturn(600000L);
EasyMock.replay(component);
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java Fri Mar 23 19:34:02 2007
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.core.component.scope;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.SimpleWorkContext;
+import org.apache.tuscany.core.services.store.memory.MemoryStore;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.store.Store;
import org.apache.tuscany.spi.services.store.StoreMonitor;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.services.store.memory.MemoryStore;
import org.easymock.EasyMock;
/**
@@ -173,7 +173,7 @@
protected void setUp() throws Exception {
super.setUp();
- context = new WorkContextImpl();
+ context = new SimpleWorkContext();
StoreMonitor mock = EasyMock.createNiceMock(StoreMonitor.class);
EasyMock.replay(mock);
Store store = new MemoryStore(mock);
Modified: incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=521966&r1=521965&r2=521966
==============================================================================
--- incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/sandbox/rfeng/minicore/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Fri Mar 23 19:34:02 2007
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.component.WorkContext;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.SimpleWorkContext;
import org.easymock.EasyMock;
/**
@@ -32,7 +32,7 @@
public class WorkContextTestCase extends TestCase {
public void testSetCurrentAtomicComponent() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
AtomicComponent component2 = EasyMock.createNiceMock(AtomicComponent.class);
ctx.setCurrentAtomicComponent(component);
@@ -42,19 +42,19 @@
}
public void testNonSetCurrentAtomicComponent() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
assertNull(ctx.getCurrentAtomicComponent());
}
public void testIndentifier() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
Object id = new Object();
ctx.setIdentifier(this, id);
assertEquals(id, ctx.getIdentifier(this));
}
public void testClearIndentifier() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
Object id = new Object();
ctx.setIdentifier(this, id);
ctx.clearIdentifier(this);
@@ -62,7 +62,7 @@
}
public void testClearIndentifiers() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
Object id = new Object();
Object id2 = new Object();
ctx.setIdentifier(id, id);
@@ -73,12 +73,12 @@
}
public void testClearNonExistentIndentifier() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
ctx.clearIdentifier(this);
}
public void testNullIndentifier() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
Object id = new Object();
ctx.setIdentifier(this, id);
ctx.clearIdentifier(null);
@@ -86,12 +86,12 @@
}
public void testNoIndentifier() throws Exception {
- WorkContext ctx = new WorkContextImpl();
+ WorkContext ctx = new SimpleWorkContext();
assertNull(ctx.getIdentifier(this));
}
public void testSetGetCorrelationId() {
- WorkContext context = new WorkContextImpl();
+ WorkContext context = new SimpleWorkContext();
context.setCorrelationId("msg-005");
assertEquals(context.getCorrelationId(), "msg-005");
context.setCorrelationId(null);
@@ -99,7 +99,7 @@
}
public void testSetGetCorrelationIdInNewThread() throws InterruptedException {
- WorkContext context = new WorkContextImpl();
+ WorkContext context = new SimpleWorkContext();
context.setCorrelationId("msg-005");
assertEquals(context.getCorrelationId(), "msg-005");
context.setIdentifier("TX", "002");
@@ -113,7 +113,7 @@
public void testCurrentAtomicComponentDoesNotPropagateToChildThread() throws InterruptedException {
// NOTE should behaviour be to propagate?
- WorkContext context = new WorkContextImpl();
+ WorkContext context = new SimpleWorkContext();
context.setCurrentAtomicComponent(EasyMock.createNiceMock(AtomicComponent.class));
TestCurrentAtomicComponentChildThread t = new TestCurrentAtomicComponentChildThread(context);
t.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org