- Revision
- 874
- Author
- paul
- Date
- 2009-01-15 06:31:24 -0600 (Thu, 15 Jan 2009)
Log Message
fix name
Modified Paths
- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java
- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java
- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java
- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java
- sandbox/v2experiment/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java
- sandbox/v2experiment/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java
Added Paths
Removed Paths
Diff
Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java (873 => 874)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java 2009-01-15 12:31:24 UTC (rev 874) @@ -9,7 +9,7 @@ import org.picocontainer.PicoContainer; import org.picocontainer.DefaultPicoContainer; import org.picocontainer.monitors.NullComponentMonitor; -import org.codehaus.waffle.context.pico.PicoLifecycleStrategy; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.codehaus.waffle.context.pico.HttpSessionComponentAdapter; import org.codehaus.waffle.monitor.RegistrarMonitor; import org.codehaus.waffle.monitor.ContextMonitor; @@ -34,7 +34,7 @@ */ public class ContextContainerFactory { private final ComponentMonitor picoComponentMonitor = new NullComponentMonitor(); - private final LifecycleStrategy picoLifecycleStrategy = new PicoLifecycleStrategy(picoComponentMonitor); + private final LifecycleStrategy picoLifecycleStrategy = new WaffleLifecycleStrategy(picoComponentMonitor); private final RegistrarMonitor registrarMonitor; private final ParameterResolver parameterResolver;
Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java (873 => 874)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java 2009-01-15 12:31:24 UTC (rev 874) @@ -1,27 +0,0 @@ -/* - * Copyright (c) terms as published in http://waffle.codehaus.org/license.html - */ -package org.codehaus.waffle.context.pico; - -import org.codehaus.waffle.Startable; -import org.picocontainer.ComponentMonitor; -import org.picocontainer.lifecycle.StartableLifecycleStrategy; - -...@suppresswarnings("serial") -public class PicoLifecycleStrategy extends StartableLifecycleStrategy { - public PicoLifecycleStrategy(ComponentMonitor componentMonitor) { - super(componentMonitor); - } - - protected String getStopMethodName() { - return "stop"; - } - - protected String getStartMethodName() { - return "start"; - } - - protected Class<?> getStartableInterface() { - return Startable.class; - } -}
Copied: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleLifecycleStrategy.java (from rev 863, sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java) (0 => 874)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleLifecycleStrategy.java (rev 0) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleLifecycleStrategy.java 2009-01-15 12:31:24 UTC (rev 874) @@ -0,0 +1,27 @@ +/* + * Copyright (c) terms as published in http://waffle.codehaus.org/license.html + */ +package org.codehaus.waffle.context.pico; + +import org.codehaus.waffle.Startable; +import org.picocontainer.ComponentMonitor; +import org.picocontainer.lifecycle.StartableLifecycleStrategy; + +...@suppresswarnings("serial") +public class WaffleLifecycleStrategy extends StartableLifecycleStrategy { + public WaffleLifecycleStrategy(ComponentMonitor componentMonitor) { + super(componentMonitor); + } + + protected String getStopMethodName() { + return "stop"; + } + + protected String getStartMethodName() { + return "start"; + } + + protected Class<?> getStartableInterface() { + return Startable.class; + } +}
Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java (873 => 874)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java 2009-01-15 12:31:24 UTC (rev 874) @@ -160,13 +160,13 @@ @Test public void canStopChildContainerWithoutStoppingParent() { NullComponentMonitor ncm = new NullComponentMonitor(); - MutablePicoContainer applicationContainer = new DefaultPicoContainer(new Caching(), new PicoLifecycleStrategy(ncm), new EmptyPicoContainer(), ncm); + MutablePicoContainer applicationContainer = new DefaultPicoContainer(new Caching(), new WaffleLifecycleStrategy(ncm), new EmptyPicoContainer(), ncm); applicationContainer.addComponent(ApplicationLevelComponent.class); - MutablePicoContainer sessionContainer = new DefaultPicoContainer(new Caching(), new PicoLifecycleStrategy(ncm), applicationContainer, ncm); + MutablePicoContainer sessionContainer = new DefaultPicoContainer(new Caching(), new WaffleLifecycleStrategy(ncm), applicationContainer, ncm); sessionContainer.addComponent(SessionLevelComponent.class); - MutablePicoContainer requestContainer = new DefaultPicoContainer(new Caching(), new PicoLifecycleStrategy(ncm), sessionContainer, ncm); + MutablePicoContainer requestContainer = new DefaultPicoContainer(new Caching(), new WaffleLifecycleStrategy(ncm), sessionContainer, ncm); requestContainer.addComponent(RequestLevelComponent.class); ApplicationLevelComponent applicationLevelComponent = (ApplicationLevelComponent) @@ -361,7 +361,7 @@ // ensure 'picoLifecycleStrategy' is not Null Field lifecycleStrategyField = PicoRegistrar.class.getDeclaredField("lifecycleStrategy"); lifecycleStrategyField.setAccessible(true); - assertTrue(lifecycleStrategyField.get(registrar) instanceof PicoLifecycleStrategy); + assertTrue(lifecycleStrategyField.get(registrar) instanceof WaffleLifecycleStrategy); // ensure 'registrarMonitor' was set Field registrarMonitorField = PicoRegistrar.class.getDeclaredField("registrarMonitor");
Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java (873 => 874)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java 2009-01-15 12:31:24 UTC (rev 874) @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRequest; import org.codehaus.waffle.context.ContextLevel; -import org.codehaus.waffle.context.pico.PicoLifecycleStrategy; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.i18n.DefaultMessagesContext; import org.codehaus.waffle.i18n.MessageResources; @@ -35,7 +35,7 @@ @RunWith(JMock.class) public class RegistrarAssistantTest { - private LifecycleStrategy lifecycleStrategy = new PicoLifecycleStrategy(new NullComponentMonitor()); + private LifecycleStrategy lifecycleStrategy = new WaffleLifecycleStrategy(new NullComponentMonitor()); private Mockery mockery = new Mockery(); private ComponentMonitor cm = new NullComponentMonitor(); private MessageResources messageResources = new DefaultMessageResources();
Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java (873 => 874)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java 2009-01-15 12:31:24 UTC (rev 874) @@ -13,7 +13,7 @@ import org.codehaus.waffle.ComponentRegistry; import org.codehaus.waffle.WaffleException; -import org.codehaus.waffle.context.pico.PicoLifecycleStrategy; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.i18n.MessageResources; import org.codehaus.waffle.monitor.RegistrarMonitor; @@ -49,7 +49,7 @@ public class PicoRegistrarTest { private Mockery mockery = new Mockery(); - private final LifecycleStrategy lifecycleStrategy = new PicoLifecycleStrategy(new NullComponentMonitor()); + private final LifecycleStrategy lifecycleStrategy = new WaffleLifecycleStrategy(new NullComponentMonitor()); private final ComponentMonitor componentMonitor = new NullComponentMonitor(); private final SilentMonitor monitor = new SilentMonitor(); private final MessageResources messageResources = new DefaultMessageResources();
Modified: sandbox/v2experiment/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java (873 => 874)
--- sandbox/v2experiment/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java 2009-01-15 12:31:24 UTC (rev 874) @@ -3,7 +3,7 @@ import org.codehaus.waffle.bind.DefaultStringTransmuter; import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder; import org.codehaus.waffle.context.ContextContainer; -import org.codehaus.waffle.context.pico.PicoLifecycleStrategy; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.registrar.Registrar; import org.codehaus.waffle.registrar.pico.DefaultParameterResolver; @@ -25,7 +25,7 @@ } protected Registrar createRegistrar(ContextContainer container) { - LifecycleStrategy lifecycleStrategy = new PicoLifecycleStrategy(new NullComponentMonitor()); + LifecycleStrategy lifecycleStrategy = new WaffleLifecycleStrategy(new NullComponentMonitor()); DefaultMessageResources messageResources = new DefaultMessageResources(); ParameterResolver parameterResolver = new DefaultParameterResolver(new DefaultStringTransmuter( new OgnlValueConverterFinder()), messageResources);
Modified: sandbox/v2experiment/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java (873 => 874)
--- sandbox/v2experiment/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java 2009-01-15 12:29:17 UTC (rev 873) +++ sandbox/v2experiment/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java 2009-01-15 12:31:24 UTC (rev 874) @@ -26,7 +26,7 @@ import org.codehaus.waffle.bind.DefaultStringTransmuter; import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder; import org.codehaus.waffle.context.ContextLevel; -import org.codehaus.waffle.context.pico.PicoLifecycleStrategy; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.monitor.SilentMonitor; import org.codehaus.waffle.registrar.Registrar; @@ -120,7 +120,7 @@ MutablePicoContainer initContainer = new DefaultPicoContainer(); initContainer.addComponent(registrarContainer); initContainer.addComponent(NullComponentMonitor.class); - initContainer.addComponent(PicoLifecycleStrategy.class); + initContainer.addComponent(WaffleLifecycleStrategy.class); initContainer.addComponent(SilentMonitor.class); initContainer.addComponent(DefaultMessageResources.class); initContainer.addComponent(DefaultParameterResolver.class);
To unsubscribe from this list please visit:
