weaver 2004/06/23 11:31:10
Modified: components/cm/src/test/org/apache/jetspeed/components
TestInterceptorAdapter.java
Log:
JS2-46
Revision Changes Path
1.2 +7 -6
jakarta-jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/TestInterceptorAdapter.java
Index: TestInterceptorAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/TestInterceptorAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestInterceptorAdapter.java 24 May 2004 21:27:44 -0000 1.1
+++ TestInterceptorAdapter.java 23 Jun 2004 18:31:10 -0000 1.2
@@ -27,10 +27,11 @@
import org.picocontainer.defaults.CachingComponentAdapter;
import org.picocontainer.defaults.ComponentParameter;
import org.picocontainer.defaults.ConstantParameter;
-import org.picocontainer.defaults.ConstructorComponentAdapter;
+import org.picocontainer.defaults.ConstructorInjectionComponentAdapter;
import org.picocontainer.defaults.DefaultPicoContainer;
import org.picocontainer.defaults.InstanceComponentAdapter;
-import org.picocontainer.defaults.Swappable;
+
+import com.thoughtworks.proxy.toys.hotswap.Swappable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver </a>
@@ -91,7 +92,7 @@
assertTrue(testComponent instanceof Swappable);
// Now test our hot swapping
- ((Swappable) testComponent).__hotSwap(c2);
+ ((Swappable) testComponent).hotswap(c2);
assertTrue(testComponent.getValue1() == 2
&& testComponent.getValue2().equals("c2"));
@@ -102,7 +103,7 @@
Thread.currentThread().setName("Thread 1");
DefaultPicoContainer pico = new DefaultPicoContainer();
- ConstructorComponentAdapter cca = new ConstructorComponentAdapter(
+ ConstructorInjectionComponentAdapter cca = new
ConstructorInjectionComponentAdapter(
MockComponent.class, BaseMockComponent.class, new Parameter[]{
new ConstantParameter(new Integer(1)),
new ConstantParameter("c1")});
@@ -144,7 +145,7 @@
pico.registerComponentImplementation(SINGLETON_KEY,
MockDependentComponent.class, new Parameter[]{new
ComponentParameter(MockComponent.class)});
- ConstructorComponentAdapter cca = new
ConstructorComponentAdapter(MockComponent.class, BaseMockComponent.class, new
Parameter[] {new ConstantParameter(new Integer(1)), new ConstantParameter("c1")});
+ ConstructorInjectionComponentAdapter cca = new
ConstructorInjectionComponentAdapter(MockComponent.class, BaseMockComponent.class, new
Parameter[] {new ConstantParameter(new Integer(1)), new ConstantParameter("c1")});
pico.registerComponent(new InterceptorAdapter(cca,
ThreadLocalDelegationStrategy.class));
pico.start();
@@ -170,7 +171,7 @@
//Now change this thread without affecting the other thread
MockComponent c2 = new BaseMockComponent(2, "c2");
- ((Swappable) testMc).__hotSwap(c2);
+ ((Swappable) testMc).hotswap(c2);
assertEquals("c2", mdc.getMockComponent().getValue2());
// verify that the value has not changed in the other thread
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
