From 93bd9e06bc7dabac2f8774d22d21a8d019709300 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 29 Oct 2023 23:37:04 +0100 Subject: [PATCH] Drop plexus-container-default --- ReleaseNotes.md | 8 + plexus-container-default/pom.xml | 113 --- .../src/it/multi-plexus.xml/pom.xml | 27 - .../plexus/test/it/multiplx/Component.java | 26 - .../test/it/multiplx/ComponentImpl.java | 28 - .../main/resources/META-INF/plexus/plexus.xml | 8 - .../test/it/multiplx/ComponentLookupTest.java | 34 - .../src/it/plexus-its/pom.xml | 40 - .../java/org/codehaus/plexus/its/App.java | 12 - .../org/codehaus/plexus/its/DefaultApp.java | 27 - .../plexus/its/DefaultLogEnabledApp.java | 26 - .../java/org/codehaus/plexus/its/AppTest.java | 28 - .../component-with-plexus.xml/pom.xml | 6 - .../test/fodder/withplx/TestComponent.java | 24 - .../fodder/withplx/TestComponentImpl.java | 28 - .../main/resources/META-INF/plexus/plexus.xml | 8 - .../org/codehaus/plexus/ClassRealmUtil.java | 72 -- .../codehaus/plexus/ComponentRegistry.java | 64 -- .../plexus/ContainerConfiguration.java | 109 --- .../plexus/DefaultComponentRegistry.java | 526 ----------- .../plexus/DefaultContainerConfiguration.java | 317 ------- .../plexus/DefaultPlexusContainer.java | 788 ---------------- .../DuplicateChildContainerException.java | 40 - .../plexus/MutablePlexusContainer.java | 65 -- .../org/codehaus/plexus/PlexusConstants.java | 25 - .../org/codehaus/plexus/PlexusContainer.java | 435 --------- .../plexus/PlexusContainerException.java | 43 - .../codehaus/plexus/PlexusJUnit4TestCase.java | 250 ------ .../org/codehaus/plexus/PlexusTestCase.java | 230 ----- .../codehaus/plexus/component/CastUtils.java | 69 -- .../component/MapOrientedComponent.java | 30 - .../AbstractComponentBuildListener.java | 27 - .../builder/ComponentBuildListener.java | 28 - .../component/builder/ComponentBuilder.java | 27 - .../builder/XBeanComponentBuilder.java | 522 ----------- .../AbstractComponentCollection.java | 165 ---- .../component/collections/ComponentList.java | 223 ----- .../component/collections/ComponentMap.java | 196 ---- .../composition/CompositionResolver.java | 58 -- ...ycleDetectedInComponentGraphException.java | 46 - .../DefaultCompositionResolver.java | 76 -- .../UndefinedComponentComposerException.java | 34 - .../AbstractComponentConfigurator.java | 116 --- .../BasicComponentConfigurator.java | 57 -- .../ComponentConfigurationException.java | 48 - .../configurator/ComponentConfigurator.java | 54 -- .../configurator/ConfigurationListener.java | 48 - .../MapOrientedComponentConfigurator.java | 48 - .../AbstractConfigurationConverter.java | 183 ---- .../converters/ComponentValueSetter.java | 219 ----- .../converters/ConfigurationConverter.java | 77 -- .../basic/AbstractBasicConverter.java | 121 --- .../converters/basic/BooleanConverter.java | 36 - .../converters/basic/ByteConverter.java | 36 - .../converters/basic/CharConverter.java | 36 - .../converters/basic/ClassConverter.java | 36 - .../converters/basic/Converter.java | 44 - .../converters/basic/DateConverter.java | 60 -- .../converters/basic/DoubleConverter.java | 36 - .../converters/basic/EnumConverter.java | 72 -- .../converters/basic/FileConverter.java | 67 -- .../converters/basic/FloatConverter.java | 36 - .../converters/basic/IntConverter.java | 42 - .../converters/basic/LongConverter.java | 36 - .../converters/basic/ShortConverter.java | 36 - .../basic/StringBufferConverter.java | 35 - .../converters/basic/StringConverter.java | 35 - .../converters/basic/UriConverter.java | 44 - .../converters/basic/UrlConverter.java | 47 - .../converters/composite/ArrayConverter.java | 134 --- .../composite/CollectionConverter.java | 174 ---- .../converters/composite/MapConverter.java | 81 -- .../composite/ObjectWithFieldsConverter.java | 129 --- .../PlexusConfigurationConverter.java | 55 -- .../composite/PropertiesConverter.java | 99 -- .../converters/lookup/ConverterLookup.java | 35 - .../lookup/DefaultConverterLookup.java | 158 ---- .../special/ClassRealmConverter.java | 81 -- .../DefaultExpressionEvaluator.java | 40 - .../ExpressionEvaluationException.java | 32 - .../expression/ExpressionEvaluator.java | 45 - .../TypeAwareExpressionEvaluator.java | 37 - ...tractResourceBasedComponentDiscoverer.java | 90 -- .../AnnotationBasedComponentDiscoverer.java | 8 - .../discovery/ComponentDiscoverer.java | 32 - .../discovery/ComponentDiscovererManager.java | 38 - .../discovery/ComponentDiscoveryEvent.java | 56 -- .../discovery/ComponentDiscoveryListener.java | 28 - .../discovery/DefaultComponentDiscoverer.java | 80 -- .../DefaultComponentDiscovererManager.java | 68 -- .../DiscoveryListenerDescriptor.java | 35 - .../PlexusXmlComponentDiscoverer.java | 69 -- .../ResourceBasedComponentDiscoverer.java | 11 - .../factory/AbstractComponentFactory.java | 47 - .../component/factory/ComponentFactory.java | 38 - .../factory/ComponentFactoryManager.java | 27 - .../ComponentInstantiationException.java | 37 - .../DefaultComponentFactoryManager.java | 50 -- .../UndefinedComponentFactoryException.java | 37 - .../factory/java/JavaComponentFactory.java | 96 -- .../manager/AbstractComponentManager.java | 203 ----- .../component/manager/ComponentManager.java | 81 -- .../manager/ComponentManagerFactory.java | 31 - .../manager/PerLookupComponentManager.java | 55 -- .../PerLookupComponentManagerFactory.java | 21 - .../manager/SingletonComponentManager.java | 63 -- .../SingletonComponentManagerFactory.java | 21 - .../UndefinedComponentManagerException.java | 26 - .../repository/ComponentDependency.java | 118 --- .../repository/ComponentDescriptor.java | 628 ------------- .../repository/ComponentRepository.java | 39 - .../repository/ComponentRequirement.java | 167 ---- .../repository/ComponentRequirementList.java | 34 - .../repository/ComponentSetDescriptor.java | 148 --- .../DefaultComponentRepository.java | 215 ----- .../ComponentConfigurationException.java | 44 - ...onentDescriptorUnmarshallingException.java | 44 - ...ponentImplementationNotFoundException.java | 45 - .../ComponentLifecycleException.java | 44 - .../exception/ComponentLookupException.java | 99 -- .../ComponentLookupRuntimeException.java | 33 - ...anagerImplementationNotFoundException.java | 44 - .../exception/ComponentProfileException.java | 44 - .../ComponentRepositoryException.java | 44 - .../component/repository/io/PlexusTools.java | 258 ------ .../DefaultPlexusConfiguration.java | 211 ----- .../PlexusComponentDescriptorMerger.java | 105 --- .../configuration/PlexusConfiguration.java | 176 ---- .../PlexusConfigurationException.java | 42 - .../PlexusConfigurationMerger.java | 309 ------- .../PlexusConfigurationResourceException.java | 23 - .../io/PlexusConfigurationReader.java | 14 - .../io/PlexusConfigurationWriter.java | 13 - .../io/XmlPlexusConfigurationReader.java | 31 - .../io/XmlPlexusConfigurationWriter.java | 100 --- .../source/ChainedConfigurationSource.java | 40 - .../source/ConfigurationSource.java | 18 - .../source/ContainerConfigurationSource.java | 15 - .../xml/XmlPlexusConfiguration.java | 75 -- .../AbstractContainerInitializationPhase.java | 22 - ...tractCoreComponentInitializationPhase.java | 27 - .../ContainerInitializationContext.java | 75 -- .../ContainerInitializationException.java | 34 - .../ContainerInitializationPhase.java | 26 - ...ializeComponentDiscovererManagerPhase.java | 51 -- ...nitializeComponentFactoryManagerPhase.java | 47 - .../InitializeComponentRegistryPhase.java | 83 -- ...lizeContainerConfigurationSourcePhase.java | 41 - .../InitializeLoggerManagerPhase.java | 69 -- .../InitializeSystemPropertiesPhase.java | 46 - ...nitializeUserConfigurationSourcePhase.java | 89 -- .../org/codehaus/plexus/context/Context.java | 77 -- .../plexus/context/ContextException.java | 50 -- .../plexus/context/ContextMapAdapter.java | 41 - .../plexus/context/DefaultContext.java | 145 --- .../lifecycle/AbstractLifecycleHandler.java | 117 --- .../lifecycle/BasicLifecycleHandler.java | 32 - .../DefaultLifecycleHandlerManager.java | 54 -- .../plexus/lifecycle/LifecycleHandler.java | 77 -- .../lifecycle/LifecycleHandlerManager.java | 31 - .../UndefinedLifecycleHandlerException.java | 23 - .../plexus/lifecycle/phase/AbstractPhase.java | 37 - .../plexus/lifecycle/phase/Phase.java | 32 - .../plexus/logging/AbstractLogEnabled.java | 53 -- .../plexus/logging/AbstractLogger.java | 114 --- .../plexus/logging/AbstractLoggerManager.java | 57 -- .../plexus/logging/BaseLoggerManager.java | 165 ---- .../codehaus/plexus/logging/LogEnabled.java | 23 - .../org/codehaus/plexus/logging/Logger.java | 79 -- .../plexus/logging/LoggerManager.java | 68 -- .../plexus/logging/console/ConsoleLogger.java | 92 -- .../logging/console/ConsoleLoggerManager.java | 226 ----- .../lifecycle/phase/AutoConfigurePhase.java | 61 -- .../plexus/lifecycle/phase/Configurable.java | 29 - .../lifecycle/phase/ConfigurablePhase.java | 36 - .../lifecycle/phase/Contextualizable.java | 27 - .../lifecycle/phase/ContextualizePhase.java | 42 - .../plexus/lifecycle/phase/Disposable.java | 27 - .../plexus/lifecycle/phase/DisposePhase.java | 29 - .../plexus/lifecycle/phase/Initializable.java | 27 - .../phase/InitializationException.java | 32 - .../lifecycle/phase/InitializePhase.java | 34 - .../lifecycle/phase/LogDisablePhase.java | 36 - .../lifecycle/phase/LogEnablePhase.java | 40 - .../phase/PhaseExecutionException.java | 28 - .../phase/PlexusContainerLocator.java | 73 -- .../plexus/lifecycle/phase/ResumePhase.java | 29 - .../lifecycle/phase/ServiceLocator.java | 60 -- .../plexus/lifecycle/phase/Serviceable.java | 26 - .../lifecycle/phase/ServiceablePhase.java | 32 - .../plexus/lifecycle/phase/StartPhase.java | 34 - .../plexus/lifecycle/phase/Startable.java | 23 - .../lifecycle/phase/StartingException.java | 32 - .../plexus/lifecycle/phase/StopPhase.java | 34 - .../lifecycle/phase/StoppingException.java | 32 - .../plexus/lifecycle/phase/SuspendPhase.java | 29 - .../plexus/lifecycle/phase/Suspendable.java | 23 - .../src/main/mdo/components.mdo | 245 ----- .../src/main/mdo/plexus.mdo | 190 ---- .../resources/META-INF/plexus/components.xml | 14 - .../src/site/apt/index.apt | 43 - plexus-container-default/src/site/site.xml | 45 - .../DefaultComponentLookupManagerTest.java | 30 - .../plexus/DyanamicComponentKungFuTest.java | 97 -- .../plexus/PlexusJUnit4TestCaseTest.java | 27 - .../codehaus/plexus/PlexusTestCaseTest.java | 98 -- .../MapOrientedComponentProcessingTest.java | 76 -- .../plexus/component/PlexusTestCaseTest.java | 24 - .../component/TestMapOrientedComponent.java | 41 - .../composition/AbstractComponent.java | 31 - .../AbstractCompositionResolverTest.java | 208 ----- .../component/composition/Component.java | 25 - .../component/composition/ComponentA.java | 29 - .../component/composition/ComponentB.java | 27 - .../component/composition/ComponentC.java | 25 - .../component/composition/ComponentD.java | 25 - .../component/composition/ComponentE.java | 25 - .../component/composition/ComponentF.java | 71 -- .../ComponentRealmCompositionTest.java | 133 --- ...mponentWithSeveralFieldsOfTheSameType.java | 34 - .../composition/DefaultComponent.java | 25 - .../composition/DefaultComponentA.java | 36 - .../composition/DefaultComponentB.java | 35 - .../composition/DefaultComponentC.java | 25 - .../DefaultComponentComposerManagerTest.java | 42 - .../DefaultCompositionResolverTest.java | 29 - .../configurator/AbstractComponent.java | 39 - .../AbstractComponentConfiguratorTest.java | 850 ------------------ .../component/configurator/AbstractThing.java | 27 - .../BasicComponentConfiguratorTest.java | 31 - .../component/configurator/Component.java | 33 - .../ComponentWithArrayFields.java | 75 -- .../ComponentWithCollectionFields.java | 72 -- .../ComponentWithCompositeFields.java | 44 - .../configurator/ComponentWithEnumFields.java | 51 -- .../configurator/ComponentWithMapField.java | 40 - .../ComponentWithPropertiesField.java | 40 - .../configurator/ComponentWithSetters.java | 127 --- .../configurator/ConfigurableComponent.java | 111 --- .../configurator/DefaultComponent.java | 39 - .../configurator/ImportantThing.java | 39 - .../configurator/ThingInterface.java | 29 - .../XBeanComponentConfiguratorTest.java | 68 -- .../discovery/ComponentDiscovererTest.java | 75 -- .../discovery/DefaultDiscoveredComponent.java | 25 - .../discovery/DiscoveredComponent.java | 27 - .../plexus/component/factory/Component.java | 23 - .../component/factory/ComponentImplA.java | 25 - .../component/factory/ComponentImplB.java | 23 - .../component/factory/ComponentImplC.java | 23 - .../DiscoveredComponentFactoryTest.java | 58 -- .../factory/TestComponentFactory1.java | 33 - .../factory/TestComponentFactory2.java | 33 - .../factory/TestFactoryResultComponent.java | 30 - .../java/JavaComponentFactoryTest.java | 104 --- .../nonjava/NonJavaComponentFactory.java | 19 - .../nonjava/NonJavaComponentFactoryTest.java | 13 - .../ClassicSingletonComponentManagerTest.java | 24 - .../plexus/component/manager/Component.java | 6 - .../component/manager/DefaultComponent.java | 4 - .../component/manager/SlowComponent.java | 42 - ...tClassicSingletonComponentManagerTest.java | 99 -- .../DefaultComponentRegistryTest.java | 47 - .../registry/TestSynchronizedComponent.java | 25 - .../repository/ComponentDescriptorTest.java | 91 -- .../repository/ComponentRequirementTest.java | 33 - .../repository/ComponentSetTest.java | 100 --- .../DefaultComponentRepositoryTest.java | 31 - .../ConfigurationResourceExceptionTest.java | 33 - .../ConfigurationTestHelper.java | 73 -- .../DefaultPlexusConfigurationTest.java | 113 --- .../io/XmlPlexusConfigurationReaderTest.java | 19 - .../io/XmlPlexusConfigurationWriterTest.java | 30 - .../source/ADummyConfigurationSource.java | 11 - .../AnotherDummyConfigurationSource.java | 13 - .../DefaultConfigurationSourceTest.java | 18 - .../ExtendingConfigurationSourceTest.java | 28 - .../OverridingConfigurationSourceTest.java | 17 - .../xml/XmlPlexusConfigurationTest.java | 90 -- .../plexus/context/ContextMapAdapterTest.java | 68 -- .../plexus/context/DefaultContextTest.java | 110 --- .../plexus/hierarchy/PlexusHierarchyTest.java | 0 .../plexus/hierarchy/PlexusTestService.java | 0 .../plexus/hierarchy/TestServiceImpl.java | 0 .../logging/AbstractLoggerManagerTest.java | 213 ----- .../logging/CustomLoggerManagerTest.java | 34 - .../plexus/logging/LogEnabledTest.java | 72 -- .../plexus/logging/MockLogEnabled.java | 24 - .../codehaus/plexus/logging/MockLogger.java | 84 -- .../plexus/logging/MockLoggerManager.java | 58 -- .../console/ConsoleLoggerManagerTest.java | 45 - .../logging/console/ConsoleLoggerTest.java | 129 --- .../test/AbstractStartableComponent.java | 59 -- .../java/org/codehaus/plexus/test/Action.java | 25 - .../codehaus/plexus/test/AddUserAction.java | 25 - .../plexus/test/CircularComponent.java | 5 - .../org/codehaus/plexus/test/Component.java | 35 - .../org/codehaus/plexus/test/ComponentA.java | 29 - .../org/codehaus/plexus/test/ComponentB.java | 21 - .../org/codehaus/plexus/test/ComponentC.java | 23 - .../org/codehaus/plexus/test/ComponentD.java | 23 - .../plexus/test/ComponentManager.java | 27 - .../plexus/test/ComponentWithRoleDefault.java | 19 - .../codehaus/plexus/test/ConcreteThing.java | 19 - .../plexus/test/CountInstancesComponent.java | 40 - .../plexus/test/DefaultCircularComponent.java | 24 - .../plexus/test/DefaultComponent.java | 39 - .../plexus/test/DefaultComponentA.java | 51 -- .../plexus/test/DefaultComponentB.java | 22 - .../plexus/test/DefaultComponentC.java | 25 - .../plexus/test/DefaultComponentD.java | 25 - .../plexus/test/DefaultComponentManager.java | 35 - ...faultComponentWithOptionalRequirement.java | 22 - .../test/DefaultLoadOnStartService.java | 35 - ...DefaultLoadOnStartServiceWithRoleHint.java | 25 - .../codehaus/plexus/test/DefaultServiceB.java | 57 -- .../codehaus/plexus/test/DefaultServiceC.java | 32 - .../codehaus/plexus/test/DefaultServiceD.java | 19 - .../codehaus/plexus/test/DefaultServiceE.java | 59 -- .../codehaus/plexus/test/DefaultServiceH.java | 58 -- .../test/DefaultStartableComponentA.java | 3 - .../test/DefaultStartableComponentB.java | 3 - .../test/DefaultStartableComponentC.java | 3 - .../test/DefaultStartableComponentD.java | 3 - .../test/DefaultStartableComponentE.java | 3 - .../plexus/test/DefaultThingUser.java | 22 - .../codehaus/plexus/test/LiveComponent.java | 19 - .../plexus/test/LoadOnStartService.java | 27 - .../test/LoadOnStartServiceWithRoleHint.java | 27 - .../plexus/test/PlexusContainerTest.java | 792 ---------------- .../org/codehaus/plexus/test/ServiceB.java | 21 - .../org/codehaus/plexus/test/ServiceC.java | 21 - .../org/codehaus/plexus/test/ServiceD.java | 21 - .../org/codehaus/plexus/test/ServiceE.java | 21 - .../org/codehaus/plexus/test/ServiceH.java | 21 - .../plexus/test/SimpleLifecycleHandler.java | 33 - .../plexus/test/StartableComponent.java | 15 - .../java/org/codehaus/plexus/test/Thing.java | 19 - .../org/codehaus/plexus/test/ThingUser.java | 19 - .../plexus/test/lifecycle/phase/Eeny.java | 27 - .../test/lifecycle/phase/EenyPhase.java | 29 - .../plexus/test/lifecycle/phase/Meeny.java | 27 - .../test/lifecycle/phase/MeenyPhase.java | 29 - .../plexus/test/lifecycle/phase/Miny.java | 27 - .../test/lifecycle/phase/MinyPhase.java | 29 - .../plexus/test/lifecycle/phase/Mo.java | 27 - .../plexus/test/lifecycle/phase/MoPhase.java | 29 - .../plexus/test/list/AbstractValve.java | 35 - .../plexus/test/list/DefaultPipeline.java | 46 - .../codehaus/plexus/test/list/Pipeline.java | 34 - .../org/codehaus/plexus/test/list/Valve.java | 31 - .../codehaus/plexus/test/list/ValveFour.java | 25 - .../codehaus/plexus/test/list/ValveOne.java | 25 - .../codehaus/plexus/test/list/ValveThree.java | 25 - .../codehaus/plexus/test/list/ValveTwo.java | 25 - .../plexus/test/map/AbstractActivity.java | 35 - .../codehaus/plexus/test/map/Activity.java | 31 - .../plexus/test/map/ActivityManager.java | 33 - .../codehaus/plexus/test/map/ActivityOne.java | 25 - .../codehaus/plexus/test/map/ActivityTwo.java | 25 - .../test/map/DefaultActivityManager.java | 41 - .../plexus/test/map/NoComponentsMapTest.java | 32 - .../resources/META-INF/plexus/components.xml | 20 - .../test/resources/META-INF/plexus/plexus.xml | 13 - .../test/resources/application/components.xml | 54 -- .../application/configuration-mapping.xml | 42 - .../test/resources/application/sentinel.xml | 28 - .../resources/inline-configuration.properties | 2 - .../test/resources/inline-configuration.xml | 4 - .../src/test/resources/jar-repository/a.jar | Bin 990 -> 0 bytes .../src/test/resources/jar-repository/b.jar | Bin 820 -> 0 bytes .../src/test/resources/jar-repository/c.jar | Bin 722 -> 0 bytes .../src/test/resources/jar-repository/d.jar | Bin 718 -> 0 bytes .../codehaus/plexus/PlexusTestCaseTest.xml | 14 - .../autowire/AutowireCompositionTest.xml | 12 - .../component/composition/components.xml | 58 -- .../setter/SetterCompositionTest.xml | 25 - .../nonjava/NonJavaComponentFactoryTest.xml | 9 - .../ClassicSingletonComponentManagerTest.xml | 8 - ...ntClassicSingletonComponentManagerTest.xml | 11 - .../org/codehaus/plexus/components.xml | 14 - .../codehaus/plexus/configuration/avalon.xml | 193 ---- .../ExtendingConfigurationSourceTest.xml | 28 - .../OverridingConfigurationSourceTest.xml | 9 - .../codehaus/plexus/embed/EmbedderTest.xml | 19 - .../plexus/hierarchy/ChildPlexusOne.xml | 39 - .../plexus/hierarchy/ChildPlexusTwo.xml | 30 - .../plexus/hierarchy/PlexusHierarchyTest.xml | 69 -- .../logging/CustomLoggerManagerTest.xml | 8 - .../console/ConsoleLoggerManagerTest.xml | 20 - .../plexus/test/PlexusContainerTest.xml | 464 ---------- .../plexus/test/map/NoComponentsMapTest.xml | 34 - .../src/test/resources/test.txt | 1 - .../test-component-builds/component-a/pom.xml | 24 - .../org/codehaus/plexus/components/A.java | 6 - .../codehaus/plexus/components/DefaultA.java | 13 - .../test-component-builds/component-b/pom.xml | 24 - .../org/codehaus/plexus/components/B.java | 6 - .../codehaus/plexus/components/DefaultB.java | 13 - .../test-component-builds/component-c/pom.xml | 24 - .../org/codehaus/plexus/components/C.java | 6 - .../codehaus/plexus/components/DefaultC.java | 13 - .../test-component-builds/plugin0/pom.xml | 45 - .../codehaus/plexus/plugins/AltPlugin0.java | 51 -- .../plexus/plugins/DefaultPlugin0.java | 51 -- .../org/codehaus/plexus/plugins/Plugin0.java | 6 - .../test-component-builds/plugin1/pom.xml | 35 - .../codehaus/plexus/plugins/AltPlugin1.java | 22 - .../plexus/plugins/DefaultPlugin1.java | 22 - .../org/codehaus/plexus/plugins/Plugin1.java | 6 - .../src/test/test-component-builds/pom.xml | 15 - .../component-a-1.0-SNAPSHOT.jar | Bin 3329 -> 0 bytes .../component-a-2.0-SNAPSHOT.jar | Bin 3329 -> 0 bytes .../component-b-1.0-SNAPSHOT.jar | Bin 3329 -> 0 bytes .../component-c-1.0-SNAPSHOT.jar | Bin 3328 -> 0 bytes .../plexus-archiver-1.0-alpha-8.jar | Bin 150172 -> 0 bytes .../test-components/plugin0-1.0-SNAPSHOT.jar | Bin 5100 -> 0 bytes .../test-components/plugin1-1.0-SNAPSHOT.jar | Bin 4006 -> 0 bytes pom.xml | 1 - 419 files changed, 8 insertions(+), 25390 deletions(-) delete mode 100644 plexus-container-default/pom.xml delete mode 100644 plexus-container-default/src/it/multi-plexus.xml/pom.xml delete mode 100644 plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/Component.java delete mode 100644 plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/ComponentImpl.java delete mode 100644 plexus-container-default/src/it/multi-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml delete mode 100644 plexus-container-default/src/it/multi-plexus.xml/src/test/java/org/codehaus/plexus/test/it/multiplx/ComponentLookupTest.java delete mode 100644 plexus-container-default/src/it/plexus-its/pom.xml delete mode 100644 plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/App.java delete mode 100644 plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultApp.java delete mode 100644 plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultLogEnabledApp.java delete mode 100644 plexus-container-default/src/it/plexus-its/src/test/java/org/codehaus/plexus/its/AppTest.java delete mode 100644 plexus-container-default/src/it/test-fodder/component-with-plexus.xml/pom.xml delete mode 100644 plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponent.java delete mode 100644 plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponentImpl.java delete mode 100644 plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java delete mode 100644 plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java delete mode 100644 plexus-container-default/src/main/mdo/components.mdo delete mode 100644 plexus-container-default/src/main/mdo/plexus.mdo delete mode 100644 plexus-container-default/src/main/resources/META-INF/plexus/components.xml delete mode 100644 plexus-container-default/src/site/apt/index.apt delete mode 100644 plexus-container-default/src/site/site.xml delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/DefaultComponentLookupManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/DyanamicComponentKungFuTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/PlexusJUnit4TestCaseTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/PlexusTestCaseTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/MapOrientedComponentProcessingTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/PlexusTestCaseTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/TestMapOrientedComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractCompositionResolverTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/Component.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentE.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentF.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentRealmCompositionTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentWithSeveralFieldsOfTheSameType.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentComposerManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultCompositionResolverTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponentConfiguratorTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractThing.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/BasicComponentConfiguratorTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/Component.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithArrayFields.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCollectionFields.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCompositeFields.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithEnumFields.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithMapField.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithPropertiesField.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithSetters.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ConfigurableComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/DefaultComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ImportantThing.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ThingInterface.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/XBeanComponentConfiguratorTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/ComponentDiscovererTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DefaultDiscoveredComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DiscoveredComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/Component.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/DiscoveredComponentFactoryTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory1.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory2.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestFactoryResultComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/java/JavaComponentFactoryTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactory.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/Component.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/DefaultComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/DefaultComponentRegistryTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/TestSynchronizedComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentDescriptorTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentRequirementTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentSetTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/DefaultComponentRepositoryTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationResourceExceptionTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationTestHelper.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/DefaultPlexusConfigurationTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReaderTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriterTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ADummyConfigurationSource.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/AnotherDummyConfigurationSource.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/DefaultConfigurationSourceTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfigurationTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/context/DefaultContextTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusTestService.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/TestServiceImpl.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/AbstractLoggerManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/CustomLoggerManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/LogEnabledTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogEnabled.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogger.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLoggerManager.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/AbstractStartableComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/Action.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/AddUserAction.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/CircularComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/Component.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentManager.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentWithRoleDefault.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ConcreteThing.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/CountInstancesComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultCircularComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentManager.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentWithOptionalRequirement.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartService.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartServiceWithRoleHint.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceE.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceH.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentA.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentE.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultThingUser.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/LiveComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartService.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartServiceWithRoleHint.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/PlexusContainerTest.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceB.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceC.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceD.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceE.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceH.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/SimpleLifecycleHandler.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/StartableComponent.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/Thing.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/ThingUser.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Eeny.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/EenyPhase.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Meeny.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MeenyPhase.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Miny.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MinyPhase.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Mo.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MoPhase.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/AbstractValve.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/DefaultPipeline.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Pipeline.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Valve.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveFour.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveOne.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveThree.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveTwo.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/AbstractActivity.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/Activity.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityManager.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityOne.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityTwo.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/DefaultActivityManager.java delete mode 100644 plexus-container-default/src/test/java/org/codehaus/plexus/test/map/NoComponentsMapTest.java delete mode 100644 plexus-container-default/src/test/resources/META-INF/plexus/components.xml delete mode 100644 plexus-container-default/src/test/resources/META-INF/plexus/plexus.xml delete mode 100644 plexus-container-default/src/test/resources/application/components.xml delete mode 100644 plexus-container-default/src/test/resources/application/configuration-mapping.xml delete mode 100644 plexus-container-default/src/test/resources/application/sentinel.xml delete mode 100644 plexus-container-default/src/test/resources/inline-configuration.properties delete mode 100644 plexus-container-default/src/test/resources/inline-configuration.xml delete mode 100644 plexus-container-default/src/test/resources/jar-repository/a.jar delete mode 100644 plexus-container-default/src/test/resources/jar-repository/b.jar delete mode 100644 plexus-container-default/src/test/resources/jar-repository/c.jar delete mode 100644 plexus-container-default/src/test/resources/jar-repository/d.jar delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/PlexusTestCaseTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/autowire/AutowireCompositionTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/components.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/setter/SetterCompositionTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/components.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/avalon.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/embed/EmbedderTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusOne.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusTwo.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/logging/CustomLoggerManagerTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/test/PlexusContainerTest.xml delete mode 100644 plexus-container-default/src/test/resources/org/codehaus/plexus/test/map/NoComponentsMapTest.xml delete mode 100644 plexus-container-default/src/test/resources/test.txt delete mode 100644 plexus-container-default/src/test/test-component-builds/component-a/pom.xml delete mode 100644 plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/A.java delete mode 100644 plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/DefaultA.java delete mode 100644 plexus-container-default/src/test/test-component-builds/component-b/pom.xml delete mode 100644 plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/B.java delete mode 100644 plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/DefaultB.java delete mode 100644 plexus-container-default/src/test/test-component-builds/component-c/pom.xml delete mode 100644 plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/C.java delete mode 100644 plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/DefaultC.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin0/pom.xml delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/AltPlugin0.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin0.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/Plugin0.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin1/pom.xml delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/AltPlugin1.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin1.java delete mode 100644 plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/Plugin1.java delete mode 100644 plexus-container-default/src/test/test-component-builds/pom.xml delete mode 100644 plexus-container-default/src/test/test-components/component-a-1.0-SNAPSHOT.jar delete mode 100644 plexus-container-default/src/test/test-components/component-a-2.0-SNAPSHOT.jar delete mode 100644 plexus-container-default/src/test/test-components/component-b-1.0-SNAPSHOT.jar delete mode 100644 plexus-container-default/src/test/test-components/component-c-1.0-SNAPSHOT.jar delete mode 100644 plexus-container-default/src/test/test-components/plexus-archiver-1.0-alpha-8.jar delete mode 100644 plexus-container-default/src/test/test-components/plugin0-1.0-SNAPSHOT.jar delete mode 100644 plexus-container-default/src/test/test-components/plugin1-1.0-SNAPSHOT.jar diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 5d88481c4..1e2355828 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,14 @@ Plexus Containers Release Notes ========================= +Plexus Containers 2.2.0 +--------------------- +Plexus Containers 2.2.0 requires Java 8 and Maven 3.2.5+ + +### Improvements +* Drop deprecated plexus-container-default artefact +* Upgrade ASM to 9.6 + Plexus Containers 2.1.1 --------------------- Plexus Containers 2.1.1 requires Java 7 and Maven 3.2.5+ diff --git a/plexus-container-default/pom.xml b/plexus-container-default/pom.xml deleted file mode 100644 index 162ab0a48..000000000 --- a/plexus-container-default/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - 4.0.0 - - - org.codehaus.plexus - plexus-containers - 2.2.0-SNAPSHOT - - - plexus-container-default - - Plexus :: Default Container (deprecated) - The Plexus IoC container API and its default implementation. - - - 2.7.0 - 4.24 - - - - - - org.codehaus.plexus - plexus-classworlds - ${classWorldsVersion} - - - org.codehaus.plexus - plexus-utils - ${plexusUtilsVersion} - - - org.apache.xbean - xbean-reflect - ${xbeanReflectVersion} - - - junit - junit - 4.13.2 - - - - - - - org.codehaus.plexus - plexus-utils - - - org.codehaus.plexus - plexus-classworlds - - - org.apache.xbean - xbean-reflect - - - junit - junit - - - - - - - maven-surefire-plugin - - - **/Test*.java - **/Abstract*.java - - - - - org.codehaus.modello - modello-maven-plugin - - 1.11 - - - src/main/mdo/components.mdo - src/main/mdo/plexus.mdo - - 1.3.0 - - - - xsd-site - - xsd - - pre-site - - ${basedir}/target/generated-site/resources/xsd - - - - descriptor-site - - xdoc - - pre-site - - 1.0.0 - - - - - - - diff --git a/plexus-container-default/src/it/multi-plexus.xml/pom.xml b/plexus-container-default/src/it/multi-plexus.xml/pom.xml deleted file mode 100644 index b0ef52ebb..000000000 --- a/plexus-container-default/src/it/multi-plexus.xml/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - plexus - plexus-integrationTest-multiplePlexusXmls - 1.0-SNAPSHOT - - - - plexus - plexus-testFodder-componentWithPlexusXml - 1.0 - - - plexus - plexus-container-default - 1.0-alpha-3-SNAPSHOT - test - - - junit - junit - 3.8.1 - test - - - - \ No newline at end of file diff --git a/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/Component.java b/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/Component.java deleted file mode 100644 index a72741dd0..000000000 --- a/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/Component.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.codehaus.plexus.test.it.multiplx; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface Component -{ - - public static final String ROLE = Component.class.getName(); - - public String testValue(String input); - -} diff --git a/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/ComponentImpl.java b/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/ComponentImpl.java deleted file mode 100644 index 8a8a0942f..000000000 --- a/plexus-container-default/src/it/multi-plexus.xml/src/main/java/org/codehaus/plexus/test/it/multiplx/ComponentImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.test.it.multiplx; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class ComponentImpl - implements Component -{ - - public String testValue( String input ) - { - return "test using: " + input; - } - -} diff --git a/plexus-container-default/src/it/multi-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml b/plexus-container-default/src/it/multi-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml deleted file mode 100644 index 5a5c048a5..000000000 --- a/plexus-container-default/src/it/multi-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - org.codehaus.plexus.test.it.multiplx.Component - org.codehaus.plexus.test.it.multiplx.ComponentImpl - - - \ No newline at end of file diff --git a/plexus-container-default/src/it/multi-plexus.xml/src/test/java/org/codehaus/plexus/test/it/multiplx/ComponentLookupTest.java b/plexus-container-default/src/it/multi-plexus.xml/src/test/java/org/codehaus/plexus/test/it/multiplx/ComponentLookupTest.java deleted file mode 100644 index e426e8cbf..000000000 --- a/plexus-container-default/src/it/multi-plexus.xml/src/test/java/org/codehaus/plexus/test/it/multiplx/ComponentLookupTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.test.it.multiplx; - -import org.codehaus.plexus.PlexusTestCase; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class ComponentLookupTest - extends PlexusTestCase -{ - - public void testShouldFindComponentFromHereAndComponentFromDependency() throws Exception - { - Object fromHere = lookup(Component.ROLE); - assertNotNull(fromHere); - - Object fromDependency = lookup("org.codehaus.plexus.test.fodder.withplx.TestComponent"); - assertNotNull(fromDependency); - } - -} diff --git a/plexus-container-default/src/it/plexus-its/pom.xml b/plexus-container-default/src/it/plexus-its/pom.xml deleted file mode 100644 index 57db21f64..000000000 --- a/plexus-container-default/src/it/plexus-its/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.its - plexus-its - jar - 1.0-SNAPSHOT - plexus-its - http://maven.apache.org - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-41-SNAPSHOT - - - junit - junit - 3.8.1 - test - - - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.5 - - - - descriptor - - - - - - - - diff --git a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/App.java b/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/App.java deleted file mode 100644 index 92592e330..000000000 --- a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/App.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.plexus.its; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.logging.Logger; - -/** @author Jason van Zyl */ -public interface App -{ - PlexusContainer getContainer(); - - Logger getLogger(); -} diff --git a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultApp.java b/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultApp.java deleted file mode 100644 index 098af87da..000000000 --- a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultApp.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.its; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.logging.Logger; - -/** - * @plexus.component role-hint="standard" - */ -public class DefaultApp - implements App -{ - /** @plexus.requirement */ - private PlexusContainer container; - - /** @plexus.requirement */ - private Logger logger; - - public PlexusContainer getContainer() - { - return container; - } - - public Logger getLogger() - { - return logger; - } -} diff --git a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultLogEnabledApp.java b/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultLogEnabledApp.java deleted file mode 100644 index 2cc6e3946..000000000 --- a/plexus-container-default/src/it/plexus-its/src/main/java/org/codehaus/plexus/its/DefaultLogEnabledApp.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.codehaus.plexus.its; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; - -/** - * @plexus.component role-hint="log-enabled" - */ -public class DefaultLogEnabledApp - extends AbstractLogEnabled - implements App -{ - /** @plexus.requirement */ - private PlexusContainer container; - - public PlexusContainer getContainer() - { - return container; - } - - public Logger getLogger() - { - return getLogger(); - } -} \ No newline at end of file diff --git a/plexus-container-default/src/it/plexus-its/src/test/java/org/codehaus/plexus/its/AppTest.java b/plexus-container-default/src/it/plexus-its/src/test/java/org/codehaus/plexus/its/AppTest.java deleted file mode 100644 index 31b51a913..000000000 --- a/plexus-container-default/src/it/plexus-its/src/test/java/org/codehaus/plexus/its/AppTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.its; - -import org.codehaus.plexus.PlexusTestCase; - -/** - * Unit test for simple DefaultApp. - */ -public class AppTest - extends PlexusTestCase -{ - public void testApp() - throws Exception - { - App app = (App) lookup( App.class.getName(), "standard" ); - - assertNotNull( app.getContainer() ); - - assertNotNull( app.getLogger() ); - - assertEquals( App.class.getName(), app.getLogger().getName() ); - - App logEnabledApp = (App) lookup( App.class.getName(), "log-enabled" ); - - assertNotNull( logEnabledApp ); - - assertEquals( App.class.getName(), app.getLogger().getName() ); - } -} diff --git a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/pom.xml b/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/pom.xml deleted file mode 100644 index f36e24aed..000000000 --- a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/pom.xml +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - plexus - plexus-testFodder-componentWithPlexusXml - 1.0-SNAPSHOT - \ No newline at end of file diff --git a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponent.java b/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponent.java deleted file mode 100644 index 47995e3f0..000000000 --- a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponent.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.codehaus.plexus.test.fodder.withplx; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface TestComponent -{ - - public String testValueOf(String input); - -} diff --git a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponentImpl.java b/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponentImpl.java deleted file mode 100644 index 09f2d14e4..000000000 --- a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/java/org/codehaus/plexus/test/fodder/withplx/TestComponentImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.test.fodder.withplx; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class TestComponentImpl - implements TestComponent -{ - - public String testValueOf( String input ) - { - return "output from: " + input; - } - -} diff --git a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml b/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml deleted file mode 100644 index 7006a2074..000000000 --- a/plexus-container-default/src/it/test-fodder/component-with-plexus.xml/src/main/resources/META-INF/plexus/plexus.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - org.codehaus.plexus.test.fodder.withplx.TestComponent - org.codehaus.plexus.test.fodder.withplx.TestComponentImpl - - - \ No newline at end of file diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java b/plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java deleted file mode 100644 index fe0cb37dd..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2009 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.Queue; -import java.util.Set; - -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; - -public class ClassRealmUtil { - - public static Set getContextRealms(ClassWorld world) { - Set realms = new LinkedHashSet(); - - for (ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - classLoader != null; - classLoader = classLoader.getParent()) { - if (classLoader instanceof ClassRealm) { - realms.add((ClassRealm) classLoader); - - Queue queue = new LinkedList(); - queue.add((ClassRealm) classLoader); - - while (!queue.isEmpty()) { - ClassRealm realm = queue.remove(); - - Collection importRealms = realm.getImportRealms(); - for (ClassRealm importRealm : importRealms) { - if (realms.add(importRealm)) { - queue.add(importRealm); - } - } - - ClassRealm parentRealm = realm.getParentRealm(); - if (parentRealm != null && realms.add(parentRealm)) { - queue.add(parentRealm); - } - } - } - } - - if (world != null) { - for (Iterator it = realms.iterator(); it.hasNext(); ) { - ClassRealm realm = it.next(); - if (realm.getWorld() != world) { - it.remove(); - } - } - } - - return realms; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java b/plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java deleted file mode 100644 index 3e7dc22da..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.manager.ComponentManagerFactory; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - -/** - * @author Jason van Zyl - * @author Kenney Westerhof - * @author Dain Sundstrom - */ -public interface ComponentRegistry { - void registerComponentManagerFactory(ComponentManagerFactory componentManagerFactory); - - void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException; - - ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint); - - @Deprecated - ComponentDescriptor getComponentDescriptor(String role, String roleHint, ClassRealm realm); - - List> getComponentDescriptorList(Class type, String role); - - Map> getComponentDescriptorMap(Class type, String role); - - T lookup(Class type, String role, String roleHint) throws ComponentLookupException; - - T lookup(ComponentDescriptor componentDescriptor) throws ComponentLookupException; - - List lookupList(Class type, String role, List hints) throws ComponentLookupException; - - Map lookupMap(Class type, String role, List hints) throws ComponentLookupException; - - void release(Object component) throws ComponentLifecycleException; - - void removeComponentRealm(ClassRealm classRealm) throws PlexusContainerException; - - void dispose(); - - void addComponent(T component, String role, String roleHint); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java b/plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java deleted file mode 100644 index 2e1ab9f71..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.codehaus.plexus; - -import java.net.URL; -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.discovery.ComponentDiscoverer; -import org.codehaus.plexus.component.discovery.ComponentDiscovererManager; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; -import org.codehaus.plexus.component.factory.ComponentFactoryManager; -import org.codehaus.plexus.component.repository.ComponentRepository; -import org.codehaus.plexus.configuration.source.ConfigurationSource; -import org.codehaus.plexus.container.initialization.ContainerInitializationPhase; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.lifecycle.LifecycleHandlerManager; - -/** - * @author Jason van Zyl - */ -public interface ContainerConfiguration { - ContainerConfiguration setName(String name); - - String getName(); - - ContainerConfiguration setContext(Map context); - - Map getContext(); - - ContainerConfiguration setClassWorld(ClassWorld classWorld); - - ClassWorld getClassWorld(); - - ContainerConfiguration setRealm(ClassRealm realm); - - ClassRealm getRealm(); - - // - // Configuration - // - ContainerConfiguration setContainerConfiguration(String configuration); - - String getContainerConfiguration(); - - ContainerConfiguration setContainerConfigurationURL(URL configuration); - - URL getContainerConfigurationURL(); - - // Programmatic Container Initialization and Setup - - // Much of this setup and initialization can be completely hidden. It's probably not likely - // someone will need to change these core components, but rather adding things like different - // factories, and component managers. - - // Container initialization phases - - ContainerInitializationPhase[] getInitializationPhases(); - - // Component lookup manager - - // Component discoverer manager - - ContainerConfiguration addComponentDiscoverer(ComponentDiscoverer componentDiscoverer); - - ContainerConfiguration addComponentDiscoveryListener(ComponentDiscoveryListener componentDiscoveryListener); - - ContainerConfiguration setComponentDiscovererManager(ComponentDiscovererManager componentDiscovererManager); - - ComponentDiscovererManager getComponentDiscovererManager(); - - // Component factory manager - - ContainerConfiguration setComponentFactoryManager(ComponentFactoryManager componentFactoryManager); - - ComponentFactoryManager getComponentFactoryManager(); - - // Component manager manager - - // Component repository - - ContainerConfiguration setComponentRepository(ComponentRepository componentRepository); - - ComponentRepository getComponentRepository(); - - // Component composer - - // Lifecycle handler manager - - ContainerConfiguration addLifecycleHandler(LifecycleHandler lifecycleHandler); - - ContainerConfiguration setLifecycleHandlerManager(LifecycleHandlerManager lifecycleHandlerManager); - - LifecycleHandlerManager getLifecycleHandlerManager(); - - // Configuration Sources - - ContainerConfiguration setConfigurationSource(ConfigurationSource configurationSource); - - ConfigurationSource getConfigurationSource(); - - ContainerConfiguration addComponentDiscoverer(Class componentDiscoverer); - - ContainerConfiguration addComponentDiscoveryListener(Class componentDiscoveryListener); - - List getComponentDiscoverers(); - - List getComponentDiscoveryListeners(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java b/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java deleted file mode 100644 index d63cfa48d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java +++ /dev/null @@ -1,526 +0,0 @@ -package org.codehaus.plexus; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.component.manager.ComponentManagerFactory; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRepository; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.lifecycle.LifecycleHandlerManager; -import org.codehaus.plexus.lifecycle.UndefinedLifecycleHandlerException; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.StringUtils; - -import static org.codehaus.plexus.component.CastUtils.isAssignableFrom; - -public class DefaultComponentRegistry implements ComponentRegistry { - private static final String DEFAULT_INSTANTIATION_STRATEGY = "singleton"; - - private final MutablePlexusContainer container; - private final ComponentRepository repository; - private final LifecycleHandlerManager lifecycleHandlerManager; - private final Logger logger; - - private boolean disposingComponents; - - private final Map componentManagerFactories = - Collections.synchronizedMap(new TreeMap()); - - private final Map> componentManagers = new TreeMap>(); - private final Map> componentManagersByComponent = - new IdentityHashMap>(); - - private final Map unmanagedComponents = new TreeMap(); - - public DefaultComponentRegistry( - MutablePlexusContainer container, - ComponentRepository repository, - LifecycleHandlerManager lifecycleHandlerManager) { - this.container = container; - this.repository = repository; - this.lifecycleHandlerManager = lifecycleHandlerManager; - logger = container.getLogger(); - } - - public void dispose() { - List> managers; - synchronized (this) { - managers = new ArrayList>(componentManagers.values()); - componentManagers.clear(); - componentManagersByComponent.clear(); - unmanagedComponents.clear(); - - disposingComponents = true; - } - - // reverse sort the managers by startId - Collections.sort(managers, new Comparator>() { - public int compare(ComponentManager left, ComponentManager right) { - if (left.getStartId() < right.getStartId()) { - return 1; - } else if (left.getStartId() == right.getStartId()) { - return 0; - } else { - return -1; - } - } - }); - - // Call dispose callback outside of synchronized lock to avoid deadlocks - try { - for (ComponentManager componentManager : managers) { - try { - componentManager.dispose(); - } catch (Exception e) { - // todo dain use a monitor instead of a logger - logger.error("Error while disposing component manager. Continuing with the rest", e); - } - } - } finally { - synchronized (this) { - disposingComponents = false; - } - } - } - - public void registerComponentManagerFactory(ComponentManagerFactory componentManagerFactory) { - componentManagerFactories.put(componentManagerFactory.getId(), componentManagerFactory); - } - - public void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException { - repository.addComponentDescriptor(componentDescriptor); - } - - @SuppressWarnings("unchecked") - public synchronized void addComponent(T component, String role, String roleHint) { - ComponentDescriptor descriptor = new ComponentDescriptor(component.getClass(), null); - descriptor.setRole(role); - descriptor.setRoleHint(roleHint); - - Key key = new Key(descriptor.getRealm(), role, roleHint); - - unmanagedComponents.put(key, component); - } - - public ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint) { - return repository.getComponentDescriptor(type, role, roleHint); - } - - @Deprecated - public ComponentDescriptor getComponentDescriptor(String role, String roleHint, ClassRealm realm) { - return repository.getComponentDescriptor(role, roleHint, realm); - } - - public Map> getComponentDescriptorMap(Class type, String role) { - return repository.getComponentDescriptorMap(type, role); - } - - public List> getComponentDescriptorList(Class type, String role) { - return repository.getComponentDescriptorList(type, role); - } - - public T lookup(Class type, String role, String roleHint) throws ComponentLookupException { - // verify arguments - if (type == null) { - throw new NullPointerException("type is null"); - } - if (role == null) { - throw new NullPointerException("role is null"); - } - if (roleHint == null) { - roleHint = ""; - } - - return getComponent(type, role, roleHint, null); - } - - public T lookup(ComponentDescriptor componentDescriptor) throws ComponentLookupException { - return getComponent( - componentDescriptor.getRoleClass(), - componentDescriptor.getRole(), - componentDescriptor.getRoleHint(), - componentDescriptor); - } - - public Map lookupMap(Class type, String role, List roleHints) - throws ComponentLookupException { - // verify arguments - if (type == null) { - throw new NullPointerException("type is null"); - } - if (role == null) { - throw new NullPointerException("role is null"); - } - - // if no hints provided, get all valid hints for this role - Map components = new LinkedHashMap(); - if (roleHints == null) { - Map> componentDescriptors = getComponentDescriptorMap(type, role); - for (Entry> entry : componentDescriptors.entrySet()) { - String roleHint = entry.getKey(); - ComponentDescriptor componentDescriptor = entry.getValue(); - // todo dain catch the exception... it isn't the callers problem when one component in a collection - // fails - T component = getComponent(type, role, roleHint, componentDescriptor); - components.put(roleHint, component); - } - } else { - for (String roleHint : roleHints) { - // todo dain catch the exception... it isn't the callers problem when one component in a collection - // fails - T component = getComponent(type, role, roleHint, null); - components.put(roleHint, component); - } - } - - return components; - } - - public List lookupList(Class type, String role, List roleHints) throws ComponentLookupException { - // verify arguments - if (type == null) { - throw new NullPointerException("type is null"); - } - if (role == null) { - throw new NullPointerException("role is null"); - } - - // if no hints provided, get all valid hints for this role - List components = new ArrayList(); - if (roleHints == null) { - List> componentDescriptors = getComponentDescriptorList(type, role); - for (ComponentDescriptor componentDescriptor : componentDescriptors) { - // todo dain catch the exception... it isn't the callers problem when one component in a collection - // fails - T component = getComponent(type, role, componentDescriptor.getRoleHint(), componentDescriptor); - components.add(component); - } - } else { - for (String roleHint : roleHints) { - // todo dain catch the exception... it isn't the callers problem when one component in a collection - // fails - T component = getComponent(type, role, roleHint, null); - components.add(component); - } - } - - return components; - } - - public void release(Object component) throws ComponentLifecycleException { - if (component == null) { - return; - } - - // get the component manager - ComponentManager componentManager; - synchronized (this) { - componentManager = componentManagersByComponent.get(component); - if (componentManager == null) { - // This needs to be tracked down but the user doesn't need to see this - // during the maven bootstrap this logger is null. - // logger.debug( "Component manager not found for returned component. Ignored. component=" + component - // ); - return; - } - } - - // release the component from the manager - componentManager.release(component); - - // only drop the reference to this component if there are no other uses of the component - // multiple uses of a component is common with singleton beans - if (componentManager.getConnections() <= 0) { - synchronized (this) { - componentManagersByComponent.remove(component); - } - } - } - - public void removeComponentRealm(ClassRealm classRealm) throws PlexusContainerException { - repository.removeComponentRealm(classRealm); - - List> dispose = new ArrayList>(); - try { - synchronized (this) { - for (Iterator>> it = - componentManagers.entrySet().iterator(); - it.hasNext(); ) { - Entry> entry = it.next(); - Key key = entry.getKey(); - - ComponentManager componentManager = entry.getValue(); - - if (key.realm.equals(classRealm)) { - dispose.add(componentManager); - it.remove(); - } else { - componentManager.dissociateComponentRealm(classRealm); - } - } - } - - // Call dispose callback outside of synchronized lock to avoid deadlocks - for (ComponentManager componentManager : dispose) { - componentManager.dispose(); - } - } catch (ComponentLifecycleException e) { - throw new PlexusContainerException("Failed to dissociate component realm: " + classRealm.getId(), e); - } - } - - private T getComponent(Class type, String role, String roleHint, ComponentDescriptor descriptor) - throws ComponentLookupException { - // lookup for unmanaged components first - - T component = this.getUnmanagedComponent( - role, roleHint); // weird syntax due to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954 - - if (component != null) { - return component; - } - - ComponentManager componentManager = getComponentManager(type, role, roleHint, descriptor); - - // Get instance from manager... may result in creation - try { - component = componentManager.getComponent(); - synchronized (this) { - componentManagersByComponent.put(component, componentManager); - } - return component; - } catch (ComponentInstantiationException e) { - throw new ComponentLookupException( - "Unable to lookup component '" + componentManager.getRole() + "', it could not be created.", - componentManager.getRole(), - componentManager.getRoleHint(), - componentManager.getRealm(), - e); - } catch (ComponentLifecycleException e) { - throw new ComponentLookupException( - "Unable to lookup component '" + componentManager.getRole() + "', it could not be started.", - componentManager.getRole(), - componentManager.getRoleHint(), - componentManager.getRealm(), - e); - } - } - - @SuppressWarnings("unchecked") - private synchronized T getUnmanagedComponent(String role, String roleHint) { - Set realms = getSearchRealms(true); - - if (realms != null) { - // ignore unmanaged components, they are not associated with realms - // but lookup realm is provided via thread context classloader - return null; - } else { - if (StringUtils.isEmpty(roleHint)) { - roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT; - } - - return (T) unmanagedComponents.get(new Key(null, role, roleHint)); - } - } - - private synchronized ComponentManager getComponentManager( - Class type, String role, String roleHint, ComponentDescriptor descriptor) - throws ComponentLookupException { - if (disposingComponents) { - throw new ComponentLookupException("ComponentRegistry is not active", role, roleHint); - } - - if (descriptor == null) { - descriptor = getComponentDescriptor(type, role, roleHint); - } - - ComponentManager componentManager = null; - - if (descriptor != null) { - componentManager = getComponentManager(type, role, descriptor.getRoleHint(), descriptor.getRealm()); - } else { - componentManager = getComponentManager(type, role, roleHint); - } - - if (componentManager == null) { - // we need to create a component manager, but first we must have a descriptor - if (descriptor == null) { - descriptor = getComponentDescriptor(type, role, roleHint); - if (descriptor == null) { - throw new ComponentLookupException( - "Component descriptor cannot be found in the component repository", role, roleHint); - } - // search also into descriptor realm as the key of a created component is per descriptor realm - componentManager = getComponentManager(type, role, descriptor.getRoleHint(), descriptor.getRealm()); - } - - if (componentManager == null) { - componentManager = createComponentManager(descriptor, role, descriptor.getRoleHint()); - } - } - - return componentManager; - } - - @SuppressWarnings("unchecked") - private ComponentManager getComponentManager(Class type, String role, String roleHint) { - Set realms = getSearchRealms(false); - - // return the component in the first realm - for (ClassRealm realm : realms) { - ComponentManager manager = componentManagers.get(new Key(realm, role, roleHint)); - if (manager != null && isAssignableFrom(type, manager.getType())) { - return (ComponentManager) manager; - } - } - return null; - } - - @SuppressWarnings("unchecked") - private ComponentManager getComponentManager(Class type, String role, String roleHint, ClassRealm realm) { - ComponentManager manager = componentManagers.get(new Key(realm, role, roleHint)); - if (manager != null && isAssignableFrom(type, manager.getType())) { - return (ComponentManager) manager; - } - return null; - } - - @SuppressWarnings("unchecked") - private Set getSearchRealms(boolean specifiedOnly) { - // determine realms to search - Set realms = ClassRealmUtil.getContextRealms(container.getClassWorld()); - - if (realms.isEmpty()) { - if (specifiedOnly) { - return null; - } - - realms.addAll(container.getClassWorld().getRealms()); - } - - return realms; - } - - private ComponentManager createComponentManager( - ComponentDescriptor descriptor, String role, String roleHint) throws ComponentLookupException { - // Get the ComponentManagerFactory - String instantiationStrategy = descriptor.getInstantiationStrategy(); - if (instantiationStrategy == null) { - instantiationStrategy = DEFAULT_INSTANTIATION_STRATEGY; - } - ComponentManagerFactory componentManagerFactory = componentManagerFactories.get(instantiationStrategy); - if (componentManagerFactory == null) { - throw new ComponentLookupException( - "Unsupported instantiation strategy: " + instantiationStrategy, - role, - roleHint, - descriptor.getRealm()); - } - - // Get the LifecycleHandler - LifecycleHandler lifecycleHandler; - try { - lifecycleHandler = lifecycleHandlerManager.getLifecycleHandler(descriptor.getLifecycleHandler()); - } catch (UndefinedLifecycleHandlerException e) { - throw new ComponentLookupException( - "Undefined lifecycle handler: " + descriptor.getLifecycleHandler(), - role, - roleHint, - descriptor.getRealm()); - } - - // Create the ComponentManager - ComponentManager componentManager = - componentManagerFactory.createComponentManager(container, lifecycleHandler, descriptor, role, roleHint); - - // Add componentManager to indexes - Key key = new Key(descriptor.getRealm(), role, roleHint); - componentManagers.put(key, componentManager); - - return componentManager; - } - - private static class Key implements Comparable { - private final ClassRealm realm; - private final String role; - private final String roleHint; - private final int hashCode; - - private Key(ClassRealm realm, String role, String roleHint) { - this.realm = realm; - - if (role == null) { - role = "null"; - } - this.role = role; - - if (roleHint == null) { - roleHint = "null"; - } - this.roleHint = roleHint; - - int hashCode; - hashCode = (realm != null ? realm.hashCode() : 0); - hashCode = 31 * hashCode + role.hashCode(); - hashCode = 31 * hashCode + roleHint.hashCode(); - this.hashCode = hashCode; - } - - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Key key = (Key) o; - - return !(realm != null ? !realm.equals(key.realm) : key.realm != null) - && role.equals(key.role) - && roleHint.equals(key.roleHint); - } - - public int hashCode() { - return hashCode; - } - - public String toString() { - return realm + "/" + role + "/" + roleHint; - } - - public int compareTo(Key o) { - int value; - if (realm != null) { - value = o.realm == null ? -1 : realm.getId().compareTo(o.realm.getId()); - } else { - value = o.realm == null ? 0 : 1; - } - - if (value == 0) { - value = role.compareTo(o.role); - if (value == 0) { - value = roleHint.compareTo(o.roleHint); - } - } - return value; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java b/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java deleted file mode 100644 index ef4bb65fb..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java +++ /dev/null @@ -1,317 +0,0 @@ -package org.codehaus.plexus; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.discovery.ComponentDiscoverer; -import org.codehaus.plexus.component.discovery.ComponentDiscovererManager; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; -import org.codehaus.plexus.component.discovery.DefaultComponentDiscoverer; -import org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager; -import org.codehaus.plexus.component.discovery.PlexusXmlComponentDiscoverer; -import org.codehaus.plexus.component.factory.ComponentFactoryManager; -import org.codehaus.plexus.component.factory.DefaultComponentFactoryManager; -import org.codehaus.plexus.component.repository.ComponentRepository; -import org.codehaus.plexus.component.repository.DefaultComponentRepository; -import org.codehaus.plexus.configuration.source.ConfigurationSource; -import org.codehaus.plexus.container.initialization.ContainerInitializationPhase; -import org.codehaus.plexus.container.initialization.InitializeComponentDiscovererManagerPhase; -import org.codehaus.plexus.container.initialization.InitializeComponentFactoryManagerPhase; -import org.codehaus.plexus.container.initialization.InitializeComponentRegistryPhase; -import org.codehaus.plexus.container.initialization.InitializeContainerConfigurationSourcePhase; -import org.codehaus.plexus.container.initialization.InitializeLoggerManagerPhase; -import org.codehaus.plexus.container.initialization.InitializeSystemPropertiesPhase; -import org.codehaus.plexus.container.initialization.InitializeUserConfigurationSourcePhase; -import org.codehaus.plexus.lifecycle.BasicLifecycleHandler; -import org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.lifecycle.LifecycleHandlerManager; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.ConfigurablePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.ContextualizePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.DisposePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.LogDisablePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartPhase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StopPhase; - -/** @author Jason van Zyl */ -public class DefaultContainerConfiguration implements ContainerConfiguration { - private String name; - - private Map context; - - private ClassWorld classWorld; - - private ClassRealm realm; - - private String containerConfiguration; - - private URL containerConfigurationURL; - - private ConfigurationSource configurationSource; - - private List componentDiscoverers = new ArrayList(); - - private List componentDiscoveryListeners = new ArrayList(); - - public ContainerConfiguration setName(String name) { - this.name = name; - - return this; - } - - public ContainerConfiguration setContext(Map context) { - this.context = context; - - return this; - } - - public ContainerConfiguration setClassWorld(ClassWorld classWorld) { - this.classWorld = classWorld; - - return this; - } - - public ContainerConfiguration setRealm(ClassRealm realm) { - this.realm = realm; - - return this; - } - - public ContainerConfiguration setContainerConfiguration(String containerConfiguration) { - this.containerConfiguration = containerConfiguration; - - return this; - } - - public String getContainerConfiguration() { - return containerConfiguration; - } - - public ContainerConfiguration setContainerConfigurationURL(URL containerConfiguration) { - this.containerConfigurationURL = containerConfiguration; - - return this; - } - - public URL getContainerConfigurationURL() { - return containerConfigurationURL; - } - - public String getName() { - return name; - } - - public Map getContext() { - return context; - } - - public ClassWorld getClassWorld() { - return classWorld; - } - - public ClassRealm getRealm() { - return realm; - } - - // Programmatic Container Initialization and Setup - - public ContainerConfiguration setInitializationPhases(ContainerInitializationPhase[] initializationPhases) { - this.initializationPhases = initializationPhases; - - return this; - } - - public ContainerInitializationPhase[] getInitializationPhases() { - return initializationPhases; - } - - private ContainerInitializationPhase[] initializationPhases = { - new InitializeComponentRegistryPhase(), - new InitializeComponentFactoryManagerPhase(), - new InitializeContainerConfigurationSourcePhase(), - new InitializeLoggerManagerPhase(), - new InitializeSystemPropertiesPhase(), - new InitializeComponentDiscovererManagerPhase(), - new InitializeUserConfigurationSourcePhase() - }; - - // Component discoverer - - private ComponentDiscovererManager componentDiscovererManager; - - public ContainerConfiguration addComponentDiscoveryListener(ComponentDiscoveryListener componentDiscoveryListener) { - getComponentDiscovererManager().registerComponentDiscoveryListener(componentDiscoveryListener); - - return this; - } - - public ContainerConfiguration addComponentDiscoverer(ComponentDiscoverer componentDiscoverer) { - ((DefaultComponentDiscovererManager) getComponentDiscovererManager()) - .addComponentDiscoverer(componentDiscoverer); - - return this; - } - - public ContainerConfiguration addComponentDiscoverer(Class clazz) { - componentDiscoverers.add(clazz); - return this; - } - - public ContainerConfiguration addComponentDiscoveryListener(Class clazz) { - componentDiscoveryListeners.add(clazz); - return this; - } - - public List getComponentDiscoverers() { - return componentDiscoverers; - } - - public List getComponentDiscoveryListeners() { - return componentDiscoveryListeners; - } - - public ContainerConfiguration setComponentDiscovererManager(ComponentDiscovererManager componentDiscovererManager) { - this.componentDiscovererManager = componentDiscovererManager; - - return this; - } - - public ComponentDiscovererManager getComponentDiscovererManager() { - if (componentDiscovererManager == null) { - componentDiscovererManager = new DefaultComponentDiscovererManager(); - - ((DefaultComponentDiscovererManager) componentDiscovererManager) - .addComponentDiscoverer(new DefaultComponentDiscoverer()); - - ((DefaultComponentDiscovererManager) componentDiscovererManager) - .addComponentDiscoverer(new PlexusXmlComponentDiscoverer()); - } - - return componentDiscovererManager; - } - - private ComponentFactoryManager componentFactoryManager; - - public ComponentFactoryManager getComponentFactoryManager() { - if (componentFactoryManager == null) { - componentFactoryManager = new DefaultComponentFactoryManager(); - } - - return componentFactoryManager; - } - - public ContainerConfiguration setComponentFactoryManager(ComponentFactoryManager componentFactoryManager) { - this.componentFactoryManager = componentFactoryManager; - - return this; - } - - private ComponentRepository componentRepository; - - public ContainerConfiguration setComponentRepository(ComponentRepository componentRepository) { - this.componentRepository = componentRepository; - - return this; - } - - public ComponentRepository getComponentRepository() { - if (componentRepository == null) { - componentRepository = new DefaultComponentRepository(); - } - - return componentRepository; - } - - // Lifecycle handler manager - - private LifecycleHandlerManager lifecycleHandlerManager; - - public ContainerConfiguration addLifecycleHandler(LifecycleHandler lifecycleHandler) { - getLifecycleHandlerManager().addLifecycleHandler(lifecycleHandler); - - return this; - } - - public ContainerConfiguration setLifecycleHandlerManager(LifecycleHandlerManager lifecycleHandlerManager) { - this.lifecycleHandlerManager = lifecycleHandlerManager; - - return this; - } - - public LifecycleHandlerManager getLifecycleHandlerManager() { - if (lifecycleHandlerManager == null) { - lifecycleHandlerManager = new DefaultLifecycleHandlerManager(); - - // Plexus - LifecycleHandler plexus = new BasicLifecycleHandler("plexus"); - // Begin - plexus.addBeginSegment(new LogEnablePhase()); - plexus.addBeginSegment(new ContextualizePhase()); - // plexus.addBeginSegment( new AutoConfigurePhase() ); - plexus.addBeginSegment(new InitializePhase()); - plexus.addBeginSegment(new StartPhase()); - // End - plexus.addEndSegment(new StopPhase()); - plexus.addEndSegment(new DisposePhase()); - plexus.addEndSegment(new LogDisablePhase()); - lifecycleHandlerManager.addLifecycleHandler(plexus); - - // Basic - LifecycleHandler basic = new BasicLifecycleHandler("basic"); - // Begin - basic.addBeginSegment(new LogEnablePhase()); - basic.addBeginSegment(new ContextualizePhase()); - // basic.addBeginSegment( new AutoConfigurePhase() ); - basic.addBeginSegment(new InitializePhase()); - basic.addBeginSegment(new StartPhase()); - // End - basic.addEndSegment(new StopPhase()); - basic.addEndSegment(new DisposePhase()); - basic.addEndSegment(new LogDisablePhase()); - lifecycleHandlerManager.addLifecycleHandler(basic); - - // Plexus configurable - LifecycleHandler plexusConfigurable = new BasicLifecycleHandler("plexus-configurable"); - // Begin - plexusConfigurable.addBeginSegment(new LogEnablePhase()); - plexusConfigurable.addBeginSegment(new ContextualizePhase()); - plexusConfigurable.addBeginSegment(new ConfigurablePhase()); - plexusConfigurable.addBeginSegment(new InitializePhase()); - plexusConfigurable.addBeginSegment(new StartPhase()); - // End - plexusConfigurable.addEndSegment(new StopPhase()); - plexusConfigurable.addEndSegment(new DisposePhase()); - plexusConfigurable.addEndSegment(new LogDisablePhase()); - lifecycleHandlerManager.addLifecycleHandler(plexusConfigurable); - - // Passive - LifecycleHandler passive = new BasicLifecycleHandler("passive"); - lifecycleHandlerManager.addLifecycleHandler(passive); - - // Bootstrap - LifecycleHandler bootstrap = new BasicLifecycleHandler("bootstrap"); - bootstrap.addBeginSegment(new ContextualizePhase()); - lifecycleHandlerManager.addLifecycleHandler(bootstrap); - } - - return lifecycleHandlerManager; - } - - // Configuration Sources - - public ContainerConfiguration setConfigurationSource(ConfigurationSource configurationSource) { - this.configurationSource = configurationSource; - - return this; - } - - public ConfigurationSource getConfigurationSource() { - return configurationSource; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java deleted file mode 100644 index 775b78d6c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java +++ /dev/null @@ -1,788 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.classworlds.realm.DuplicateRealmException; -import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.discovery.ComponentDiscoverer; -import org.codehaus.plexus.component.discovery.ComponentDiscovererManager; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; -import org.codehaus.plexus.component.factory.ComponentFactoryManager; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.component.repository.io.PlexusTools; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.configuration.PlexusConfigurationMerger; -import org.codehaus.plexus.configuration.source.ConfigurationSource; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.container.initialization.ContainerInitializationContext; -import org.codehaus.plexus.container.initialization.ContainerInitializationPhase; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.context.ContextMapAdapter; -import org.codehaus.plexus.context.DefaultContext; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.InterpolationFilterReader; -import org.codehaus.plexus.util.ReaderFactory; - -import static org.codehaus.plexus.PlexusConstants.PLEXUS_DEFAULT_HINT; -import static org.codehaus.plexus.component.CastUtils.cast; - -/** - * Default implementation of PlexusContainer and MutablePlexusContainer. - * @author Jason van Zyl - * @author Kenney Westerhof - */ -public class DefaultPlexusContainer extends AbstractLogEnabled implements MutablePlexusContainer { - protected static final String DEFAULT_CONTAINER_NAME = "default"; - - protected static final String DEFAULT_REALM_NAME = "plexus.core"; - - /** - * Arbitrary data associated with the container. Data in the container has highest precedence when configuring - * a component to create. - */ - protected Context containerContext; - - protected PlexusConfiguration configuration; - - // todo: don't use a reader - protected Reader configurationReader; - - protected ClassWorld classWorld; - - protected ClassRealm containerRealm; - - // ---------------------------------------------------------------------------- - // Core components - // ---------------------------------------------------------------------------- - - private ComponentRegistry componentRegistry; - - /** - * Simple index (registry) of ComponentDiscovers and ComponentDiscoveryListener. - */ - protected ComponentDiscovererManager componentDiscovererManager; - - /** - * Trivial class to look-up ComponentFactory instances in this container. - */ - protected ComponentFactoryManager componentFactoryManager; - - /** - * Generic logger interface. - */ - protected LoggerManager loggerManager; - - /** - * Converts a ComponentDescriptor into PlexusConfiguration. - */ - protected ConfigurationSource configurationSource; - - // ---------------------------------------------------------------------------- - // - // ---------------------------------------------------------------------------- - - // TODO: Is there a more threadpool-friendly way to do this? - private ThreadLocal lookupRealm = new ThreadLocal(); - - public void addComponent(Object component, String role) { - addComponent(component, role, PLEXUS_DEFAULT_HINT); - } - - public void addComponent(T component, Class role, String roleHint) { - addComponent(component, role.getName(), roleHint); - } - - public void addComponent(Object component, String role, String roleHint) { - if (roleHint == null) { - roleHint = PLEXUS_DEFAULT_HINT; - } - - getComponentRegistry().addComponent(component, role, roleHint); - } - - public ClassRealm setLookupRealm(ClassRealm realm) { - ClassRealm oldRealm = lookupRealm.get(); - - lookupRealm.set(realm); - - return oldRealm; - } - - public ClassRealm getLookupRealm() { - return lookupRealm.get(); - } - - // ---------------------------------------------------------------------- - // Constructors - // ---------------------------------------------------------------------- - - public DefaultPlexusContainer() throws PlexusContainerException { - construct(new DefaultContainerConfiguration()); - } - - public DefaultPlexusContainer(ContainerConfiguration c) throws PlexusContainerException { - construct(c); - } - - public ClassRealm createChildRealm(String id) { - try { - return containerRealm.createChildRealm(id); - } catch (DuplicateRealmException e) { - try { - return classWorld.getRealm(id); - } catch (NoSuchRealmException e1) { - return null; - } - } - } - - private void construct(ContainerConfiguration c) throws PlexusContainerException { - configurationSource = c.getConfigurationSource(); - - // ---------------------------------------------------------------------------- - // ClassWorld - // ---------------------------------------------------------------------------- - - classWorld = c.getClassWorld(); - - // Make sure we have a valid ClassWorld - if (classWorld == null) { - classWorld = - new ClassWorld(DEFAULT_REALM_NAME, Thread.currentThread().getContextClassLoader()); - } - - containerRealm = c.getRealm(); - - if (containerRealm == null) { - try { - containerRealm = classWorld.getRealm(DEFAULT_REALM_NAME); - } catch (NoSuchRealmException e) { - containerRealm = (ClassRealm) classWorld.getRealms().iterator().next(); - - if (containerRealm == null) { - System.err.println("No container realm! Expect errors."); - - new Throwable().printStackTrace(); - } - } - } - - setLookupRealm(containerRealm); - - // ---------------------------------------------------------------------------- - // Context - // ---------------------------------------------------------------------------- - - if (c.getContext() != null) { - containerContext = new DefaultContext(c.getContext()); - } else { - containerContext = new DefaultContext(); - } - - // ---------------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------------- - - InputStream in = null; - - if (c.getContainerConfiguration() != null) { - in = toStream(c.getContainerConfiguration()); - } - - try { - if (c.getContainerConfigurationURL() != null) { - in = c.getContainerConfigurationURL().openStream(); - } - } catch (IOException e) { - throw new PlexusContainerException("Error reading configuration URL", e); - } - - try { - configurationReader = in == null ? null : ReaderFactory.newXmlReader(in); - } catch (IOException e) { - throw new PlexusContainerException("Error reading configuration file", e); - } - - try { - initialize(c); - - start(); - } finally { - IOUtil.close(configurationReader); - } - - for (Class clazz : c.getComponentDiscoverers()) { - try { - ComponentDiscoverer cd = (ComponentDiscoverer) lookup(clazz); - componentDiscovererManager.addComponentDiscoverer(cd); - } catch (ComponentLookupException e) { - } - } - - for (Class clazz : c.getComponentDiscoveryListeners()) { - try { - ComponentDiscoveryListener cdl = (ComponentDiscoveryListener) lookup(clazz); - componentDiscovererManager.registerComponentDiscoveryListener(cdl); - } catch (ComponentLookupException e) { - } - } - } - - // ---------------------------------------------------------------------------- - // Lookup - // ---------------------------------------------------------------------------- - - private Class getInterfaceClass(String role, String hint) { - ComponentDescriptor cd; - - if (hint == null) { - cd = getComponentDescriptor(role); - } else { - cd = getComponentDescriptor(role, hint); - } - - if (cd != null) { - try { - ClassRealm realm = getLookupRealm(); - - if (realm != null) { - return realm.loadClass(role); - } else { - ClassLoader loader = cd.getImplementationClass().getClassLoader(); - - if (loader != null) { - return loader.loadClass(role); - } - } - } catch (ClassNotFoundException e) { - return Object.class; - } - } - - return Object.class; - } - - private Class getRoleClass(String role) { - return getInterfaceClass(role, null); - } - - private Class getRoleClass(String role, String hint) { - return getInterfaceClass(role, hint); - } - - public Object lookup(String role) throws ComponentLookupException { - return componentRegistry.lookup(getRoleClass(role), role, ""); - } - - public Object lookup(String role, String roleHint) throws ComponentLookupException { - return componentRegistry.lookup(getRoleClass(role, roleHint), role, roleHint); - } - - public T lookup(Class type) throws ComponentLookupException { - return componentRegistry.lookup(type, type.getName(), ""); - } - - public T lookup(Class type, String roleHint) throws ComponentLookupException { - return componentRegistry.lookup(type, type.getName(), roleHint); - } - - public T lookup(Class type, String role, String roleHint) throws ComponentLookupException { - return componentRegistry.lookup(type, role, roleHint); - } - - public T lookup(ComponentDescriptor componentDescriptor) throws ComponentLookupException { - return componentRegistry.lookup(componentDescriptor); - } - - public List lookupList(String role) throws ComponentLookupException { - return cast(componentRegistry.lookupList(getRoleClass(role), role, null)); - } - - public List lookupList(String role, List roleHints) throws ComponentLookupException { - return cast(componentRegistry.lookupList(getRoleClass(role), role, roleHints)); - } - - public List lookupList(Class type) throws ComponentLookupException { - return componentRegistry.lookupList(type, type.getName(), null); - } - - public List lookupList(Class type, List roleHints) throws ComponentLookupException { - return componentRegistry.lookupList(type, type.getName(), roleHints); - } - - public Map lookupMap(String role) throws ComponentLookupException { - return cast(componentRegistry.lookupMap(getRoleClass(role), role, null)); - } - - public Map lookupMap(String role, List roleHints) throws ComponentLookupException { - return cast(componentRegistry.lookupMap(getRoleClass(role), role, roleHints)); - } - - public Map lookupMap(Class type) throws ComponentLookupException { - return componentRegistry.lookupMap(type, type.getName(), null); - } - - public Map lookupMap(Class type, List roleHints) throws ComponentLookupException { - return componentRegistry.lookupMap(type, type.getName(), roleHints); - } - - // ---------------------------------------------------------------------- - // Component Descriptor Lookup - // ---------------------------------------------------------------------- - - public boolean hasComponent(String role) { - return componentRegistry.getComponentDescriptor(Object.class, role, "") != null; - } - - public boolean hasComponent(String role, String roleHint) { - return componentRegistry.getComponentDescriptor(Object.class, role, roleHint) != null; - } - - public boolean hasComponent(Class type) { - return componentRegistry.getComponentDescriptor(type, type.getName(), "") != null; - } - - public boolean hasComponent(Class type, String roleHint) { - return componentRegistry.getComponentDescriptor(type, type.getName(), roleHint) != null; - } - - public boolean hasComponent(Class type, String role, String roleHint) { - return componentRegistry.getComponentDescriptor(type, role, roleHint) != null; - } - - public ComponentDescriptor getComponentDescriptor(String role) { - return componentRegistry.getComponentDescriptor(Object.class, role, ""); - } - - public ComponentDescriptor getComponentDescriptor(String role, String roleHint) { - return componentRegistry.getComponentDescriptor(Object.class, role, roleHint); - } - - public ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint) { - return componentRegistry.getComponentDescriptor(type, role, roleHint); - } - - public Map> getComponentDescriptorMap(String role) { - return cast(componentRegistry.getComponentDescriptorMap(Object.class, role)); - } - - public Map> getComponentDescriptorMap(Class type, String role) { - return componentRegistry.getComponentDescriptorMap(type, role); - } - - public List> getComponentDescriptorList(String role) { - return cast(componentRegistry.getComponentDescriptorList(Object.class, role)); - } - - public List> getComponentDescriptorList(Class type, String role) { - return componentRegistry.getComponentDescriptorList(type, role); - } - - public void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException { - if (componentDescriptor.getRealm() == null) { - componentDescriptor.setRealm(this.containerRealm); - // throw new ComponentImplementationNotFoundException( "ComponentDescriptor is missing realmId" ); - } - componentRegistry.addComponentDescriptor(componentDescriptor); - } - - // ---------------------------------------------------------------------- - // Component Release - // ---------------------------------------------------------------------- - - public void release(Object component) throws ComponentLifecycleException { - componentRegistry.release(component); - } - - public void releaseAll(Map components) throws ComponentLifecycleException { - for (Object component : components.values()) { - release(component); - } - } - - public void releaseAll(List components) throws ComponentLifecycleException { - for (Object component : components) { - release(component); - } - } - - // ---------------------------------------------------------------------- - // Lifecycle Management - // ---------------------------------------------------------------------- - - protected void initialize(ContainerConfiguration containerConfiguration) throws PlexusContainerException { - try { - initializeConfiguration(containerConfiguration); - - initializePhases(containerConfiguration); - - containerContext.put(PlexusConstants.PLEXUS_KEY, this); - - discoverComponents(getContainerRealm()); - - PlexusConfiguration[] loadOnStartComponents = - getConfiguration().getChild("load-on-start").getChildren("component"); - - getLogger().debug("Found " + loadOnStartComponents.length + " components to load on start"); - - ClassLoader prevCl = Thread.currentThread().getContextClassLoader(); - - try { - for (PlexusConfiguration loadOnStartComponent : loadOnStartComponents) { - String role = loadOnStartComponent.getChild("role").getValue(null); - - String roleHint = loadOnStartComponent.getChild("role-hint").getValue(null); - - if (role == null) { - throw new PlexusContainerException("Missing 'role' element from load-on-start."); - } - - if (roleHint == null) { - roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT; - } - - if (roleHint.equals("*")) { - getLogger().info("Loading on start all components with [role]: " + "[" + role + "]"); - - lookupList(role); - } else { - getLogger().info("Loading on start [role,roleHint]: " + "[" + role + "," + roleHint + "]"); - - lookup(role, roleHint); - } - } - } catch (ComponentLookupException e) { - throw new PlexusContainerException("Error looking up load-on-start component.", e); - } finally { - Thread.currentThread().setContextClassLoader(prevCl); - } - - } catch (ContextException e) { - throw new PlexusContainerException("Error processing configuration", e); - } catch (PlexusConfigurationException e) { - throw new PlexusContainerException("Error configuring components", e); - } catch (IOException e) { - throw new PlexusContainerException("Error reading configuration file", e); - } catch (CycleDetectedInComponentGraphException e) { - throw new PlexusContainerException("Cycle detected in component graph in the system: ", e); - } - } - - protected void initializePhases(ContainerConfiguration containerConfiguration) throws PlexusContainerException { - ContainerInitializationPhase[] initPhases = containerConfiguration.getInitializationPhases(); - - ContainerInitializationContext initializationContext = new ContainerInitializationContext( - this, classWorld, containerRealm, configuration, containerConfiguration); - - for (ContainerInitializationPhase phase : initPhases) { - try { - phase.execute(initializationContext); - } catch (Exception e) { - throw new PlexusContainerException( - "Error initializaing container in " + phase.getClass().getName() + ".", e); - } - } - } - - protected void start() throws PlexusContainerException { - // XXX this is called after initializeConfiguration - is this correct? - configuration = null; - } - - public void dispose() { - try { - componentRegistry.dispose(); - - boolean needToDisposeRealm = false; - - try { - containerRealm.setParentRealm(null); - - if (needToDisposeRealm) { - classWorld.disposeRealm(containerRealm.getId()); - } - } catch (NoSuchRealmException e) { - getLogger().debug("Failed to dispose realm."); - } - } finally { - lookupRealm.set(null); - } - } - - public void addContextValue(Object key, Object value) { - containerContext.put(key, value); - } - - // ---------------------------------------------------------------------- - // Misc Configuration - // ---------------------------------------------------------------------- - - public ClassWorld getClassWorld() { - return classWorld; - } - - public void setClassWorld(ClassWorld classWorld) { - this.classWorld = classWorld; - } - - public ClassRealm getContainerRealm() { - return containerRealm; - } - - public void setContainerRealm(ClassRealm containerRealm) { - this.containerRealm = containerRealm; - } - - // ---------------------------------------------------------------------- - // Context - // ---------------------------------------------------------------------- - - public Context getContext() { - return containerContext; - } - - // ---------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------- - - // TODO: put this in a separate helper class and turn into a component if possible, too big. - - protected void initializeConfiguration(ContainerConfiguration c) - throws PlexusConfigurationException, ContextException, IOException { - // We need an empty plexus configuration for merging. This is a function of removing the - // plexus-boostrap.xml file. - configuration = new XmlPlexusConfiguration("plexus"); - - if (configurationReader != null) { - // User userConfiguration - - PlexusConfiguration userConfiguration = PlexusTools.buildConfiguration( - "", getInterpolationConfigurationReader(configurationReader)); - - // Merger of bootstrapConfiguration and user userConfiguration - - configuration = PlexusConfigurationMerger.merge(userConfiguration, configuration); - } - } - - protected Reader getInterpolationConfigurationReader(Reader reader) { - return new InterpolationFilterReader(reader, new ContextMapAdapter(containerContext)); - } - - public Logger getLogger() { - return super.getLogger(); - } - - // ---------------------------------------------------------------------- - // Discovery - // ---------------------------------------------------------------------- - - public void registerComponentDiscoveryListener(ComponentDiscoveryListener listener) { - componentDiscovererManager.registerComponentDiscoveryListener(listener); - } - - public void removeComponentDiscoveryListener(ComponentDiscoveryListener listener) { - componentDiscovererManager.removeComponentDiscoveryListener(listener); - } - - // ---------------------------------------------------------------------------- - // Mutable Container Interface - // ---------------------------------------------------------------------------- - - public ComponentRegistry getComponentRegistry() { - return componentRegistry; - } - - public void setComponentRegistry(ComponentRegistry componentRegistry) { - this.componentRegistry = componentRegistry; - } - - public ComponentDiscovererManager getComponentDiscovererManager() { - return componentDiscovererManager; - } - - public void setComponentDiscovererManager(ComponentDiscovererManager componentDiscovererManager) { - this.componentDiscovererManager = componentDiscovererManager; - } - - public ComponentFactoryManager getComponentFactoryManager() { - return componentFactoryManager; - } - - public void setComponentFactoryManager(ComponentFactoryManager componentFactoryManager) { - this.componentFactoryManager = componentFactoryManager; - } - - // Configuration - - public PlexusConfiguration getConfiguration() { - return configuration; - } - - public void setConfiguration(PlexusConfiguration configuration) { - this.configuration = configuration; - } - - // ---------------------------------------------------------------------------- - // Component Realms - // ---------------------------------------------------------------------------- - - public ClassRealm getComponentRealm(String realmId) { - ClassRealm realm = null; - - try { - realm = classWorld.getRealm(realmId); - } catch (NoSuchRealmException e) { - // This should never happen: when a component is discovered, it is discovered from a realm and - // it is at that point the realm id is assigned to the component descriptor. - } - - if (realm == null) { - // The core components need the container realm. - realm = containerRealm; - } - - return realm; - } - - public void removeComponentRealm(ClassRealm realm) throws PlexusContainerException { - if (getContainerRealm().getId().equals(realm.getId())) { - throw new IllegalArgumentException("Cannot remove container realm: " + realm.getId() - + "\n(trying to remove container realm as if it were a component realm)."); - } - - componentRegistry.removeComponentRealm(realm); - - ClassRealm lookupRealm = getLookupRealm(); - if ((lookupRealm != null) && lookupRealm.getId().equals(realm.getId())) { - setLookupRealm(getContainerRealm()); - } - } - - private InputStream toStream(String resource) throws PlexusContainerException { - if (resource == null) { - return null; - } - - String relativeResource = resource; - if (resource.startsWith("/")) { - relativeResource = resource.substring(1); - } - - InputStream is = getClass().getClassLoader().getResourceAsStream(relativeResource); - - if (is == null) { - try { - return new FileInputStream(resource); - } catch (FileNotFoundException e) { - return null; - } - } - - return is; - } - - /** - * Utility method to get a default lookup realm for a component. - */ - public ClassRealm getLookupRealm(Object component) { - if (component.getClass().getClassLoader() instanceof ClassRealm) { - return ((ClassRealm) component.getClass().getClassLoader()); - } else { - return getLookupRealm(); - } - } - - public void setConfigurationSource(ConfigurationSource configurationSource) { - this.configurationSource = configurationSource; - } - - public ConfigurationSource getConfigurationSource() { - return configurationSource; - } - - public LoggerManager getLoggerManager() { - // TODO Auto-generated method stub - return loggerManager; - } - - public void setLoggerManager(LoggerManager loggerManager) { - this.loggerManager = loggerManager; - } - - // Discovery - - public List> discoverComponents(ClassRealm realm) - throws PlexusConfigurationException, CycleDetectedInComponentGraphException { - return discoverComponents(realm, null); - } - - public List> discoverComponents(ClassRealm realm, Object data) - throws PlexusConfigurationException, CycleDetectedInComponentGraphException { - List componentSetDescriptors = new ArrayList(); - - List> discoveredComponentDescriptors = new ArrayList>(); - - for (ComponentDiscoverer componentDiscoverer : - getComponentDiscovererManager().getComponentDiscoverers()) { - for (ComponentSetDescriptor componentSetDescriptor : - componentDiscoverer.findComponents(getContext(), realm)) { - // Here we should collect all the urls - // do the interpolation against the context - // register all the components - // allow interception and replacement of the components - - componentSetDescriptors.add(componentSetDescriptor); - - // Fire the event - ComponentDiscoveryEvent event = new ComponentDiscoveryEvent(componentSetDescriptor, data); - - componentDiscovererManager.fireComponentDiscoveryEvent(event); - - for (ComponentDescriptor componentDescriptor : componentSetDescriptor.getComponents()) { - addComponentDescriptor(componentDescriptor); - - discoveredComponentDescriptors.add(componentDescriptor); - } - } - } - - return discoveredComponentDescriptors; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java deleted file mode 100644 index 73a1683bb..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DuplicateChildContainerException extends PlexusContainerException { - - private final String parent; - private final String child; - - public DuplicateChildContainerException(String parent, String child) { - super("Cannot create child container, because child named \'" + child + "\' already exists in parent \'" - + parent + "\'."); - - this.parent = parent; - - this.child = child; - } - - public String getParent() { - return parent; - } - - public String getChild() { - return child; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java deleted file mode 100644 index 3db732a2b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.discovery.ComponentDiscovererManager; -import org.codehaus.plexus.component.factory.ComponentFactoryManager; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.source.ConfigurationSource; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; - -/** - * @author Jason van Zyl - */ -public interface MutablePlexusContainer extends PlexusContainer { - // Core Components - - ComponentRegistry getComponentRegistry(); - - void setComponentRegistry(ComponentRegistry componentRegistry); - - ComponentDiscovererManager getComponentDiscovererManager(); - - void setComponentDiscovererManager(ComponentDiscovererManager componentDiscovererManager); - - ComponentFactoryManager getComponentFactoryManager(); - - void setComponentFactoryManager(ComponentFactoryManager componentFactoryManager); - - LoggerManager getLoggerManager(); - - void setLoggerManager(LoggerManager loggerManager); - - Logger getLogger(); - - void setConfigurationSource(ConfigurationSource configurationSource); - - ConfigurationSource getConfigurationSource(); - - // Configuration - - void setConfiguration(PlexusConfiguration configuration); - - PlexusConfiguration getConfiguration(); - - ClassRealm getComponentRealm(String realmId); - - ClassWorld getClassWorld(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java b/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java deleted file mode 100644 index 5577a5d3f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public abstract class PlexusConstants { - /** Key used to retrieve the plexus container from the containerContext. */ - public static final String PLEXUS_KEY = "plexus"; - - /** The role-hint to use for components or lookups that do not specify a role.*/ - public static final String PLEXUS_DEFAULT_HINT = "default"; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java deleted file mode 100644 index 1b713f75f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java +++ /dev/null @@ -1,435 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.context.Context; - -/** - * PlexusContainer is the entry-point for loading and accessing other - * components. - */ -public interface PlexusContainer { - String ROLE = PlexusContainer.class.getName(); - - // ------------------------------------------------------------------------ - // Lookup - // ------------------------------------------------------------------------ - - /** - * Looks up and returns a component object with the given unique key or role. - * @param role a unique key for the desired component - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - Object lookup(String role) throws ComponentLookupException; - - /** - * Looks up and returns a component object with the given unique role/role-hint combination. - * @param role a non-unique key for the desired component - * @param roleHint a hint for the desired component implementation - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - Object lookup(String role, String roleHint) throws ComponentLookupException; - - /** - * Looks up and returns a component object with the given unique key or role. - * @param type the unique type of the component within the container - * @param The type. - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - T lookup(Class type) throws ComponentLookupException; - - /** - * Looks up and returns a component object with the given unique role/role-hint combination. - * @param type the non-unique type of the component - * @param roleHint a hint for the desired component implementation - * @param The type. - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - T lookup(Class type, String roleHint) throws ComponentLookupException; - - /** - * Looks up and returns a component object with the given unique role/role-hint combination. - * @param type the non-unique type of the component - * @param role a non-unique key for the desired component - * @param roleHint a hint for the desired component implementation - * @param The type. - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - T lookup(Class type, String role, String roleHint) throws ComponentLookupException; - - /** - * Looks up and returns a component object matching the given component descriptor. - * @param componentDescriptor the descriptor of the component - * @param The type. - * @return a Plexus component object - * @throws ComponentLookupException in case of lookup error. - */ - T lookup(ComponentDescriptor componentDescriptor) throws ComponentLookupException; - - /** - * Looks up and returns a List of component objects with the given role. - * @param role a non-unique key for the desired components - * @return a List of component objects - * @throws ComponentLookupException in case of lookup error. - */ - List lookupList(String role) throws ComponentLookupException; - - /** - * Looks up and returns a List of component objects with the given role. - * @param role a non-unique key for the desired components - * @param roleHints the list of hints. - * @return a List of component objects - * @throws ComponentLookupException in case of lookup error. - */ - List lookupList(String role, List roleHints) throws ComponentLookupException; - - /** - * Looks up and returns a List of component objects with the given role. - * @param type the non-unique type of the components - * @param The type. - * @return a List of component objects - * @throws ComponentLookupException in case of lookup error. - */ - List lookupList(Class type) throws ComponentLookupException; - - /** - * Looks up and returns a List of component objects with the given role. - * @param type the non-unique type of the components - * @param roleHints the list of hints. - * @param The type. - * @return a List of component objects - * @throws ComponentLookupException in case of lookup error. - */ - List lookupList(Class type, List roleHints) throws ComponentLookupException; - - /** - * Looks up and returns a Map of component objects with the given role, keyed by all available role-hints. - * @param role a non-unique key for the desired components - * @return a Map of component objects - * @throws ComponentLookupException in case of lookup error. - */ - Map lookupMap(String role) throws ComponentLookupException; - - /** - * Looks up and returns a Map of component objects with the given role, keyed by all available role-hints. - * @param role a non-unique key for the desired components - * @param roleHints the list of hints. - * @return a Map of component objects - * @throws ComponentLookupException in case of lookup error. - */ - Map lookupMap(String role, List roleHints) throws ComponentLookupException; - - /** - * Looks up and returns a Map of component objects with the given role, keyed by all available role-hints. - * @param type the non-unique type of the components - * @param The type. - * @return a Map of component objects - * @throws ComponentLookupException in case of lookup error. - */ - Map lookupMap(Class type) throws ComponentLookupException; - - /** - * Looks up and returns a Map of component objects with the given role, keyed by all available role-hints. - * @param type the non-unique type of the components - * @param roleHints the list of hints. - * @param The type. - * @return a Map of component objects - * @throws ComponentLookupException in case of lookup error. - */ - Map lookupMap(Class type, List roleHints) throws ComponentLookupException; - - // ---------------------------------------------------------------------- - // Component Descriptor Lookup - // ---------------------------------------------------------------------- - - /** - * Returns the ComponentDescriptor with the given component role and the default role hint. - * Searches up the hierarchy until one is found, null if none is found. - * @param role a unique role for the desired component's descriptor - * @return the ComponentDescriptor with the given component role - */ - ComponentDescriptor getComponentDescriptor(String role); - - /** - * Returns the ComponentDescriptor with the given component role and hint. - * Searches up the hierarchy until one is found, null if none is found. - * @param role a unique role for the desired component's descriptor - * @param roleHint a hint showing which implementation should be used - * @return the ComponentDescriptor with the given component role - */ - ComponentDescriptor getComponentDescriptor(String role, String roleHint); - - /** - * Returns the ComponentDescriptor with the given component role and hint. - * Searches up the hierarchy until one is found, null if none is found. - * @param type the Java type of the desired component - * @param role a unique role for the desired component's descriptor - * @param roleHint a hint showing which implementation should be used - * @param The type. - * @return the ComponentDescriptor with the given component role - */ - ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint); - - /** - * Returns a Map of ComponentDescriptors with the given role, keyed by role-hint. Searches up the hierarchy until - * all are found, an empty Map if none are found. - * @param role a non-unique key for the desired components - * @return a Map of component descriptors keyed by role-hint - */ - Map> getComponentDescriptorMap(String role); - - /** - * Returns a Map of ComponentDescriptors with the given role, keyed by role-hint. Searches up the hierarchy until - * all are found, an empty Map if none are found. - * @param type the Java type of the desired components - * @param role a non-unique key for the desired components - * @param The type. - * @return a Map of component descriptors keyed by role-hint - */ - Map> getComponentDescriptorMap(Class type, String role); - - /** - * Returns a List of ComponentDescriptors with the given role. Searches up the hierarchy until all are found, an - * empty List if none are found. - * @param role a non-unique key for the desired components - * @return a List of component descriptors - */ - List> getComponentDescriptorList(String role); - - /** - * Returns a List of ComponentDescriptors with the given role. Searches up the hierarchy until all are found, an - * empty List if none are found. - * @param type the Java type of the desired components - * @param role a non-unique key for the desired components - * @param The type. - * @return a List of component descriptors - */ - List> getComponentDescriptorList(Class type, String role); - - /** - * Adds a component descriptor to this container. componentDescriptor should have realmId set. - * @param componentDescriptor {@link ComponentDescriptor} - * @throws CycleDetectedInComponentGraphException In case of an error. - */ - void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException; - - /** - * Releases the component from the container. This is dependent upon how the implementation manages the component, - * but usually enacts some standard lifecycle shutdown procedure on the component. In every case, the component is - * no longer accessible from the container (unless another is created). - * @param component the plexus component object to release - * @throws ComponentLifecycleException in case of an error. - */ - void release(Object component) throws ComponentLifecycleException; - - /** - * Releases all Mapped component values from the container. - * @see PlexusContainer#release( Object component ) - * @param components Map of plexus component objects to release - * @throws ComponentLifecycleException in case of an error. - */ - void releaseAll(Map components) throws ComponentLifecycleException; - - /** - * Releases all Listed components from the container. - * @see PlexusContainer#release( Object component ) - * @param components List of plexus component objects to release - * @throws ComponentLifecycleException in case of an error. - */ - void releaseAll(List components) throws ComponentLifecycleException; - - /** - * Returns true if this container has the keyed component. - * @param role a non-unique key for the desired component - * @return true if this container has the keyed component - */ - boolean hasComponent(String role); - - /** - * Returns true if this container has a component with the given role/role-hint. - * @param role a non-unique key for the desired component - * @param roleHint a hint for the desired component implementation - * @return true if this container has a component with the given role/role-hint - */ - boolean hasComponent(String role, String roleHint); - - /** - * Returns true if this container has a component with the given role/role-hint. - * @param type the non-unique type of the component - * @return true if this container has a component with the given role/role-hint - */ - boolean hasComponent(Class type); - - /** - * Returns true if this container has a component with the given role/role-hint. - * @param type the non-unique type of the component - * @param roleHint a hint for the desired component implementation - * @return true if this container has a component with the given role/role-hint - */ - boolean hasComponent(Class type, String roleHint); - - /** - * Returns true if this container has a component with the given role/role-hint. - * @param type the non-unique type of the component - * @param role a non-unique key for the desired component - * @param roleHint a hint for the desired component implementation - * @return true if this container has a component with the given role/role-hint - */ - boolean hasComponent(Class type, String role, String roleHint); - - /** - * Disposes of this container, which in turn disposes all of it's components. This container should also remove - * itself from the container hierarchy. - */ - void dispose(); - - // ---------------------------------------------------------------------- - // Context - // ---------------------------------------------------------------------- - - /** - * Add a key/value pair to this container's Context. - * @param key any unique object valid to the Context's implementation - * @param value any object valid to the Context's implementation - */ - void addContextValue(Object key, Object value); - - /** - * Returns this container's context. A Context is a simple data store used to hold values which may alter the - * execution of the Container. - * @return this container's context. - */ - Context getContext(); - - /** - * Returns the Classworld's ClassRealm of this Container, which acts as the default parent for all contained - * components. - * @return the ClassRealm of this Container - */ - ClassRealm getContainerRealm(); - - // ---------------------------------------------------------------------- - // Discovery - // ---------------------------------------------------------------------- - - /** - * Adds the listener to this container. ComponentDiscoveryListeners have the ability to respond to various - * ComponentDiscoverer events. - * @param listener A listener which responds to different ComponentDiscoveryEvents - */ - void registerComponentDiscoveryListener(ComponentDiscoveryListener listener); - - /** - * Removes the listener from this container. - * @param listener A listener to remove - */ - void removeComponentDiscoveryListener(ComponentDiscoveryListener listener); - - /** - * Discovers components in the given realm. - * @param childRealm {@link ClassRealm} - * @return list {@link ComponentDescriptor} - * @throws PlexusConfigurationException in case of an error. - * @throws CycleDetectedInComponentGraphException in case of an error. - */ - List> discoverComponents(ClassRealm childRealm) - throws PlexusConfigurationException, CycleDetectedInComponentGraphException; - - /** - * Discovers components in the given realm. - * @param realm the {@link ClassRealm}. - * @param data The data. - * @return list {@link ComponentDescriptor} - * @throws PlexusConfigurationException in case of an error. - * @throws CycleDetectedInComponentGraphException in case of an error. - */ - List> discoverComponents(ClassRealm realm, Object data) - throws PlexusConfigurationException, CycleDetectedInComponentGraphException; - - // ---------------------------------------------------------------------------- - // Component/Plugin ClassRealm creation - // ---------------------------------------------------------------------------- - - ClassRealm createChildRealm(String id); - - ClassRealm getComponentRealm(String realmId); - - /** - * Dissociate the realm with the specified id from the container. This will - * remove all components contained in the realm from the component repository. - * - * @param componentRealm Realm to remove from the container. - * @throws PlexusContainerException {@link PlexusContainerException}. - */ - void removeComponentRealm(ClassRealm componentRealm) throws PlexusContainerException; - - /** - * Returns the lookup realm for this container, which is either - * the container realm or the realm set by {@link MutablePlexusContainer#setLookupRealm(ClassRealm)}. - * @return {@link ClassRealm} - */ - ClassRealm getLookupRealm(); - - /** - * Sets the lookup realm to use for lookup calls that don't have a ClassRealm parameter. - * @param realm the new realm to use. - * @return The previous lookup realm. It is advised to set it back once the old-style lookups have completed. - */ - ClassRealm setLookupRealm(ClassRealm realm); - - /** - * XXX ideally i'd like to place this in a plexus container specific utility class. - * - * Utility method to retrieve the lookup realm for a component instance. - * If the component's classloader is a ClassRealm, that realm is returned, - * otherwise the result of getLookupRealm is returned. - * @param component The component. - * @return {@link ClassRealm} - */ - ClassRealm getLookupRealm(Object component); - - void addComponent(Object component, String role) throws CycleDetectedInComponentGraphException; - - /** - * Adds live component instance to this container. - * - * Component instance is not associated with any class realm and will - * be ignored during lookup is lookup realm is provided using thread context - * classloader. - * @param component The component. - * @param role The role. - * @param roleHint The hint. - * @param The type. - */ - void addComponent(T component, Class role, String roleHint); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java deleted file mode 100644 index 89ca080a1..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Container execution exception. - * - * @author Brett Porter - */ -public class PlexusContainerException extends Exception { - private static final long serialVersionUID = 2213861902264275451L; - - /** - * Construct a new PlexusContainerException instance. - * @param message exception message - * @param throwable causing exception to chain - */ - public PlexusContainerException(String message, Throwable throwable) { - super(message, throwable); - } - - /** - * Construct a new PlexusContainerException instance. - * @param message exception message - */ - public PlexusContainerException(String message) { - super(message); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java deleted file mode 100644 index 29316b77e..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java +++ /dev/null @@ -1,250 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.io.InputStream; - -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupRuntimeException; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.DefaultContext; -import org.junit.After; -import org.junit.Before; - -import static org.junit.Assert.fail; - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - * @author Michal Maczka - */ -public abstract class PlexusJUnit4TestCase { - private PlexusContainer container; - - private static String basedir; - - @Before - public void beforeTest() throws Exception { - basedir = getBasedir(); - } - - protected void setupContainer() { - // ---------------------------------------------------------------------------- - // Context Setup - // ---------------------------------------------------------------------------- - - DefaultContext context = new DefaultContext(); - - context.put("basedir", getBasedir()); - - customizeContext(context); - - boolean hasPlexusHome = context.contains("plexus.home"); - - if (!hasPlexusHome) { - File f = getTestFile("target/plexus-home"); - - if (!f.isDirectory()) { - f.mkdir(); - } - - context.put("plexus.home", f.getAbsolutePath()); - } - - // ---------------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------------- - - String config = getCustomConfigurationName(); - - ContainerConfiguration containerConfiguration = - new DefaultContainerConfiguration().setName("test").setContext(context.getContextData()); - - if (config != null) { - containerConfiguration.setContainerConfiguration(config); - } else { - String resource = getConfigurationName(null); - - containerConfiguration.setContainerConfiguration(resource); - } - - customizeContainerConfiguration(containerConfiguration); - - try { - container = new DefaultPlexusContainer(containerConfiguration); - } catch (PlexusContainerException e) { - e.printStackTrace(); - fail("Failed to create plexus container."); - } - } - - /** - * Allow custom test case implementations do augment the default container configuration before - * executing tests. - * - * @param containerConfiguration The configuration - */ - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {} - - protected void customizeContext(Context context) {} - - protected PlexusConfiguration customizeComponentConfiguration() { - return null; - } - - @After - public void afterTest() throws Exception { - if (container != null) { - container.dispose(); - - container = null; - } - } - - protected PlexusContainer getContainer() { - if (container == null) { - setupContainer(); - } - - return container; - } - - protected InputStream getConfiguration() { - return getConfiguration(null); - } - - protected InputStream getConfiguration(String subname) { - return getResourceAsStream(getConfigurationName(subname)); - } - - protected String getCustomConfigurationName() { - return null; - } - - /** - * Allow the retrieval of a container configuration that is based on the name - * of the test class being run. So if you have a test class called org.foo.FunTest, then - * this will produce a resource name of org/foo/FunTest.xml which would be used to - * configure the Plexus container before running your test. - * - * @param subname the subname (not used) - * @return A configuration name - */ - protected String getConfigurationName(String subname) { - return getClass().getName().replace('.', '/') + ".xml"; - } - - protected InputStream getResourceAsStream(String resource) { - return getClass().getResourceAsStream(resource); - } - - protected ClassLoader getClassLoader() { - return getClass().getClassLoader(); - } - - // ---------------------------------------------------------------------- - // Container access - // ---------------------------------------------------------------------- - - protected Object lookup(String componentKey) { - try { - return getContainer().lookup(componentKey); - } catch (ComponentLookupException e) { - throw new ComponentLookupRuntimeException(e); - } - } - - protected Object lookup(String role, String roleHint) throws ComponentLookupRuntimeException { - try { - return getContainer().lookup(role, roleHint); - } catch (ComponentLookupException e) { - throw new ComponentLookupRuntimeException(e); - } - } - - protected T lookup(Class componentClass) throws ComponentLookupRuntimeException { - try { - return getContainer().lookup(componentClass); - } catch (ComponentLookupException e) { - throw new ComponentLookupRuntimeException(e); - } - } - - protected T lookup(Class componentClass, String roleHint) throws ComponentLookupRuntimeException { - try { - return getContainer().lookup(componentClass, roleHint); - } catch (ComponentLookupException e) { - throw new ComponentLookupRuntimeException(e); - } - } - - protected void release(Object component) throws Exception { - getContainer().release(component); - } - - // ---------------------------------------------------------------------- - // Helper methods for sub classes - // ---------------------------------------------------------------------- - - public static File getTestFile(String path) { - return new File(getBasedir(), path); - } - - public static File getTestFile(String basedir, String path) { - File basedirFile = new File(basedir); - - if (!basedirFile.isAbsolute()) { - basedirFile = getTestFile(basedir); - } - - return new File(basedirFile, path); - } - - public static String getTestPath(String path) { - return getTestFile(path).getAbsolutePath(); - } - - public static String getTestPath(String basedir, String path) { - return getTestFile(basedir, path).getAbsolutePath(); - } - - public static String getBasedir() { - if (basedir != null) { - return basedir; - } - - basedir = System.getProperty("basedir"); - - if (basedir == null) { - basedir = new File("").getAbsolutePath(); - } - - return basedir; - } - - public String getTestConfiguration() { - return getTestConfiguration(getClass()); - } - - public static String getTestConfiguration(Class clazz) { - String s = clazz.getName().replace('.', '/'); - - return s.substring(0, s.indexOf("$")) + ".xml"; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java deleted file mode 100644 index e41806f5e..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java +++ /dev/null @@ -1,230 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.io.InputStream; - -import junit.framework.TestCase; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.DefaultContext; - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - * @author Michal Maczka - */ -public abstract class PlexusTestCase extends TestCase { - private PlexusContainer container; - - private static String basedir; - - protected void setUp() throws Exception { - basedir = getBasedir(); - } - - @SuppressWarnings("ResultOfMethodCallIgnored") - protected void setupContainer() { - // ---------------------------------------------------------------------------- - // Context Setup - // ---------------------------------------------------------------------------- - - DefaultContext context = new DefaultContext(); - - context.put("basedir", getBasedir()); - - customizeContext(context); - - boolean hasPlexusHome = context.contains("plexus.home"); - - if (!hasPlexusHome) { - File f = getTestFile("target/plexus-home"); - - if (!f.isDirectory()) { - f.mkdir(); - } - - context.put("plexus.home", f.getAbsolutePath()); - } - - // ---------------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------------- - - String config = getCustomConfigurationName(); - - ContainerConfiguration containerConfiguration = - new DefaultContainerConfiguration().setName("test").setContext(context.getContextData()); - - if (config != null) { - containerConfiguration.setContainerConfiguration(config); - } else { - String resource = getConfigurationName(null); - - containerConfiguration.setContainerConfiguration(resource); - } - - customizeContainerConfiguration(containerConfiguration); - - try { - container = new DefaultPlexusContainer(containerConfiguration); - } catch (PlexusContainerException e) { - e.printStackTrace(); - fail("Failed to create plexus container."); - } - } - - /** - * Allow custom test case implementations do augment the default container configuration before - * executing tests. - * - * @param containerConfiguration {@link ContainerConfiguration}. - */ - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {} - - protected void customizeContext(Context context) {} - - protected PlexusConfiguration customizeComponentConfiguration() { - return null; - } - - protected void tearDown() throws Exception { - if (container != null) { - container.dispose(); - - container = null; - } - } - - protected PlexusContainer getContainer() { - if (container == null) { - setupContainer(); - } - - return container; - } - - protected InputStream getConfiguration() throws Exception { - return getConfiguration(null); - } - - protected InputStream getConfiguration(String subname) throws Exception { - return getResourceAsStream(getConfigurationName(subname)); - } - - protected String getCustomConfigurationName() { - return null; - } - - /** - * Allow the retrieval of a container configuration that is based on the name - * of the test class being run. So if you have a test class called org.foo.FunTest, then - * this will produce a resource name of org/foo/FunTest.xml which would be used to - * configure the Plexus container before running your test. - * - * @param subname the subname - * @return A configruation name - */ - protected String getConfigurationName(String subname) { - return getClass().getName().replace('.', '/') + ".xml"; - } - - protected InputStream getResourceAsStream(String resource) { - return getClass().getResourceAsStream(resource); - } - - protected ClassLoader getClassLoader() { - return getClass().getClassLoader(); - } - - // ---------------------------------------------------------------------- - // Container access - // ---------------------------------------------------------------------- - - @SuppressWarnings("unchecked") - protected T lookup(String componentKey) throws Exception { - return (T) getContainer().lookup(componentKey); - } - - @SuppressWarnings("unchecked") - protected T lookup(String role, String roleHint) throws Exception { - return (T) getContainer().lookup(role, roleHint); - } - - protected T lookup(Class componentClass) throws Exception { - return getContainer().lookup(componentClass); - } - - protected T lookup(Class componentClass, String roleHint) throws Exception { - return getContainer().lookup(componentClass, roleHint); - } - - protected void release(Object component) throws Exception { - getContainer().release(component); - } - - // ---------------------------------------------------------------------- - // Helper methods for sub classes - // ---------------------------------------------------------------------- - - public static File getTestFile(String path) { - return new File(getBasedir(), path); - } - - public static File getTestFile(String basedir, String path) { - File basedirFile = new File(basedir); - - if (!basedirFile.isAbsolute()) { - basedirFile = getTestFile(basedir); - } - - return new File(basedirFile, path); - } - - public static String getTestPath(String path) { - return getTestFile(path).getAbsolutePath(); - } - - public static String getTestPath(String basedir, String path) { - return getTestFile(basedir, path).getAbsolutePath(); - } - - public static String getBasedir() { - if (basedir != null) { - return basedir; - } - - basedir = System.getProperty("basedir"); - - if (basedir == null) { - basedir = new File("").getAbsolutePath(); - } - - return basedir; - } - - public String getTestConfiguration() { - return getTestConfiguration(getClass()); - } - - public static String getTestConfiguration(Class clazz) { - String s = clazz.getName().replace('.', '/'); - - return s.substring(0, s.indexOf("$")) + ".xml"; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java deleted file mode 100644 index 3c57179f4..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.codehaus.plexus.component; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.xbean.recipe.RecipeHelper; - -@SuppressWarnings({"unchecked", "UnusedDeclaration"}) -public final class CastUtils { - private CastUtils() { - // utility class, never constructed - } - - public static Map cast(Map p) { - return (Map) p; - } - - public static Map cast(Map p, Class t, Class u) { - return (Map) p; - } - - public static Collection cast(Collection p) { - return (Collection) p; - } - - public static Collection cast(Collection p, Class cls) { - return (Collection) p; - } - - public static List cast(List p) { - return (List) p; - } - - public static List cast(List p, Class cls) { - return (List) p; - } - - public static Iterator cast(Iterator p) { - return (Iterator) p; - } - - public static Iterator cast(Iterator p, Class cls) { - return (Iterator) p; - } - - public static Set cast(Set p) { - return (Set) p; - } - - public static Set cast(Set p, Class cls) { - return (Set) p; - } - - public static Map.Entry cast(Map.Entry p) { - return (Map.Entry) p; - } - - public static Map.Entry cast(Map.Entry p, Class pc, Class uc) { - return (Map.Entry) p; - } - - // todo remove when recipe helper accecpts nulls - public static boolean isAssignableFrom(Class expected, Class actual) { - return actual != null && RecipeHelper.isAssignableFrom(expected, actual); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java deleted file mode 100644 index aaa108907..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.codehaus.plexus.component; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.repository.ComponentRequirement; - -public interface MapOrientedComponent { - - void addComponentRequirement(ComponentRequirement requirementDescriptor, Object requirementValue) - throws ComponentConfigurationException; - - void setComponentConfiguration(Map componentConfiguration) throws ComponentConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java deleted file mode 100644 index a6ecd66f6..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.codehaus.plexus.component.builder; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public abstract class AbstractComponentBuildListener implements ComponentBuildListener { - public void beforeComponentCreate(ComponentDescriptor componentDescriptor, ClassRealm realm) {} - - public void componentCreated(ComponentDescriptor componentDescriptor, Object component, ClassRealm realm) {} - - public void componentConfigured(ComponentDescriptor componentDescriptor, Object component, ClassRealm realm) {} -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java deleted file mode 100644 index 9ec6e7ee1..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.codehaus.plexus.component.builder; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public interface ComponentBuildListener { - - void beforeComponentCreate(ComponentDescriptor componentDescriptor, ClassRealm realm); - - void componentCreated(ComponentDescriptor componentDescriptor, Object component, ClassRealm realm); - - void componentConfigured(ComponentDescriptor componentDescriptor, Object component, ClassRealm realm); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java deleted file mode 100644 index 99bbdd158..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.codehaus.plexus.component.builder; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; - -public interface ComponentBuilder { - - T build(ComponentDescriptor descriptor, ClassRealm realm, ComponentBuildListener listener) - throws ComponentInstantiationException, ComponentLifecycleException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java deleted file mode 100644 index 950c7986d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java +++ /dev/null @@ -1,522 +0,0 @@ -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.codehaus.plexus.component.builder; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.xbean.recipe.AbstractRecipe; -import org.apache.xbean.recipe.ConstructionException; -import org.apache.xbean.recipe.ObjectRecipe; -import org.apache.xbean.recipe.Option; -import org.apache.xbean.recipe.RecipeHelper; -import org.codehaus.plexus.ComponentRegistry; -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.MapOrientedComponent; -import org.codehaus.plexus.component.collections.ComponentList; -import org.codehaus.plexus.component.collections.ComponentMap; -import org.codehaus.plexus.component.configurator.BasicComponentConfigurator; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ComponentConfigurator; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.composite.MapConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.converters.lookup.DefaultConverterLookup; -import org.codehaus.plexus.component.configurator.converters.special.ClassRealmConverter; -import org.codehaus.plexus.component.configurator.expression.DefaultExpressionEvaluator; -import org.codehaus.plexus.component.factory.ComponentFactory; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.factory.java.JavaComponentFactory; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.component.repository.ComponentRequirementList; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; -import org.codehaus.plexus.util.StringUtils; - -import static org.apache.xbean.recipe.RecipeHelper.toClass; - -public class XBeanComponentBuilder implements ComponentBuilder { - private static final ThreadLocal>> STACK = - new ThreadLocal>>() { - protected LinkedHashSet> initialValue() { - return new LinkedHashSet>(); - } - }; - - private ComponentManager componentManager; - - public XBeanComponentBuilder() {} - - public XBeanComponentBuilder(ComponentManager componentManager) { - setComponentManager(componentManager); - } - - public ComponentManager getComponentManager() { - return componentManager; - } - - public void setComponentManager(ComponentManager componentManager) { - this.componentManager = componentManager; - } - - protected MutablePlexusContainer getContainer() { - return componentManager.getContainer(); - } - - public T build(ComponentDescriptor descriptor, ClassRealm realm, ComponentBuildListener listener) - throws ComponentInstantiationException, ComponentLifecycleException { - LinkedHashSet> stack = STACK.get(); - if (stack.contains(descriptor)) { - // create list of circularity - List> circularity = new ArrayList>(stack); - circularity.subList(circularity.indexOf(descriptor), circularity.size()); - circularity.add(descriptor); - - // nice circularity message - String message = "Creation circularity: "; - for (ComponentDescriptor componentDescriptor : circularity) { - message += "\n\t[" + componentDescriptor.getRole() + ", " + componentDescriptor.getRoleHint() + "]"; - } - throw new ComponentInstantiationException(message); - } - stack.add(descriptor); - try { - if (listener != null) { - listener.beforeComponentCreate(descriptor, realm); - } - - T component = createComponentInstance(descriptor, realm); - - if (listener != null) { - listener.componentCreated(descriptor, component, realm); - } - - startComponentLifecycle(component, realm); - - if (listener != null) { - listener.componentConfigured(descriptor, component, realm); - } - - return component; - } finally { - stack.remove(descriptor); - } - } - - protected T createComponentInstance(ComponentDescriptor descriptor, ClassRealm realm) - throws ComponentInstantiationException, ComponentLifecycleException { - MutablePlexusContainer container = getContainer(); - if (realm == null) { - realm = descriptor.getRealm(); - } - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(realm); - try { - ObjectRecipe recipe; - - T instance; - ComponentFactory componentFactory = - container.getComponentFactoryManager().findComponentFactory(descriptor.getComponentFactory()); - if (JavaComponentFactory.class.equals(componentFactory.getClass())) { - // xbean-reflect will create object and do injection - recipe = createObjectRecipe(null, descriptor, realm); - instance = (T) recipe.create(); - } else { - // todo figure out how to easily let xbean use the factory to construct the component - // use object factory to construct component and then inject into that object - instance = (T) componentFactory.newInstance(descriptor, realm, container); - recipe = createObjectRecipe(instance, descriptor, realm); - recipe.setProperties(instance); - } - - // todo figure out how to easily let xbean do this map oriented stuff (if it is actually used in plexus) - if (instance instanceof MapOrientedComponent) { - MapOrientedComponent mapOrientedComponent = (MapOrientedComponent) instance; - processMapOrientedComponent(descriptor, mapOrientedComponent, realm); - } - - return instance; - } catch (Exception e) { - throw new ComponentLifecycleException( - "Error constructing component " + descriptor.getHumanReadableKey(), e); - } catch (LinkageError e) { - throw new ComponentLifecycleException( - "Error constructing component " + descriptor.getHumanReadableKey(), e); - } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - public ObjectRecipe createObjectRecipe(T instance, ComponentDescriptor descriptor, ClassRealm realm) - throws ComponentInstantiationException, PlexusConfigurationException { - String factoryMethod = null; - String[] constructorArgNames = null; - Class[] constructorArgTypes = null; - - Class implClass = (instance != null) ? instance.getClass() : descriptor.getImplementationClass(); - - if (implClass == null || implClass == Object.class) { - // if the descriptor could not load the class, it's time to report this up to the caller now - try { - realm.loadClass(descriptor.getImplementation()); - } catch (ClassNotFoundException e) { - throw new ComponentInstantiationException( - "Could not load implementation class for component " + descriptor.getHumanReadableKey() - + " from class realm " + realm, - e); - } catch (LinkageError e) { - throw new ComponentInstantiationException( - "Could not load implementation class for component " + descriptor.getHumanReadableKey() - + " from class realm " + realm, - e); - } - } - - ObjectRecipe recipe = new ObjectRecipe(implClass, factoryMethod, constructorArgNames, constructorArgTypes); - recipe.allow(Option.FIELD_INJECTION); - recipe.allow(Option.PRIVATE_PROPERTIES); - - // MapOrientedComponents don't get normal injection - if (!MapOrientedComponent.class.isAssignableFrom(implClass)) { - for (ComponentRequirement requirement : descriptor.getRequirements()) { - String name = requirement.getFieldName(); - RequirementRecipe requirementRecipe = - new RequirementRecipe(descriptor, requirement, getContainer(), name == null); - - if (name != null) { - recipe.setProperty(name, requirementRecipe); - } else { - recipe.setAutoMatchProperty(requirement.getRole(), requirementRecipe); - } - } - - // add configuration data - if (shouldConfigure(descriptor)) { - PlexusConfiguration configuration = descriptor.getConfiguration(); - if (configuration != null) { - for (String name : configuration.getAttributeNames()) { - String value; - try { - value = configuration.getAttribute(name); - } catch (PlexusConfigurationException e) { - throw new ComponentInstantiationException("Error getting value for attribute " + name, e); - } - name = fromXML(name); - recipe.setProperty(name, value); - } - for (PlexusConfiguration child : configuration.getChildren()) { - String name = child.getName(); - name = fromXML(name); - if (StringUtils.isNotEmpty(child.getValue(null))) { - recipe.setProperty(name, child.getValue()); - } else { - recipe.setProperty(name, new PlexusConfigurationRecipe(child)); - } - } - } - } - } - return recipe; - } - - protected boolean shouldConfigure(ComponentDescriptor descriptor) { - String configuratorId = descriptor.getComponentConfigurator(); - - if (StringUtils.isEmpty(configuratorId)) { - return true; - } - - try { - ComponentConfigurator componentConfigurator = - getContainer().lookup(ComponentConfigurator.class, configuratorId); - return componentConfigurator == null - || componentConfigurator.getClass().equals(BasicComponentConfigurator.class); - } catch (ComponentLookupException e) { - } - - return true; - } - - protected String fromXML(String elementName) { - return StringUtils.lowercaseFirstLetter(StringUtils.removeAndHump(elementName, "-")); - } - - protected void startComponentLifecycle(Object component, ClassRealm realm) throws ComponentLifecycleException { - try { - componentManager.start(component); - } catch (PhaseExecutionException e) { - throw new ComponentLifecycleException("Error starting component", e); - } - } - - public static class RequirementRecipe extends AbstractRecipe { - private ComponentDescriptor componentDescriptor; - private ComponentRequirement requirement; - private MutablePlexusContainer container; - private boolean autoMatch; - - public RequirementRecipe( - ComponentDescriptor componentDescriptor, - ComponentRequirement requirement, - MutablePlexusContainer container, - boolean autoMatch) { - this.componentDescriptor = componentDescriptor; - this.requirement = requirement; - this.container = container; - this.autoMatch = autoMatch; - } - - public boolean canCreate(Type expectedType) { - if (!autoMatch) { - return true; - } - - Class propertyType = toClass(expectedType); - - // Never auto match array, map or collection - if (propertyType.isArray() - || Map.class.isAssignableFrom(propertyType) - || Collection.class.isAssignableFrom(propertyType) - || requirement instanceof ComponentRequirementList) { - return false; - } - - // if the type to be created is an instance of the expected type, return true - try { - ComponentRegistry componentRegistry = container.getComponentRegistry(); - - return componentRegistry.getComponentDescriptor( - propertyType, requirement.getRole(), requirement.getRoleHint()) - != null; - } catch (Exception e) { - } - - return false; - } - - @Override - protected Object internalCreate(Type expectedType, boolean lazyRefAllowed) throws ConstructionException { - Class propertyType = toClass(expectedType); - - try { - String role = requirement.getRole(); - List roleHints = null; - if (requirement instanceof ComponentRequirementList) { - roleHints = ((ComponentRequirementList) requirement).getRoleHints(); - } - - Object assignment; - if (propertyType.isArray()) { - assignment = new ArrayList(container.lookupList(role, roleHints)); - } - - // Map.class.isAssignableFrom( clazz ) doesn't make sense, since Map.class doesn't really - // have a meaningful superclass. - else { - if (Map.class.equals(propertyType)) { - // todo this is a lazy map - - // get component type - Type keyType = Object.class; - Type valueType = Object.class; - Type[] typeParameters = RecipeHelper.getTypeParameters(Collection.class, expectedType); - if (typeParameters != null && typeParameters.length == 2) { - if (typeParameters[0] instanceof Class) { - keyType = typeParameters[0]; - } - if (typeParameters[1] instanceof Class) { - valueType = typeParameters[1]; - } - } - - // todo verify key type is String - - assignment = new ComponentMap( - container, - toClass(valueType), - role, - roleHints, - componentDescriptor.getHumanReadableKey()); - } - // List.class.isAssignableFrom( clazz ) doesn't make sense, since List.class doesn't really - // have a meaningful superclass other than Collection.class, which we'll handle next. - else if (List.class.equals(propertyType)) { - // todo this is a lazy list - - // get component type - Type[] typeParameters = RecipeHelper.getTypeParameters(Collection.class, expectedType); - Type componentType = Object.class; - if (typeParameters != null - && typeParameters.length == 1 - && typeParameters[0] instanceof Class) { - componentType = typeParameters[0]; - } - - assignment = new ComponentList( - container, - toClass(componentType), - role, - roleHints, - componentDescriptor.getHumanReadableKey()); - } - // Set.class.isAssignableFrom( clazz ) doesn't make sense, since Set.class doesn't really - // have a meaningful superclass other than Collection.class, and that would make this - // if-else cascade unpredictable (both List and Set extend Collection, so we'll put another - // check in for Collection.class. - else if (Set.class.equals(propertyType) || Collection.class.isAssignableFrom(propertyType)) { - // todo why isn't this lazy as above? - assignment = container.lookupMap(role, roleHints); - } else if (Logger.class.equals(propertyType)) { - // todo magic reference - assignment = container.getLoggerManager().getLoggerForComponent(componentDescriptor.getRole()); - } else if (PlexusContainer.class.equals(propertyType)) { - // todo magic reference - assignment = container; - } else { - String roleHint = requirement.getRoleHint(); - assignment = container.lookup(propertyType, role, roleHint); - } - } - - return assignment; - } catch (ComponentLookupException e) { - if (requirement.isOptional()) { - return null; - } - - throw new ConstructionException( - "Composition failed of field " + requirement.getFieldName() + " " - + "in object of type " + componentDescriptor.getImplementation() - + " because the requirement " - + requirement + " was missing)", - e); - } - } - - @Override - public String toString() { - return "RequirementRecipe[fieldName=" + requirement.getFieldName() + ", role=" - + componentDescriptor.getRole() + "]"; - } - } - - private class PlexusConfigurationRecipe extends AbstractRecipe { - private final PlexusConfiguration child; - - public PlexusConfigurationRecipe(PlexusConfiguration child) { - this.child = child; - } - - public boolean canCreate(Type type) { - try { - ConverterLookup lookup = createConverterLookup(); - lookup.lookupConverterForType(toClass(type)); - return true; - } catch (ComponentConfigurationException e) { - return false; - } - } - - @Override - protected Object internalCreate(Type expectedType, boolean lazyRefAllowed) throws ConstructionException { - try { - ConverterLookup lookup = createConverterLookup(); - ConfigurationConverter converter = lookup.lookupConverterForType(toClass(expectedType)); - - // todo this will not work for static factories - ObjectRecipe caller = (ObjectRecipe) RecipeHelper.getCaller(); - Class parentClass = toClass(caller.getType()); - - Object value = converter.fromConfiguration( - lookup, - child, - toClass(expectedType), - parentClass, - Thread.currentThread().getContextClassLoader(), - new DefaultExpressionEvaluator()); - return value; - } catch (ComponentConfigurationException e) { - throw new ConstructionException("Unable to convert configuration for property " + child.getName() - + " to " + toClass(expectedType).getName()); - } - } - - private ConverterLookup createConverterLookup() { - ClassRealm realm = (ClassRealm) Thread.currentThread().getContextClassLoader(); - ConverterLookup lookup = new DefaultConverterLookup(); - lookup.registerConverter(new ClassRealmConverter(realm)); - return lookup; - } - } - - private void processMapOrientedComponent( - ComponentDescriptor descriptor, MapOrientedComponent mapOrientedComponent, ClassRealm realm) - throws ComponentConfigurationException, ComponentLookupException { - MutablePlexusContainer container = getContainer(); - - for (ComponentRequirement requirement : descriptor.getRequirements()) { - String role = requirement.getRole(); - String hint = requirement.getRoleHint(); - String mappingType = requirement.getFieldMappingType(); - - Object value; - - // if the hint is not empty (and not default), we don't care about mapping type... - // it's a single-value, not a collection. - if (StringUtils.isNotEmpty(hint) && !hint.equals(PlexusConstants.PLEXUS_DEFAULT_HINT)) { - value = container.lookup(role, hint); - } else if ("single".equals(mappingType)) { - value = container.lookup(role, hint); - } else if ("map".equals(mappingType)) { - value = container.lookupMap(role); - } else if ("set".equals(mappingType)) { - value = new HashSet(container.lookupList(role)); - } else { - value = container.lookup(role, hint); - } - - mapOrientedComponent.addComponentRequirement(requirement, value); - } - - MapConverter converter = new MapConverter(); - ConverterLookup converterLookup = new DefaultConverterLookup(); - DefaultExpressionEvaluator expressionEvaluator = new DefaultExpressionEvaluator(); - PlexusConfiguration configuration = container.getConfigurationSource().getConfiguration(descriptor); - - if (configuration != null) { - Map context = (Map) converter.fromConfiguration( - converterLookup, configuration, null, null, realm, expressionEvaluator, null); - - mapOrientedComponent.setComponentConfiguration(context); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java deleted file mode 100644 index bd1bd0593..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.codehaus.plexus.component.collections; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.logging.Logger; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** @author Jason van Zyl */ - -// We need to have the collection notified when a new implementation of a given role has -// been added to the container. We probably need some options so that we know when new -// component descriptors have been added to the system, and an option to keep the collection -// up-to-date when new implementations are added. -// -// NOTE: This includes component additions, but also component purges from the -// container, as when a component realm is disposed -// (and PlexusContainer.removeComponentRealm(..) is called). -public abstract class AbstractComponentCollection { - /** The reference to the PlexusContainer */ - protected MutablePlexusContainer container; - - /** The type of the components held by this collection*/ - protected final Class componentType; - - /** The role of the components we are holding in this Collection. */ - protected String role; - - /** The role hint of the components we are holding in this Collection. */ - protected List roleHints; - - /** The component that requires this collection of components */ - protected String hostComponent; - - /** Used to log errors in the component lookup process. */ - protected Logger logger; - - private ClassLoader tccl; - private Collection realms; - - private Map> componentDescriptorMap; - private final ClassWorld world; - - public AbstractComponentCollection( - final MutablePlexusContainer container, - final Class componentType, - final String role, - final List roleHints, - final String hostComponent) { - this.container = container; - - this.componentType = componentType; - - this.role = role; - - this.roleHints = roleHints; - - this.hostComponent = hostComponent; - - logger = container.getLoggerManager().getLoggerForComponent(role); - - world = container.getContainerRealm().getWorld(); - } - - private boolean realmsHaveChanged() { - return (tccl != Thread.currentThread().getContextClassLoader()) - || (realms == null) - || (!realms.equals(world.getRealms())); - } - - protected synchronized Map> getComponentDescriptorMap() { - checkUpdate(); - - return componentDescriptorMap; - } - - @SuppressWarnings("unchecked") - protected boolean checkUpdate() { - if (componentDescriptorMap != null && !realmsHaveChanged()) { - return false; - } - - tccl = Thread.currentThread().getContextClassLoader(); - Collection fromWorld = world.getRealms(); - if (fromWorld == null || fromWorld.isEmpty()) { - realms = null; - } else { - realms = new HashSet(fromWorld); - } - - Map> componentMap = container.getComponentDescriptorMap(componentType, role); - Map> newComponentDescriptors = - new HashMap>(componentMap.size() * 2); - - if (roleHints != null && !roleHints.isEmpty()) { - for (String roleHint : roleHints) { - ComponentDescriptor componentDescriptor = componentMap.get(roleHint); - if (componentDescriptor != null) { - newComponentDescriptors.put(roleHint, componentDescriptor); - } - } - } else { - newComponentDescriptors.putAll(componentMap); - } - - if (componentDescriptorMap == null || !newComponentDescriptors.equals(componentDescriptorMap)) { - componentDescriptorMap = newComponentDescriptors; - - return true; - } - - return false; - } - - protected T lookup(ComponentDescriptor componentDescriptor) { - T component = null; - - try { - if (componentDescriptor != null) { - component = container.lookup(componentDescriptor); - } - } catch (ComponentLookupException e) { - logger.debug( - "Failed to lookup a member of active collection with role: " + role + " and role-hint: " - + componentDescriptor.getRoleHint(), - e); - } - - return component; - } - - public synchronized void clear() { - releaseAllCallback(); - - componentDescriptorMap = null; - - tccl = null; - realms = null; - } - - protected abstract void releaseAllCallback(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java deleted file mode 100644 index 6db2e8ea4..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java +++ /dev/null @@ -1,223 +0,0 @@ -package org.codehaus.plexus.component.collections; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; - -/** - * @author Jason van Zyl FIXME: [jdcasey] We need to review the efficiency (in speed and memory) of this collection... - */ -public class ComponentList extends AbstractComponentCollection implements List { - private List components; - - public ComponentList( - MutablePlexusContainer container, - Class type, - String role, - List roleHints, - String hostComponent) { - super(container, type, role, roleHints, hostComponent); - } - - public int size() { - return getComponentDescriptorMap().size(); - } - - public boolean isEmpty() { - return getComponentDescriptorMap().isEmpty(); - } - - public boolean contains(Object object) { - return getList().contains(object); - } - - public Iterator iterator() { - return getList().iterator(); - } - - public Object[] toArray() { - return getList().toArray(); - } - - public X[] toArray(X[] ts) { - return getList().toArray(ts); - } - - public synchronized boolean add(T object) { - getList().add(object); - - /* - * PLX-352 This is strictly to support the hack in the Ant Run plugin that tries to poke in a custom converter. - * We need a better way to register converters to plexus and not hit the default converter lookup directly. - * throw new UnsupportedOperationException( "You cannot modify this list. This list is a requirement of " + - * hostComponent + " and managed by the container." ); - */ - - return true; - } - - public boolean remove(Object object) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public boolean containsAll(Collection collection) { - return getList().containsAll(collection); - } - - public boolean addAll(Collection collection) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public boolean addAll(int i, Collection collection) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public synchronized boolean removeAll(Collection collection) { - return getList().removeAll(collection); - } - - public synchronized boolean retainAll(Collection collection) { - return getList().retainAll(collection); - } - - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof List)) { - return false; - } - - List other = (List) o; - return getList().equals(other); - } - - public int hashCode() { - return getList().hashCode(); - } - - public T get(int i) { - return getList().get(i); - } - - public T set(int i, T object) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public void add(int i, T object) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public T remove(int i) { - throw new UnsupportedOperationException("You cannot modify this list. This list is a requirement of " - + hostComponent + " and managed by the container."); - } - - public int indexOf(Object object) { - return getList().indexOf(object); - } - - public int lastIndexOf(Object object) { - return getList().lastIndexOf(object); - } - - public ListIterator listIterator() { - return getList().listIterator(); - } - - public ListIterator listIterator(int index) { - return getList().listIterator(index); - } - - public List subList(int fromIndex, int toIndex) { - return getList().subList(fromIndex, toIndex); - } - - private synchronized List getList() { - // NOTE: If we cache the component map, we have a problem with releasing any of the - // components in this map...we need to be able to release them all. - if ((components == null) || checkUpdate()) { - List componentList = new ArrayList(); - - Map> descriptorMap = getComponentDescriptorMap(); - - if (roleHints != null) { - // we must follow the order in roleHints - for (String roleHint : roleHints) { - ComponentDescriptor componentDescriptor = descriptorMap.get(roleHint); - - T component = lookup(componentDescriptor); - - if (component != null) { - componentList.add(component); - } - } - } else { - for (Entry> entry : descriptorMap.entrySet()) { - ComponentDescriptor componentDescriptor = entry.getValue(); - - T component = lookup(componentDescriptor); - - if (component != null) { - componentList.add(component); - } - } - } - components = componentList; - } - - return components; - } - - @Override - protected boolean checkUpdate() { - if (super.checkUpdate()) { - components = null; - - return true; - } - - return false; - } - - protected void releaseAllCallback() { - if (components != null) { - try { - container.releaseAll(components); - } catch (ComponentLifecycleException e) { - logger.debug("Error releasing components in active collection: " + e.getMessage(), e); - } - - components = null; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java deleted file mode 100644 index 740a4f5f2..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java +++ /dev/null @@ -1,196 +0,0 @@ -package org.codehaus.plexus.component.collections; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; - -/** - * @author Jason van Zyl FIXME: [jdcasey] We need to review the efficiency (in speed and memory) of this collection... - */ -public class ComponentMap extends AbstractComponentCollection implements Map { - private Map components; - - private Map customAdditions = new LinkedHashMap(); - - public ComponentMap( - MutablePlexusContainer container, - Class type, - String role, - List roleHints, - String hostComponent) { - super(container, type, role, roleHints, hostComponent); - } - - public int size() { - return getComponentDescriptorMap().size(); - } - - public boolean isEmpty() { - return getComponentDescriptorMap().isEmpty(); - } - - public boolean containsKey(Object key) { - return getComponentDescriptorMap().containsKey(key); - } - - public boolean containsValue(Object value) { - return getMap().containsValue(value); - } - - public T get(Object k) { - return getMap().get(k); - } - - public synchronized T put(String key, T value) { - logger.warn("Custom " - + role - + " implementations should NOT be added directly to this Map. Instead, add them as Plexus components."); - - T prev = customAdditions.put(key, value); - if (prev == null) { - prev = getComponentMap().get(key); - } - - return prev; - } - - public synchronized void putAll(Map map) { - logger.warn("Custom " - + role - + " implementations should NOT be added directly to this Map. Instead, add them as Plexus components."); - - customAdditions.putAll(map); - } - - public Set keySet() { - return getMap().keySet(); - } - - public Collection values() { - return getMap().values(); - } - - public Set> entrySet() { - return getMap().entrySet(); - } - - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Map)) { - return false; - } - - Map object = (Map) o; - return getMap().equals(object); - } - - public int hashCode() { - return getMap().hashCode(); - } - - public synchronized T remove(Object key) { - logger.warn( - "Items in this Map should NOT be removed directly. If the matching entry is a component, it will NOT be removed."); - - if (key instanceof String) { - if (customAdditions.containsKey(key)) { - return customAdditions.remove(key); - } - } - - return null; - } - - private synchronized Map getMap() { - Map result = getComponentMap(); - - if (!customAdditions.isEmpty()) { - result.putAll(customAdditions); - } - - return result; - } - - private synchronized Map getComponentMap() { - if ((components == null) || checkUpdate()) { - Map componentMap = new LinkedHashMap(); - - Map> descriptorMap = getComponentDescriptorMap(); - - if (roleHints != null) { - // we must follow the order given in roleHints - for (String roleHint : roleHints) { - ComponentDescriptor componentDescriptor = descriptorMap.get(roleHint); - - T component = lookup(componentDescriptor); - - if (component != null) { - componentMap.put(roleHint, component); - } - } - } else { - for (Entry> entry : descriptorMap.entrySet()) { - String roleHint = entry.getKey(); - - ComponentDescriptor componentDescriptor = entry.getValue(); - - T component = lookup(componentDescriptor); - - if (component != null) { - componentMap.put(roleHint, component); - } - } - } - components = componentMap; - } - - return components; - } - - @Override - protected boolean checkUpdate() { - if (super.checkUpdate()) { - components = null; - - return true; - } - - return false; - } - - protected void releaseAllCallback() { - if (components != null) { - try { - container.releaseAll(components); - } catch (ComponentLifecycleException e) { - logger.debug("Error releasing components in active collection: " + e.getMessage(), e); - } - - components = null; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java deleted file mode 100644 index bea3da55f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** - * @author Jason van Zyl - * @author Michal Maczka - */ -public interface CompositionResolver { - public static final char SEPARATOR_CHAR = ':'; - - /** - * @param componentDescriptor {@link ComponentDescriptor}. - * @throws CycleDetectedInComponentGraphException when cycle is detected - */ - void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException; - - /** - * Returns the list of names of components which are required - * by the component of given role and roleHint. - * The names returned are in the form role:hint, where : is defined in SEPARATOR_CHAR. - * - * @param role The name of the component - * @param roleHint The implementation hint of the component - * @return The list of components which are required by given component - */ - List getRequirements(String role, String roleHint); - - /** - * Returns the list of names of components which are using the component. - * of given role and roleHint. - * The names returned are in the form role:hint, where : is defined in SEPARATOR_CHAR. - * - * @param role The name of the component - * @param roleHint The implementation hint of the component - * @return The list of components which are requiring given component - */ - List findRequirements(String role, String roleHint); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java deleted file mode 100644 index f2398fdc7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Thrown when component composition goes awry. - * - * @author Jason van Zyl - * @author Michal Maczka - */ -public class CycleDetectedInComponentGraphException extends Exception { - private static final long serialVersionUID = -5587124702588800322L; - - /** - * Construct a new CompositionException instance. - * - * @param message The detail message for this exception. - */ - public CycleDetectedInComponentGraphException(String message) { - super(message); - } - - /** - * Construct a new CompositionException instance. - * - * @param message The detail message for this exception. - * @param throwable the root cause of the exception - */ - public CycleDetectedInComponentGraphException(String message, Throwable throwable) { - super(message, throwable); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java deleted file mode 100644 index 9ed986ebd..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.component.repository.ComponentRequirementList; -import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.dag.CycleDetectedException; -import org.codehaus.plexus.util.dag.DAG; - -/** - * @author Jason van Zyl - * @author Michal Maczka - */ -public class DefaultCompositionResolver implements CompositionResolver { - private DAG dag = new DAG(); - - public void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException { - String key = getDAGKey(componentDescriptor.getRole(), componentDescriptor.getRoleHint()); - - List requirements = componentDescriptor.getRequirements(); - - for (ComponentRequirement requirement : requirements) { - try { - if (requirement instanceof ComponentRequirementList) { - for (String hint : ((ComponentRequirementList) requirement).getRoleHints()) { - dag.addEdge(key, getDAGKey(requirement.getRole(), hint)); - } - } else { - dag.addEdge(key, getDAGKey(requirement.getRole(), requirement.getRoleHint())); - } - } catch (CycleDetectedException e) { - throw new CycleDetectedInComponentGraphException("Cyclic requirement detected", e); - } - } - } - - /** - * @see org.codehaus.plexus.component.composition.CompositionResolver#getRequirements(String,String) - */ - public List getRequirements(String role, String roleHint) { - return dag.getChildLabels(getDAGKey(role, roleHint)); - } - - /** - * @see org.codehaus.plexus.component.composition.CompositionResolver#findRequirements(String,String) - */ - public List findRequirements(String role, String roleHint) { - return dag.getParentLabels(getDAGKey(role, roleHint)); - } - - private String getDAGKey(String role, String roleHint) { - return role - + SEPARATOR_CHAR - + (StringUtils.isNotEmpty(roleHint) ? roleHint : PlexusConstants.PLEXUS_DEFAULT_HINT); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java deleted file mode 100644 index bfd22a553..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Michal Maczka - */ -public class UndefinedComponentComposerException extends Exception { - public UndefinedComponentComposerException(String message) { - super(message); - } - - public UndefinedComponentComposerException(String message, Throwable cause) { - super(message, cause); - } - - public UndefinedComponentComposerException(Throwable cause) { - super(cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java deleted file mode 100644 index 320747827..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.codehaus.classworlds.ClassRealmAdapter; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.converters.lookup.DefaultConverterLookup; -import org.codehaus.plexus.component.configurator.expression.DefaultExpressionEvaluator; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Brett Porter - */ -public abstract class AbstractComponentConfigurator implements ComponentConfigurator { - /** - * This is being instantiated here because there are old component factories (beanshell) that directly access - * the converterLookup but do not yet state the ConverterLookup as a requirement in the component metadata. - * Once these are wired up as standard components properly then we won't have to instantiate the - * converter lookup here and we can let the container do it. - * - */ - protected ConverterLookup converterLookup = new DefaultConverterLookup(); - - public void configureComponent(Object component, PlexusConfiguration configuration, ClassRealm containerRealm) - throws ComponentConfigurationException { - configureComponent(component, configuration, new DefaultExpressionEvaluator(), containerRealm); - } - - public void configureComponent( - Object component, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ClassRealm containerRealm) - throws ComponentConfigurationException { - configureComponent(component, configuration, expressionEvaluator, containerRealm, null); - } - - public void configureComponent( - final Object component, - final PlexusConfiguration configuration, - final ExpressionEvaluator expressionEvaluator, - final ClassRealm containerRealm, - final ConfigurationListener listener) - throws ComponentConfigurationException { - // ---------------------------------------------------------------------------- - // For compatibility with old ComponentFactories that use old ClassWorlds - // ---------------------------------------------------------------------------- - - final org.codehaus.classworlds.ClassRealm cr = ClassRealmAdapter.getInstance(containerRealm); - - Method method; - - try { - try { - method = getClass() - .getMethod( - "configureComponent", - Object.class, - PlexusConfiguration.class, - ExpressionEvaluator.class, - org.codehaus.classworlds.ClassRealm.class, - ConfigurationListener.class); - method.invoke(this, component, configuration, expressionEvaluator, cr, listener); - } catch (final NoSuchMethodException e) { - method = getClass() - .getMethod( - "configureComponent", - Object.class, - PlexusConfiguration.class, - ExpressionEvaluator.class, - org.codehaus.classworlds.ClassRealm.class); - method.invoke(this, component, configuration, expressionEvaluator, cr); - } - } catch (final InvocationTargetException e) { - if (e.getCause() instanceof ComponentConfigurationException) { - throw (ComponentConfigurationException) e.getCause(); - } else if (e.getCause() instanceof RuntimeException) { - throw (RuntimeException) e.getCause(); - } else if (e.getCause() instanceof Error) { - throw (Error) e.getCause(); - } - throw new ComponentConfigurationException( - "Incompatible configurator " + getClass().getName(), e); - } catch (final Exception e) { - throw new ComponentConfigurationException( - "Incompatible configurator " + getClass().getName(), e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java deleted file mode 100644 index 671d4311a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.converters.composite.ObjectWithFieldsConverter; -import org.codehaus.plexus.component.configurator.converters.special.ClassRealmConverter; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Jason van Zyl - * @author Michal Maczka - */ -public class BasicComponentConfigurator extends AbstractComponentConfigurator { - public void configureComponent( - Object component, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ClassRealm containerRealm, - ConfigurationListener listener) - throws ComponentConfigurationException { - // ---------------------------------------------------------------------- - // We should probably take into consideration the realm that the component - // came from in order to load the correct classes. - // ---------------------------------------------------------------------- - - converterLookup.registerConverter(new ClassRealmConverter(containerRealm)); - - ObjectWithFieldsConverter converter = new ObjectWithFieldsConverter(); - - converter.processConfiguration( - converterLookup, component, containerRealm, configuration, expressionEvaluator, listener); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java deleted file mode 100644 index 3c5331f10..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ComponentConfigurationException extends Exception { - private PlexusConfiguration failedConfiguration; - - public ComponentConfigurationException(String message) { - super(message); - } - - public ComponentConfigurationException(String message, Throwable cause) { - super(message, cause); - } - - public ComponentConfigurationException(Throwable cause) { - super(cause); - } - - public ComponentConfigurationException(PlexusConfiguration failedConfiguration, String message) { - super(message); - this.failedConfiguration = failedConfiguration; - } - - public ComponentConfigurationException(PlexusConfiguration failedConfiguration, String message, Throwable cause) { - super(message, cause); - this.failedConfiguration = failedConfiguration; - } - - public ComponentConfigurationException(PlexusConfiguration failedConfiguration, Throwable cause) { - super(cause); - this.failedConfiguration = failedConfiguration; - } - - public void setFailedConfiguration(PlexusConfiguration failedConfiguration) { - this.failedConfiguration = failedConfiguration; - } - - public PlexusConfiguration getFailedConfiguration() { - return failedConfiguration; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java deleted file mode 100644 index 9e53e9de7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Jason van Zyl - */ -public interface ComponentConfigurator { - String ROLE = ComponentConfigurator.class.getName(); - - void configureComponent(Object component, PlexusConfiguration configuration, ClassRealm containerRealm) - throws ComponentConfigurationException; - - void configureComponent( - Object component, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ClassRealm containerRealm) - throws ComponentConfigurationException; - - void configureComponent( - Object component, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ClassRealm containerRealm, - ConfigurationListener listener) - throws ComponentConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java deleted file mode 100644 index 3a881122b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004-5, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * Listen for configuration changes on an object. - * - * @author Brett Porter - */ -public interface ConfigurationListener { - /** - * Notify the listener that a field has been set using its setter. - * @param fieldName the field - * @param value the value set - * @param target the target object - */ - void notifyFieldChangeUsingSetter(String fieldName, Object value, Object target); - - /** - * Notify the listener that a field has been set using private field injection. - * @param fieldName the field - * @param value the value set - * @param target the target object - */ - void notifyFieldChangeUsingReflection(String fieldName, Object value, Object target); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java deleted file mode 100644 index 547c3814f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -import java.util.Map; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.MapOrientedComponent; -import org.codehaus.plexus.component.configurator.converters.composite.MapConverter; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class MapOrientedComponentConfigurator extends AbstractComponentConfigurator { - - public void configureComponent( - Object component, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ClassRealm containerRealm, - ConfigurationListener listener) - throws ComponentConfigurationException { - if (!(component instanceof MapOrientedComponent)) { - throw new ComponentConfigurationException( - "This configurator can only process implementations of " + MapOrientedComponent.class.getName()); - } - - MapConverter converter = new MapConverter(); - - Map context = (Map) converter.fromConfiguration( - converterLookup, configuration, null, null, containerRealm, expressionEvaluator, listener); - - ((MapOrientedComponent) component).setComponentConfiguration(context); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java deleted file mode 100644 index 380bbb4d7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java +++ /dev/null @@ -1,183 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.util.StringUtils; - -/** - * @author Michal Maczka - */ -public abstract class AbstractConfigurationConverter implements ConfigurationConverter { - private static final String IMPLEMENTATION = "implementation"; - - /** - * We will check if user has provided a hint which class should be used for given field. - * So we will check if something like {@code } is present in configuraion. - * If 'implementation' hint was provided we will try to load correspoding class - * If we are unable to do so error will be reported - * @param type {@link Class}. - * @param configuration {@link PlexusConfiguration}. - * @param classLoader {@link ClassLoader}. - * @return The class. - * @throws ComponentConfigurationException in case of an error. - */ - protected Class getClassForImplementationHint( - Class type, PlexusConfiguration configuration, ClassLoader classLoader) - throws ComponentConfigurationException { - Class retValue = type; - - String implementation = configuration.getAttribute(IMPLEMENTATION, null); - - if (implementation != null) { - try { - retValue = classLoader.loadClass(implementation); - - } catch (ClassNotFoundException e) { - String msg = "ClassNotFoundException: Class name which was explicitly given in configuration using" - + " 'implementation' attribute: '" + implementation + "' cannot be loaded"; - - throw new ComponentConfigurationException(msg, e); - } catch (UnsupportedClassVersionError e) { - String msg = "UnsupportedClassVersionError: Class name which was explicitly given in configuration" - + " using 'implementation' attribute: '" + implementation + "' cannot be loaded"; - - throw new ComponentConfigurationException(msg, e); - } catch (LinkageError e) { - String msg = "LinkageError: Class name which was explicitly given in configuration using" - + " 'implementation' attribute: '" + implementation + "' cannot be loaded"; - - throw new ComponentConfigurationException(msg, e); - } - } - - return retValue; - } - - protected Class loadClass(String classname, ClassLoader classLoader) throws ComponentConfigurationException { - Class retValue; - - try { - retValue = classLoader.loadClass(classname); - } catch (ClassNotFoundException e) { - throw new ComponentConfigurationException("Error loading class '" + classname + "'", e); - } - - return retValue; - } - - protected Object instantiateObject(String classname, ClassLoader classLoader) - throws ComponentConfigurationException { - Class clazz = loadClass(classname, classLoader); - - return instantiateObject(clazz); - } - - protected Object instantiateObject(Class clazz) throws ComponentConfigurationException { - Object retValue; - - try { - retValue = clazz.newInstance(); - - return retValue; - } catch (IllegalAccessException e) { - throw new ComponentConfigurationException("Class '" + clazz.getName() + "' cannot be instantiated", e); - } catch (InstantiationException e) { - throw new ComponentConfigurationException("Class '" + clazz.getName() + "' cannot be instantiated", e); - } - } - - // first-name --> firstName - protected String fromXML(String elementName) { - return StringUtils.lowercaseFirstLetter(StringUtils.removeAndHump(elementName, "-")); - } - - // firstName --> first-name - protected String toXML(String fieldName) { - return StringUtils.addAndDeHump(fieldName); - } - - protected Object fromExpression( - PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator, Class type) - throws ComponentConfigurationException { - Object v = fromExpression(configuration, expressionEvaluator); - - if (v != null) { - if (!type.isAssignableFrom(v.getClass())) { - String msg = "Cannot assign configuration entry '" + configuration.getName() + "' to '" + type - + "' from '" + configuration.getValue(null) + "', which is of type " + v.getClass(); - throw new ComponentConfigurationException(configuration, msg); - } - } - return v; - } - - protected Object fromExpression(PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator) - throws ComponentConfigurationException { - Object v = null; - String value = configuration.getValue(null); - if (value != null && value.length() > 0) { - // Object is provided by an expression - // This seems a bit ugly... canConvert really should return false in this instance, but it doesn't have the - // configuration to know better - try { - v = expressionEvaluator.evaluate(value); - } catch (ExpressionEvaluationException e) { - String msg = "Error evaluating the expression '" + value + "' for configuration value '" - + configuration.getName() + "'"; - throw new ComponentConfigurationException(configuration, msg, e); - } - } - if (v == null) { - value = configuration.getAttribute("default-value", null); - if (value != null && value.length() > 0) { - try { - v = expressionEvaluator.evaluate(value); - } catch (ExpressionEvaluationException e) { - String msg = "Error evaluating the expression '" + value + "' for configuration value '" - + configuration.getName() + "'"; - throw new ComponentConfigurationException(configuration, msg, e); - } - } - } - return v; - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator) - throws ComponentConfigurationException { - return fromConfiguration( - converterLookup, configuration, type, baseType, classLoader, expressionEvaluator, null); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java deleted file mode 100644 index f448f0e80..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters; - -/* - * Copyright 2005-2007 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.util.ReflectionUtils; - -/** @author Kenney Westerhof */ -public class ComponentValueSetter { - private Object object; - - private String fieldName; - - private ConverterLookup lookup; - - private Method setter; - - private Class setterParamType; - - private ConfigurationConverter setterTypeConverter; - - private Field field; - - private Class fieldType; - - private ConfigurationConverter fieldTypeConverter; - - private ConfigurationListener listener; - - public ComponentValueSetter(String fieldName, Object object, ConverterLookup lookup) - throws ComponentConfigurationException { - this(fieldName, object, lookup, null); - } - - public ComponentValueSetter(String fieldName, Object object, ConverterLookup lookup, ConfigurationListener listener) - throws ComponentConfigurationException { - this.fieldName = fieldName; - this.object = object; - this.lookup = lookup; - this.listener = listener; - - if (object == null) { - throw new ComponentConfigurationException("Component is null"); - } - - initSetter(); - - initField(); - - if (setter == null && field == null) { - throw new ComponentConfigurationException( - "Cannot find setter nor field in " + object.getClass().getName() + " for '" + fieldName + "'"); - } - - if (setterTypeConverter == null && fieldTypeConverter == null) { - throw new ComponentConfigurationException("Cannot find converter for " + setterParamType.getName() - + (fieldType != null && !fieldType.equals(setterParamType) ? " or " + fieldType.getName() : "")); - } - } - - private void initSetter() { - setter = ReflectionUtils.getSetter(fieldName, object.getClass()); - - if (setter == null) { - return; - } - - setterParamType = setter.getParameterTypes()[0]; - - try { - setterTypeConverter = lookup.lookupConverterForType(setterParamType); - } catch (ComponentConfigurationException e) { - // ignore, handle later - } - } - - private void initField() { - field = ReflectionUtils.getFieldByNameIncludingSuperclasses(fieldName, object.getClass()); - - if (field == null) { - return; - } - - fieldType = field.getType(); - - try { - fieldTypeConverter = lookup.lookupConverterForType(fieldType); - } catch (ComponentConfigurationException e) { - // ignore, handle later - } - } - - private void setValueUsingField(Object value) throws ComponentConfigurationException { - try { - boolean wasAccessible = field.isAccessible(); - - if (!wasAccessible) { - field.setAccessible(true); - } - - if (listener != null) { - listener.notifyFieldChangeUsingReflection(fieldName, value, object); - } - - field.set(object, value); - - if (!wasAccessible) { - field.setAccessible(false); - } - } catch (IllegalAccessException e) { - throw new ComponentConfigurationException("Cannot access field: " + field, e); - } catch (IllegalArgumentException e) { - throw new ComponentConfigurationException( - "Cannot assign value '" + value + "' (type: " + value.getClass() + ") to " + field, e); - } - } - - private void setValueUsingSetter(Object value) throws ComponentConfigurationException { - if (setterParamType == null || setter == null) { - throw new ComponentConfigurationException("No setter found"); - } - - String exceptionInfo = object.getClass().getName() + "." + setter.getName() + "( " - + setterParamType.getClass().getName() + " )"; - - if (listener != null) { - listener.notifyFieldChangeUsingSetter(fieldName, value, object); - } - - try { - setter.invoke(object, new Object[] {value}); - } catch (IllegalAccessException e) { - throw new ComponentConfigurationException("Cannot access method: " + exceptionInfo, e); - } catch (IllegalArgumentException e) { - throw new ComponentConfigurationException( - "Invalid parameter supplied while setting '" + value + "' to " + exceptionInfo, e); - } catch (InvocationTargetException e) { - throw new ComponentConfigurationException( - "Setter " + exceptionInfo + " threw exception when called with parameter '" + value + "': " - + e.getTargetException().getMessage(), - e); - } - } - - public void configure(PlexusConfiguration config, ClassLoader classLoader, ExpressionEvaluator evaluator) - throws ComponentConfigurationException { - Object value = null; - - // try setter converter + method first - - if (setterTypeConverter != null) { - try { - value = setterTypeConverter.fromConfiguration( - lookup, config, setterParamType, object.getClass(), classLoader, evaluator, listener); - - if (value != null) { - setValueUsingSetter(value); - - return; - } - } catch (ComponentConfigurationException e) { - if (fieldTypeConverter == null - || fieldTypeConverter.getClass().equals(setterTypeConverter.getClass())) { - throw e; - } - } - } - - // try setting field using value found with method - // converter, if present. - - ComponentConfigurationException savedEx = null; - - if (value != null) { - try { - setValueUsingField(value); - return; - } catch (ComponentConfigurationException e) { - savedEx = e; - } - } - - // either no value or setting went wrong. Try - // new converter. - - value = fieldTypeConverter.fromConfiguration( - lookup, config, fieldType, object.getClass(), classLoader, evaluator, listener); - - if (value != null) { - setValueUsingField(value); - } - // FIXME: need this? - else if (savedEx != null) { - throw savedEx; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java deleted file mode 100644 index d161d026c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public interface ConfigurationConverter { - boolean canConvert(Class type); - - /** - * @param converterLookup Repository of available converters - * @param configuration {@link PlexusConfiguration} - * @param type the type of object to read - * @param baseType the type of object the the source is - * @param classLoader ClassLoader which should be used for loading classes - * @param expressionEvaluator the expression evaluator to use for expressions - * @return the object - * @throws ComponentConfigurationException in case of an error. - * TODO: a better way, instead of baseType, would be to pass in a factory for new classes that could be based from the given package - */ - Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator) - throws ComponentConfigurationException; - - /** - * @param converterLookup Repository of available converters - * @param configuration {@link PlexusConfiguration} - * @param type the type of object to read - * @param baseType the type of object the the source is - * @param classLoader ClassLoader which should be used for loading classes - * @param expressionEvaluator the expression evaluator to use for expressions - * @param listener {@link ConfigurationListener}. - * @return the object - * @throws ComponentConfigurationException in case of an error. - * TODO: a better way, instead of baseType, would be to pass in a factory for new classes that could be based from the given package - */ - Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java deleted file mode 100644 index 1bd7bcbe8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.component.configurator.expression.TypeAwareExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - */ -public abstract class AbstractBasicConverter extends AbstractConfigurationConverter { - protected abstract Object fromString(String str) throws ComponentConfigurationException; - - protected Object fromExpression( - PlexusConfiguration configuration, ExpressionEvaluator expressionEvaluator, Class type) - throws ComponentConfigurationException { - Object v = null; - - String value = configuration.getValue(null); - - if (value != null && value.length() > 0) { - // Object is provided by an expression - // This seems a bit ugly... canConvert really should return false in this instance, but it doesn't have the - // configuration to know better - try { - if (expressionEvaluator instanceof TypeAwareExpressionEvaluator) { - v = ((TypeAwareExpressionEvaluator) expressionEvaluator).evaluate(value, type); - } else { - v = expressionEvaluator.evaluate(value); - } - } catch (ExpressionEvaluationException e) { - String msg = "Error evaluating the expression '" + value + "' for configuration value '" - + configuration.getName() + "'"; - throw new ComponentConfigurationException(configuration, msg, e); - } - } - - if (v == null) { - value = configuration.getAttribute("default-value", null); - - if (value != null && value.length() > 0) { - try { - if (expressionEvaluator instanceof TypeAwareExpressionEvaluator) { - v = ((TypeAwareExpressionEvaluator) expressionEvaluator).evaluate(value, type); - } else { - v = expressionEvaluator.evaluate(value); - } - } catch (ExpressionEvaluationException e) { - String msg = "Error evaluating the expression '" + value + "' for configuration value '" - + configuration.getName() + "'"; - throw new ComponentConfigurationException(configuration, msg, e); - } - } - } - - /* - * NOTE: We don't check the type here which would be ugly to do correctly (e.g. value=Short -> type=int), the - * reflective setter/field injection will fail by itself when the type didn't match. - */ - - return v; - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - if (configuration.getChildCount() > 0) { - throw new ComponentConfigurationException("When configuring a basic element the configuration cannot " - + "contain any child elements. " + "Configuration element '" + configuration.getName() + "'."); - } - - Object retValue = fromExpression(configuration, expressionEvaluator, type); - - if (retValue instanceof String) { - try { - retValue = fromString((String) retValue); - } catch (ComponentConfigurationException e) { - if (e.getFailedConfiguration() == null) { - e.setFailedConfiguration(configuration); - } - - throw e; - } - } - - return retValue; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java deleted file mode 100644 index 7ac6aeb38..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class BooleanConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(boolean.class) || type.equals(Boolean.class); - } - - public Object fromString(String str) { - return str.equals("true") ? Boolean.TRUE : Boolean.FALSE; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java deleted file mode 100644 index da0fd57cc..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class ByteConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(byte.class) || type.equals(Byte.class); - } - - public Object fromString(String str) { - return (byte) Integer.parseInt(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java deleted file mode 100644 index 4d0af27c9..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class CharConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(char.class) || type.equals(Character.class); - } - - public Object fromString(String str) { - return str.charAt(0); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java deleted file mode 100644 index 77ae3b1ef..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; - -/** - * @author Brett Porter - */ -public class ClassConverter extends AbstractBasicConverter { - public boolean canConvert(Class type) { - return type.equals(Class.class); - } - - public Object fromString(String str) throws ComponentConfigurationException { - try { - return Class.forName(str); - } catch (ClassNotFoundException e) { - throw new ComponentConfigurationException("Unable to find class in conversion", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java deleted file mode 100644 index b5e61c328..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * Translates the String representation of a class into - * an instance of the class and vice versa - * - */ -public interface Converter { - boolean canConvert(Class type); - - /** - * Parses a given String and return - * - * @param str String representation of the class - * @return an instance of the class - */ - Object fromString(String str); - - String toString(Object obj); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java deleted file mode 100644 index 710b39da6..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class DateConverter extends AbstractBasicConverter { - /*** - * @todo DateFormat is not thread safe! - */ - private static final DateFormat[] formats = { - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S a"), new SimpleDateFormat("yyyy-MM-dd HH:mm:ssa") - }; - - public boolean canConvert(Class type) { - return type.equals(Date.class); - } - - public Object fromString(String str) { - for (DateFormat format : formats) { - try { - return format.parse(str); - } catch (ParseException e) { - // no worries, let's try the next format. - } - } - - return null; - } - - public String toString(Object obj) { - Date date = (Date) obj; - return formats[0].format(date); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java deleted file mode 100644 index 9037251e7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class DoubleConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(double.class) || type.equals(Double.class); - } - - public Object fromString(String str) { - return Double.valueOf(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java deleted file mode 100644 index b4d62381a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Benjamin Bentmann - */ -public class EnumConverter extends AbstractConfigurationConverter { - - public boolean canConvert(Class type) { - return type.isEnum(); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - if (configuration.getChildCount() > 0) { - throw new ComponentConfigurationException("When configuring a basic element the configuration cannot " - + "contain any child elements. " + "Configuration element '" + configuration.getName() + "'."); - } - - Object retValue = fromExpression(configuration, expressionEvaluator); - - if (retValue instanceof String) { - try { - retValue = Enum.valueOf(type, (String) retValue); - } catch (RuntimeException e) { - throw new ComponentConfigurationException( - "Cannot assign value " + retValue + " to property " + configuration.getName() + " of " - + baseType.getName() + ": " + e.getMessage(), - e); - } - } - - return retValue; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java deleted file mode 100644 index 69ebb4ddb..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.io.File; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Brett Porter - */ -public class FileConverter extends AbstractBasicConverter { - public boolean canConvert(Class type) { - return type.equals(File.class); - } - - public Object fromString(String str) { - str = str.replace('\\', File.separatorChar).replace('/', File.separatorChar); - return new File(str); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - File f = (File) super.fromConfiguration( - converterLookup, configuration, type, baseType, classLoader, expressionEvaluator, listener); - - if (f != null) { - // Hmmm... is this cheating? Can't think of a better way right now - return expressionEvaluator.alignToBaseDirectory(f); - } else { - return null; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java deleted file mode 100644 index 38db43779..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class FloatConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(float.class) || type.equals(Float.class); - } - - public Object fromString(String str) { - return Float.valueOf(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java deleted file mode 100644 index 19f422846..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class IntConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(int.class) || type.equals(Integer.class); - } - - public Object fromString(String str) throws ComponentConfigurationException { - try { - return Integer.valueOf(str); - } catch (NumberFormatException e) { - throw new ComponentConfigurationException("Not a number: '" + str + "'", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java deleted file mode 100644 index c549bc417..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class LongConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(long.class) || type.equals(Long.class); - } - - public Object fromString(String str) { - return Long.valueOf(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java deleted file mode 100644 index 6fba68c08..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class ShortConverter extends AbstractBasicConverter { - - public boolean canConvert(Class type) { - return type.equals(short.class) || type.equals(Short.class); - } - - public Object fromString(String str) { - return Short.valueOf(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java deleted file mode 100644 index 2a42198b5..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class StringBufferConverter extends AbstractBasicConverter { - public boolean canConvert(Class type) { - return type.equals(StringBuffer.class); - } - - public Object fromString(String str) { - return new StringBuffer(str); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java deleted file mode 100644 index 0a72a9834..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class StringConverter extends AbstractBasicConverter { - public boolean canConvert(Class type) { - return type.equals(String.class); - } - - public Object fromString(String str) { - return str; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java deleted file mode 100644 index 39b84143f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.codehaus.plexus.component.configurator.converters.basic; - -import java.net.URI; -import java.net.URISyntaxException; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; - -/** - * Converter for {@link URI} objects. - * - */ -public class UriConverter extends AbstractBasicConverter { - public boolean canConvert(final Class type) { - assert type != null; - - return type.equals(URI.class); - } - - public Object fromString(final String str) throws ComponentConfigurationException { - assert str != null; - - try { - return new URI(str); - } catch (URISyntaxException e) { - throw new ComponentConfigurationException("Unable to convert to URI: " + str, e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java deleted file mode 100644 index 05ef952c8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.basic; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.net.MalformedURLException; -import java.net.URL; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; - -/** - * @author Brett Porter - */ -public class UrlConverter extends AbstractBasicConverter { - public boolean canConvert(Class type) { - return type.equals(URL.class); - } - - public Object fromString(String str) throws ComponentConfigurationException { - try { - return new URL(str); - } catch (MalformedURLException e) { - throw new ComponentConfigurationException("Unable to convert '" + str + "' to an URL", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java deleted file mode 100644 index aded3b09c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java +++ /dev/null @@ -1,134 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.util.StringUtils; - -/** - * @author Kenney Westerhof - */ -public class ArrayConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - return type.isArray(); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - Object retValue = fromExpression(configuration, expressionEvaluator, type); - if (retValue != null) { - return retValue; - } - - List values = new ArrayList(); - - for (int i = 0; i < configuration.getChildCount(); i++) { - PlexusConfiguration childConfiguration = configuration.getChild(i); - - String configEntry = childConfiguration.getName(); - - String name = fromXML(configEntry); - - Class childType = getClassForImplementationHint(null, childConfiguration, classLoader); - - // check if the name is a fully qualified classname - - if (childType == null && name.indexOf('.') > 0) { - try { - childType = classLoader.loadClass(name); - } catch (ClassNotFoundException e) { - // doesn't exist - continue processing - } - } - - if (childType == null) { - // try to find the class in the package of the baseType - // (which is the component being configured) - - String baseTypeName = baseType.getName(); - - int lastDot = baseTypeName.lastIndexOf('.'); - - String className; - - if (lastDot == -1) { - className = name; - } else { - String basePackage = baseTypeName.substring(0, lastDot); - className = basePackage + "." + StringUtils.capitalizeFirstLetter(name); - } - - try { - childType = classLoader.loadClass(className); - } catch (ClassNotFoundException e) { - // doesn't exist, continue processing - } - } - - // finally just try the component type of the array - - if (childType == null) { - childType = type.getComponentType(); - } - - ConfigurationConverter converter = converterLookup.lookupConverterForType(childType); - - Object object = converter.fromConfiguration( - converterLookup, - childConfiguration, - childType, - baseType, - classLoader, - expressionEvaluator, - listener); - - values.add(object); - } - - try { - return values.toArray((Object[]) Array.newInstance(type.getComponentType(), 0)); - } catch (ArrayStoreException e) { - throw new ComponentConfigurationException("Cannot assign configuration values to array of type " - + type.getComponentType().getName() + ": " + values); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java deleted file mode 100644 index 46a6bc003..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.util.StringUtils; - -/** - * @author Michal Maczka - */ -public class CollectionConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - return Collection.class.isAssignableFrom(type) && !Map.class.isAssignableFrom(type); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - Object retValue = fromExpression(configuration, expressionEvaluator, type); - if (retValue != null) { - return retValue; - } - - Class implementation = getClassForImplementationHint(null, configuration, classLoader); - - if (implementation != null) { - retValue = instantiateObject(implementation); - } else { - // we can have 2 cases here: - // - provided collection class which is not abstract - // like Vector, ArrayList, HashSet - so we will just instantantiate it - // - we have an abtract class so we have to use default collection type - int modifiers = type.getModifiers(); - - if (Modifier.isAbstract(modifiers)) { - retValue = getDefaultCollection(type); - } else { - try { - retValue = type.newInstance(); - } catch (IllegalAccessException e) { - String msg = "An attempt to convert configuration entry " + configuration.getName() + "' into " - + type + " object failed: " + e.getMessage(); - - throw new ComponentConfigurationException(msg, e); - } catch (InstantiationException e) { - String msg = "An attempt to convert configuration entry " + configuration.getName() + "' into " - + type + " object failed: " + e.getMessage(); - - throw new ComponentConfigurationException(msg, e); - } - } - } - // now we have collection and we have to add some objects to it - - for (int i = 0; i < configuration.getChildCount(); i++) { - PlexusConfiguration c = configuration.getChild(i); - // Object o = null; - - String configEntry = c.getName(); - - String name = fromXML(configEntry); - - Class childType = getClassForImplementationHint(null, c, classLoader); - - if (childType == null && name.indexOf('.') > 0) { - try { - childType = classLoader.loadClass(name); - } catch (ClassNotFoundException e) { - // not found, continue processing - } - } - - if (childType == null) { - // Some classloaders don't create Package objects for classes - // so we have to resort to slicing up the class name - - String baseTypeName = baseType.getName(); - - int lastDot = baseTypeName.lastIndexOf('.'); - - String className; - - if (lastDot == -1) { - className = name; - } else { - String basePackage = baseTypeName.substring(0, lastDot); - - className = basePackage + "." + StringUtils.capitalizeFirstLetter(name); - } - - try { - childType = classLoader.loadClass(className); - } catch (ClassNotFoundException e) { - if (c.getChildCount() == 0) { - // If no children, try a String. - // TODO: If we had generics we could try that instead - or could the component descriptor list - // an impl? - childType = String.class; - } else { - throw new ComponentConfigurationException("Error loading class '" + className + "'", e); - } - } - } - - ConfigurationConverter converter = converterLookup.lookupConverterForType(childType); - - Object object = converter.fromConfiguration( - converterLookup, c, childType, baseType, classLoader, expressionEvaluator, listener); - - Collection collection = (Collection) retValue; - collection.add(object); - } - - return retValue; - } - - protected Collection getDefaultCollection(Class collectionType) { - Collection retValue = null; - - if (List.class.isAssignableFrom(collectionType)) { - retValue = new ArrayList(); - } else if (SortedSet.class.isAssignableFrom(collectionType)) { - retValue = new TreeSet(); - } else if (Set.class.isAssignableFrom(collectionType)) { - retValue = new HashSet(); - } - - return retValue; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java deleted file mode 100644 index d5cebe3ed..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * Converter for java.util.Properties. - * - * @author Michal Maczka - */ -public class MapConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - return Map.class.isAssignableFrom(type) && !Properties.class.isAssignableFrom(type); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - Object retValue; - - String expression = configuration.getValue(null); - - if (expression == null) { - expression = configuration.getAttribute("default-value", null); - } - - if (expression == null) { - Map map = new TreeMap(); - - PlexusConfiguration[] children = configuration.getChildren(); - - for (PlexusConfiguration child : children) { - String name = child.getName(); - - map.put(name, fromExpression(child, expressionEvaluator)); - } - retValue = map; - } else { - retValue = fromExpression(configuration, expressionEvaluator); - } - return retValue; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java deleted file mode 100644 index 5d4bb6964..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Collection; -import java.util.Dictionary; -import java.util.Map; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.ComponentValueSetter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Michal Maczka - */ -public class ObjectWithFieldsConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - boolean retValue = true; - - if (Dictionary.class.isAssignableFrom(type)) { - retValue = false; - } else if (Map.class.isAssignableFrom(type)) { - retValue = false; - } else if (Collection.class.isAssignableFrom(type)) { - retValue = false; - } - - return retValue; - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - Object retValue = fromExpression(configuration, expressionEvaluator, type); - - if (retValue == null) { - try { - // it is a "composite" - we compose it from its children. It does not have a value of its own - Class implementation = getClassForImplementationHint(type, configuration, classLoader); - - if (type == implementation && type.isInterface() && configuration.getChildCount() <= 0) { - return null; - } - - retValue = instantiateObject(implementation); - - processConfiguration( - converterLookup, retValue, classLoader, configuration, expressionEvaluator, listener); - } catch (ComponentConfigurationException e) { - if (e.getFailedConfiguration() == null) { - e.setFailedConfiguration(configuration); - } - - throw e; - } - } - return retValue; - } - - public void processConfiguration( - ConverterLookup converterLookup, Object object, ClassLoader classLoader, PlexusConfiguration configuration) - throws ComponentConfigurationException { - processConfiguration(converterLookup, object, classLoader, configuration, null); - } - - public void processConfiguration( - ConverterLookup converterLookup, - Object object, - ClassLoader classLoader, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator) - throws ComponentConfigurationException { - processConfiguration(converterLookup, object, classLoader, configuration, expressionEvaluator, null); - } - - public void processConfiguration( - ConverterLookup converterLookup, - Object object, - ClassLoader classLoader, - PlexusConfiguration configuration, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - int items = configuration.getChildCount(); - - for (int i = 0; i < items; i++) { - PlexusConfiguration childConfiguration = configuration.getChild(i); - - String elementName = childConfiguration.getName(); - - ComponentValueSetter valueSetter = - new ComponentValueSetter(fromXML(elementName), object, converterLookup, listener); - - valueSetter.configure(childConfiguration, classLoader, expressionEvaluator); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java deleted file mode 100644 index d8723994f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * Converter for org.codehaus.plexus.configuration.PlexusConfiguration - * - * @author Michal Maczka - */ -public class PlexusConfigurationConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - return PlexusConfiguration.class.isAssignableFrom(type); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - return configuration; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java deleted file mode 100644 index b6a6463a1..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.composite; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Properties; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * Converter for java.util.Properties. - * - * @author Michal Maczka - */ -public class PropertiesConverter extends AbstractConfigurationConverter { - public boolean canConvert(Class type) { - return Properties.class.isAssignableFrom(type); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - - Object retValueInterpolated = fromExpression(configuration, expressionEvaluator, type); - if (retValueInterpolated != null) { - return retValueInterpolated; - } - - String element = configuration.getName(); - - Properties retValue = new Properties(); - - PlexusConfiguration[] children = configuration.getChildren("property"); - - if (children != null && children.length > 0) { - for (PlexusConfiguration child : children) { - addEntry(retValue, element, child, expressionEvaluator); - } - } - - return retValue; - } - - private void addEntry( - Properties properties, - String element, - PlexusConfiguration property, - ExpressionEvaluator expressionEvaluator) - throws ComponentConfigurationException { - Object name = fromExpression(property.getChild("name"), expressionEvaluator); - - if (name == null) { - String msg = "Trying to convert the configuration element: '" + element - + "', missing child element 'name' for property."; - - throw new ComponentConfigurationException(msg); - } - - Object value = fromExpression(property.getChild("value"), expressionEvaluator); - - if (value == null) { - properties.setProperty(name.toString(), ""); - } else { - properties.setProperty(name.toString(), value.toString()); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java deleted file mode 100644 index 2696d75bc..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.lookup; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; - -/** @version $Id$ */ -public interface ConverterLookup { - void registerConverter(ConfigurationConverter converter); - - ConfigurationConverter lookupConverterForType(Class type) throws ComponentConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java deleted file mode 100644 index e8afde898..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java +++ /dev/null @@ -1,158 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.lookup; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.basic.BooleanConverter; -import org.codehaus.plexus.component.configurator.converters.basic.ByteConverter; -import org.codehaus.plexus.component.configurator.converters.basic.CharConverter; -import org.codehaus.plexus.component.configurator.converters.basic.DateConverter; -import org.codehaus.plexus.component.configurator.converters.basic.DoubleConverter; -import org.codehaus.plexus.component.configurator.converters.basic.EnumConverter; -import org.codehaus.plexus.component.configurator.converters.basic.FileConverter; -import org.codehaus.plexus.component.configurator.converters.basic.FloatConverter; -import org.codehaus.plexus.component.configurator.converters.basic.IntConverter; -import org.codehaus.plexus.component.configurator.converters.basic.LongConverter; -import org.codehaus.plexus.component.configurator.converters.basic.ShortConverter; -import org.codehaus.plexus.component.configurator.converters.basic.StringBufferConverter; -import org.codehaus.plexus.component.configurator.converters.basic.StringConverter; -import org.codehaus.plexus.component.configurator.converters.basic.UriConverter; -import org.codehaus.plexus.component.configurator.converters.basic.UrlConverter; -import org.codehaus.plexus.component.configurator.converters.composite.ArrayConverter; -import org.codehaus.plexus.component.configurator.converters.composite.CollectionConverter; -import org.codehaus.plexus.component.configurator.converters.composite.MapConverter; -import org.codehaus.plexus.component.configurator.converters.composite.ObjectWithFieldsConverter; -import org.codehaus.plexus.component.configurator.converters.composite.PlexusConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.composite.PropertiesConverter; - -public class DefaultConverterLookup implements ConverterLookup { - private final List converters = new ArrayList(); - - private final List customConverters = new CopyOnWriteArrayList(); - - private final Map, ConfigurationConverter> converterMap = - new ConcurrentHashMap, ConfigurationConverter>(); - - public DefaultConverterLookup() { - registerDefaultBasicConverters(); - - registerDefaultCompositeConverters(); - } - - public synchronized void registerConverter(ConfigurationConverter converter) { - customConverters.add(converter); - } - - protected void registerDefaultConverter(ConfigurationConverter converter) { - converters.add(converter); - } - - public ConfigurationConverter lookupConverterForType(Class type) throws ComponentConfigurationException { - ConfigurationConverter retValue = converterMap.get(type); - - if (retValue == null) { - if (customConverters != null) { - retValue = findConverterForType(customConverters, type); - } - - if (retValue == null) { - retValue = findConverterForType(converters, type); - } - - if (retValue == null) { - // this is highly irregular - throw new ComponentConfigurationException("Configuration converter lookup failed for type: " + type); - } - - converterMap.put(type, retValue); - } - - return retValue; - } - - private ConfigurationConverter findConverterForType(List converters, Class type) { - for (ConfigurationConverter converter : converters) { - if (converter.canConvert(type)) { - return converter; - } - } - - return null; - } - - private void registerDefaultBasicConverters() { - registerDefaultConverter(new BooleanConverter()); - - registerDefaultConverter(new ByteConverter()); - - registerDefaultConverter(new CharConverter()); - - registerDefaultConverter(new DoubleConverter()); - - registerDefaultConverter(new FloatConverter()); - - registerDefaultConverter(new IntConverter()); - - registerDefaultConverter(new LongConverter()); - - registerDefaultConverter(new ShortConverter()); - - registerDefaultConverter(new StringBufferConverter()); - - registerDefaultConverter(new StringConverter()); - - registerDefaultConverter(new DateConverter()); - - registerDefaultConverter(new FileConverter()); - - registerDefaultConverter(new UrlConverter()); - - registerDefaultConverter(new UriConverter()); - - registerDefaultConverter(new EnumConverter()); - } - - private void registerDefaultCompositeConverters() { - registerDefaultConverter(new MapConverter()); - - registerDefaultConverter(new ArrayConverter()); - - registerDefaultConverter(new CollectionConverter()); - - registerDefaultConverter(new PropertiesConverter()); - - registerDefaultConverter(new PlexusConfigurationConverter()); - - // this converter should be always registred as the last one - registerDefaultConverter(new ObjectWithFieldsConverter()); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java deleted file mode 100644 index 9c2c2cdae..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.codehaus.plexus.component.configurator.converters.special; - -import org.codehaus.classworlds.ClassRealmAdapter; -import org.codehaus.classworlds.ClassRealmReverseAdapter; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ConfigurationListener; -import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.ConfigurationConverter; -import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * ConfigurationConverter to set up ClassRealm component fields. - * - * @author Kenney Westerhof - */ -public class ClassRealmConverter extends AbstractConfigurationConverter { - public static final String ROLE = ConfigurationConverter.class.getName(); - - private ClassRealm classRealm; - - /** - * Constructs this ClassRealmConverter with the given ClassRealm. - * If there's a way to automatically configure this component - * using the current classrealm, this method can go away. - * - * @param classRealm {@link ClassRealm}. - */ - public ClassRealmConverter(ClassRealm classRealm) { - setClassRealm(classRealm); - } - - @Deprecated - public ClassRealmConverter(final org.codehaus.classworlds.ClassRealm classRealm) { - setClassRealm(classRealm); - } - - public void setClassRealm(final ClassRealm classRealm) { - this.classRealm = classRealm; - } - - @Deprecated - public void setClassRealm(final org.codehaus.classworlds.ClassRealm classRealm) { - if (classRealm.getClassLoader() instanceof ClassRealm) { - setClassRealm((ClassRealm) classRealm.getClassLoader()); - } else { - setClassRealm(ClassRealmReverseAdapter.getInstance(classRealm)); - } - } - - public boolean canConvert(Class type) { - // backwards compatibility for old ClassWorld fields - return org.codehaus.classworlds.ClassRealm.class.isAssignableFrom(type) - || ClassRealm.class.isAssignableFrom(type); - } - - public Object fromConfiguration( - ConverterLookup converterLookup, - PlexusConfiguration configuration, - Class type, - Class baseType, - ClassLoader classLoader, - ExpressionEvaluator expressionEvaluator, - ConfigurationListener listener) - throws ComponentConfigurationException { - Object retValue = fromExpression(configuration, expressionEvaluator, type); - - if (retValue == null) { - retValue = classRealm; - } - - // backwards compatibility for old ClassWorld fields - if (retValue instanceof ClassRealm && org.codehaus.classworlds.ClassRealm.class.isAssignableFrom(type)) { - retValue = ClassRealmAdapter.getInstance((ClassRealm) retValue); - } - - return retValue; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java deleted file mode 100644 index f6fed31de..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.component.configurator.expression; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; - -/** - * Evaluate an expression. - * - * @author Brett Porter - */ -public class DefaultExpressionEvaluator implements ExpressionEvaluator { - /** - * Evaluate an expression. - * - * @param expression the expression - * @return the value of the expression - */ - public Object evaluate(String expression) { - return expression; - } - - public File alignToBaseDirectory(File file) { - return file; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java deleted file mode 100644 index 78b7ca313..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.component.configurator.expression; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that occurs during the evaluation of an expression. - * - * @author Brett Porter - */ -public class ExpressionEvaluationException extends Exception { - public ExpressionEvaluationException(String message) { - super(message); - } - - public ExpressionEvaluationException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java deleted file mode 100644 index f14d96937..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.codehaus.plexus.component.configurator.expression; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; - -/** - * Evaluate an expression. - * - * @author Brett Porter - */ -public interface ExpressionEvaluator { - String ROLE = ExpressionEvaluator.class.getName(); - - /** - * Evaluate an expression. - * - * @param expression the expression - * @return the value of the expression - * @throws ExpressionEvaluationException in case of an error. - */ - Object evaluate(String expression) throws ExpressionEvaluationException; - - /** - * Align a given path to the base directory that can be evaluated by this expression evaluator, if known. - * - * @param file the file - * @return the aligned file - */ - File alignToBaseDirectory(File file); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java deleted file mode 100644 index 871999c6a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.codehaus.plexus.component.configurator.expression; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Evaluate an expression. - * - * @author Brett Porter - */ -public interface TypeAwareExpressionEvaluator extends ExpressionEvaluator { - - /** - * Evaluate an expression. The optional type provided to this method is a hint (not a requirement) for the evaluator - * to resolve the expression to a compatible value. The evaluator is not expected to perform any conversion but - * rather filter out incompatible values from its result. - * - * @param expression the expression - * @param type The expected type of expression result, may be {@code null}. - * @return the value of the expression - * @throws ExpressionEvaluationException in case of an error. - */ - Object evaluate(String expression, Class type) throws ExpressionEvaluationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java deleted file mode 100644 index 71f75a009..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.Reader; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextMapAdapter; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.InterpolationFilterReader; -import org.codehaus.plexus.util.ReaderFactory; - -// TODO: this should be a default strategy of searching through classloaders. a discoverer should really not have to be -// concerned finding a particular resource and how to turn it into a set of component descriptors. - -/** - * @author Jason van Zyl - */ -public abstract class AbstractResourceBasedComponentDiscoverer implements ComponentDiscoverer { - protected abstract String getComponentDescriptorLocation(); - - protected abstract ComponentSetDescriptor createComponentDescriptors(Reader reader, String source, ClassRealm realm) - throws PlexusConfigurationException; - - public List findComponents(Context context, ClassRealm realm) - throws PlexusConfigurationException { - List componentSetDescriptors = new ArrayList(); - - Enumeration resources; - - try { - resources = realm.getResources(getComponentDescriptorLocation()); - } catch (IOException e) { - throw new PlexusConfigurationException("Unable to retrieve resources for: " - + getComponentDescriptorLocation() + " in class realm: " + realm.getId()); - } - - for (URL url : Collections.list(resources)) { - Reader reader = null; - - try { - URLConnection conn = url.openConnection(); - - conn.setUseCaches(false); - - conn.connect(); - - reader = ReaderFactory.newXmlReader(conn.getInputStream()); - - InterpolationFilterReader interpolationFilterReader = - new InterpolationFilterReader(reader, new ContextMapAdapter(context)); - - ComponentSetDescriptor componentSetDescriptor = - createComponentDescriptors(interpolationFilterReader, url.toString(), realm); - - componentSetDescriptors.add(componentSetDescriptor); - } catch (IOException ex) { - throw new PlexusConfigurationException("Error reading configuration " + url, ex); - } finally { - IOUtil.close(reader); - } - } - - return componentSetDescriptors; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java deleted file mode 100644 index 3b0230685..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/** - * Component discoverer which relies on annotation information to define component definitions. - * - * @author jvanzyl - */ -public interface AnnotationBasedComponentDiscoverer extends ComponentDiscoverer {} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java deleted file mode 100644 index f3c63e1bb..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.context.Context; - -/** - * @author Jason van Zyl - */ -public interface ComponentDiscoverer { - List findComponents(Context context, ClassRealm classRealm) - throws PlexusConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java deleted file mode 100644 index c4a72eb02..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -/** - * ComponentDiscovererManager is a simple index (registry) of ComponentDiscovers and ComponentDiscoveryListener. - */ -public interface ComponentDiscovererManager { - void addComponentDiscoverer(ComponentDiscoverer componentDiscoverer); - - List getComponentDiscoverers(); - - // todo dain change this to Set (requires change to maven) - Map getComponentDiscoveryListeners(); - - void registerComponentDiscoveryListener(ComponentDiscoveryListener listener); - - void removeComponentDiscoveryListener(ComponentDiscoveryListener listener); - - void fireComponentDiscoveryEvent(ComponentDiscoveryEvent event); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java deleted file mode 100644 index a47ce3f12..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; - -/** - * Signals to a ComponentDiscoveryListener that an event has taken place - * involving a set of components. It is up to the Listener to decide what - * to do with that information. - */ -public class ComponentDiscoveryEvent { - private ComponentSetDescriptor componentSetDescriptor; - - private Object data; - - /** - * Constructs a ComponentDiscoveryEvent with a set of - * ComponentDescriptors. - * @param componentSetDescriptor a set of ComponentDescriptors - */ - public ComponentDiscoveryEvent(ComponentSetDescriptor componentSetDescriptor) { - this.componentSetDescriptor = componentSetDescriptor; - } - - public ComponentDiscoveryEvent(ComponentSetDescriptor componentSetDescriptor, Object data) { - this.componentSetDescriptor = componentSetDescriptor; - this.data = data; - } - - /** - * Returns this event's set of ComponentDescriptors. - * @return this event's set of ComponentDescriptors - */ - public ComponentSetDescriptor getComponentSetDescriptor() { - return componentSetDescriptor; - } - - public Object getData() { - return data; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java deleted file mode 100644 index 02ce760ae..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * A listener which responds in some way to component discovery by a PlexusContainer. - */ -public interface ComponentDiscoveryListener { - /** - * Signals to this listener that a component has been discovered. - * @param event the event that signals what components have been discovered - */ - void componentDiscovered(ComponentDiscoveryEvent event); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java deleted file mode 100644 index 40a040825..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.Reader; -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.component.repository.io.PlexusTools; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; - -/** - * @author Jason van Zyl - */ -public class DefaultComponentDiscoverer extends AbstractResourceBasedComponentDiscoverer { - public String getComponentDescriptorLocation() { - return "META-INF/plexus/components.xml"; - } - - public ComponentSetDescriptor createComponentDescriptors( - Reader componentDescriptorReader, String source, ClassRealm realm) throws PlexusConfigurationException { - PlexusConfiguration componentDescriptorConfiguration = - PlexusTools.buildConfiguration(source, componentDescriptorReader); - - ComponentSetDescriptor componentSetDescriptor = new ComponentSetDescriptor(); - - List> componentDescriptors = new ArrayList>(); - - PlexusConfiguration[] componentConfigurations = - componentDescriptorConfiguration.getChild("components").getChildren("component"); - - for (PlexusConfiguration componentConfiguration : componentConfigurations) { - ComponentDescriptor componentDescriptor; - try { - componentDescriptor = PlexusTools.buildComponentDescriptor(componentConfiguration, realm); - } catch (PlexusConfigurationException e) { - // This is not the most accurate of exceptions as the only real case where this exception - // will be thrown is when the implementation class of the component sited cannot be loaded. - // In the case where role and implementation classes do not exist then we just shouldn't - // create the component descriptor. All information should be taken from annotations which - // will be correct, so in the case we can't load the class it must be coming from and older - // hand written descriptor which is incorrect. - - continue; - } - - componentDescriptor.setSource(source); - - componentDescriptor.setComponentType("plexus"); - - componentDescriptor.setComponentSetDescriptor(componentSetDescriptor); - - componentDescriptors.add(componentDescriptor); - } - - componentSetDescriptor.setComponents(componentDescriptors); - - componentSetDescriptor.setSource(source); - - return componentSetDescriptor; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java deleted file mode 100644 index 6ed22f80d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class DefaultComponentDiscovererManager implements ComponentDiscovererManager { - private final List componentDiscoverers = new ArrayList(); - - // todo dain change this to LinkedHashSet (requires change to maven) - private final Map listeners = - new LinkedHashMap(); - - public synchronized void addComponentDiscoverer(ComponentDiscoverer discoverer) { - componentDiscoverers.add(discoverer); - } - - // todo this is not thread safe... we are returning the raw collection - public synchronized List getComponentDiscoverers() { - return componentDiscoverers; - } - - // Listeners - - // todo this is not thread safe... we are returning the raw collection - public synchronized Map getComponentDiscoveryListeners() { - return listeners; - } - - public synchronized void registerComponentDiscoveryListener(ComponentDiscoveryListener listener) { - if (!listeners.containsKey(listener)) { - listeners.put(listener, new Object()); - } - } - - public synchronized void removeComponentDiscoveryListener(ComponentDiscoveryListener listener) { - listeners.remove(listener); - } - - public void fireComponentDiscoveryEvent(ComponentDiscoveryEvent event) { - Set listeners; - synchronized (this) { - listeners = this.listeners.keySet(); - } - - for (ComponentDiscoveryListener listener : listeners) { - listener.componentDiscovered(event); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java deleted file mode 100644 index a2e7135e5..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * - */ -public class DiscoveryListenerDescriptor { - private String role; - - private String roleHint; - - public String getRole() { - return role; - } - - public String getRoleHint() { - return roleHint; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java deleted file mode 100644 index e812c0d00..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -import java.io.Reader; -import java.util.Arrays; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.component.repository.io.PlexusTools; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; - -public class PlexusXmlComponentDiscoverer extends AbstractResourceBasedComponentDiscoverer { - public String getComponentDescriptorLocation() { - return "META-INF/plexus/plexus.xml"; - } - - @Override - protected ComponentSetDescriptor createComponentDescriptors(Reader reader, String source, ClassRealm realm) - throws PlexusConfigurationException { - ComponentSetDescriptor componentSetDescriptor = new ComponentSetDescriptor(); - - PlexusConfiguration configuration = PlexusTools.buildConfiguration(source, reader); - - if (configuration != null) { - PlexusConfiguration[] componentConfigurations = - configuration.getChild("components").getChildren("component"); - - for (PlexusConfiguration componentConfiguration : componentConfigurations) { - ComponentDescriptor componentDescriptor; - - try { - componentDescriptor = PlexusTools.buildComponentDescriptor(componentConfiguration, realm); - - if (componentDescriptor == null) { - continue; - } - } catch (PlexusConfigurationException e) { - throw new PlexusConfigurationException( - "Cannot build component descriptor from resource found in:\n" - + Arrays.asList(realm.getURLs()), - e); - } - - componentDescriptor.setComponentType("plexus"); - - componentDescriptor.setComponentSetDescriptor(componentSetDescriptor); - - componentSetDescriptor.addComponentDescriptor(componentDescriptor); - } - } - - return componentSetDescriptor; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java deleted file mode 100644 index 02edfb1fa..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/** - * Component discoverer which relies on the metadata for the components residing in a resource that - * can be found in a classloader. - * - * @author jvanzyl - */ -public interface ResourceBasedComponentDiscoverer extends ComponentDiscoverer { - String getComponentDescriptorLocation(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java deleted file mode 100644 index 68bce9d94..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.classworlds.ClassRealmAdapter; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** - * - * - * @author Jason van Zyl - * - */ -public abstract class AbstractComponentFactory implements ComponentFactory { - // This is for backward compatibility - private String id; - - public Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException { - // for backward-compatibility with the old component factories delegate to the old-style method - return newInstance(componentDescriptor, ClassRealmAdapter.getInstance(classRealm), container); - } - - protected Object newInstance( - ComponentDescriptor componentDescriptor, - org.codehaus.classworlds.ClassRealm classRealm, - PlexusContainer container) - throws ComponentInstantiationException { - throw new IllegalStateException(getClass().getName() + " does not implement component creation."); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java deleted file mode 100644 index d4545b9a8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** A ServiceFactory is responsible for instantiating a component. - * - * @author Jason van Zyl - * @author Michal Maczka - * - * @version $Id$ - */ -public interface ComponentFactory { - /** Component role. */ - static String ROLE = ComponentFactory.class.getName(); - - String getId(); - - Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java deleted file mode 100644 index 7f6a36add..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentFactoryManager { - ComponentFactory findComponentFactory(String id) throws UndefinedComponentFactoryException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java deleted file mode 100644 index a226a160f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Michal Maczka - * - */ -public class ComponentInstantiationException extends Exception { - public ComponentInstantiationException(String message) { - super(message); - } - - public ComponentInstantiationException(String message, Throwable cause) { - super(message, cause); - } - - public ComponentInstantiationException(Throwable cause) { - super(cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java deleted file mode 100644 index 5db9fc347..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.factory.java.JavaComponentFactory; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; - -/** - * @author Jason van Zyl - */ -public class DefaultComponentFactoryManager implements ComponentFactoryManager, Contextualizable { - private ComponentFactory defaultComponentFactory = new JavaComponentFactory(); - - private PlexusContainer container; - - public ComponentFactory findComponentFactory(String id) throws UndefinedComponentFactoryException { - if (id == null || id.equals("java")) { - return defaultComponentFactory; - } - - try { - return container.lookup(ComponentFactory.class, id); - } catch (ComponentLookupException e) { - throw new UndefinedComponentFactoryException("Specified component factory cannot be found: " + id); - } - } - - public void contextualize(Context context) throws ContextException { - container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java deleted file mode 100644 index a1b50e748..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class UndefinedComponentFactoryException extends Exception { - public UndefinedComponentFactoryException(String message) { - super(message); - } - - public UndefinedComponentFactoryException(String message, Throwable cause) { - super(message, cause); - } - - public UndefinedComponentFactoryException(Throwable cause) { - super(cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java deleted file mode 100644 index 82250064d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.codehaus.plexus.component.factory.java; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.lang.reflect.Modifier; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.factory.AbstractComponentFactory; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** - * Component Factory for components written in Java Language which have default no parameter constructor - * - * @author Jason van Zyl - * @author Michal Maczka - */ -public class JavaComponentFactory extends AbstractComponentFactory { - public String getId() { - return "java"; - } - - public Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException { - Class implementationClass = null; - - try { - String implementation = componentDescriptor.getImplementation(); - - implementationClass = classRealm.loadClass(implementation); - - int modifiers = implementationClass.getModifiers(); - - if (Modifier.isInterface(modifiers)) { - throw new ComponentInstantiationException( - "Cannot instantiate implementation '" + implementation + "' because the class is a interface."); - } - - if (Modifier.isAbstract(modifiers)) { - throw new ComponentInstantiationException( - "Cannot instantiate implementation '" + implementation + "' because the class is abstract."); - } - - Object instance = implementationClass.newInstance(); - - return instance; - } catch (InstantiationException e) { - // PLXAPI: most probably cause of this is the implementation class not having - // a default constructor. - throw makeException(classRealm, componentDescriptor, implementationClass, e); - } catch (ClassNotFoundException e) { - throw makeException(classRealm, componentDescriptor, implementationClass, e); - } catch (IllegalAccessException e) { - throw makeException(classRealm, componentDescriptor, implementationClass, e); - } catch (LinkageError e) { - throw makeException(classRealm, componentDescriptor, implementationClass, e); - } - } - - private ComponentInstantiationException makeException( - ClassRealm componentClassRealm, - ComponentDescriptor componentDescriptor, - Class implementationClass, - Throwable e) { - // ---------------------------------------------------------------------- - // Display the realm when there is an error, We should probably return a string here so we - // can incorporate this into the error message for easy debugging. - // ---------------------------------------------------------------------- - - String msg; - - if (componentClassRealm == null) { - msg = "classRealm is null for " + componentDescriptor; - } else { - msg = "Could not instantiate component: " + componentDescriptor.getHumanReadableKey() + " realm: " - + componentClassRealm.getId(); - } - - return new ComponentInstantiationException(msg, e); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java deleted file mode 100644 index 381a8ab6d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.builder.AbstractComponentBuildListener; -import org.codehaus.plexus.component.builder.ComponentBuilder; -import org.codehaus.plexus.component.builder.XBeanComponentBuilder; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -public abstract class AbstractComponentManager implements ComponentManager { - protected final MutablePlexusContainer container; - - private final ClassRealm realm; - - protected final ComponentDescriptor componentDescriptor; - - private final Class type; - - private final String role; - - private final String roleHint; - - protected final ComponentBuilder builder = new XBeanComponentBuilder(this); - - private final LifecycleHandler lifecycleHandler; - - /** - * Contains a mapping from singleton instances to the realms - * they were used to configure with. This realm will be used to - * call all lifecycle methods. - * This will define a synchronized map, make sure to synchronize the map when iterating. - */ - protected final Map componentContextRealms = - Collections.synchronizedMap(new HashMap()); - - private int connections; - - private long startId; - - public AbstractComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint) { - if (container == null) { - throw new NullPointerException("container is null"); - } - this.container = container; - - if (lifecycleHandler == null) { - throw new NullPointerException("lifecycleHandler is null"); - } - this.lifecycleHandler = lifecycleHandler; - - if (componentDescriptor == null) { - throw new NullPointerException("componentDescriptor is null"); - } - this.componentDescriptor = componentDescriptor; - - if (role == null) { - throw new NullPointerException("role is null"); - } - this.role = role; - - if (roleHint == null) { - throw new NullPointerException("roleHint is null"); - } - this.roleHint = roleHint; - - this.realm = componentDescriptor.getRealm(); - - this.type = componentDescriptor.getImplementationClass(); - } - - public ComponentDescriptor getComponentDescriptor() { - return componentDescriptor; - } - - public Class getType() { - return type; - } - - public ClassRealm getRealm() { - return realm; - } - - public String getRole() { - return role; - } - - public String getRoleHint() { - return roleHint; - } - - public LifecycleHandler getLifecycleHandler() { - return lifecycleHandler; - } - - protected void incrementConnectionCount() { - connections++; - } - - protected void decrementConnectionCount() { - connections--; - } - - protected boolean connected() { - return connections > 0; - } - - public int getConnections() { - return connections; - } - - // ---------------------------------------------------------------------- - // Lifecylce Management - // ---------------------------------------------------------------------- - - public void start(Object component) throws PhaseExecutionException { - startId = NEXT_START_ID.getAndIncrement(); - getLifecycleHandler().start(component, this, componentDescriptor.getRealm()); - } - - /** - * @deprecated for internal use only.. will be removed - */ - public long getStartId() { - return startId; - } - - protected T createComponentInstance() throws ComponentInstantiationException, ComponentLifecycleException { - return builder.build(componentDescriptor, realm, new AbstractComponentBuildListener() { - public void componentCreated( - ComponentDescriptor componentDescriptor, Object component, ClassRealm realm) { - componentContextRealms.put(component, realm); - } - }); - } - - protected void endComponentLifecycle(Object component) throws ComponentLifecycleException { - ClassRealm contextRealm = componentContextRealms.remove(component); - if (contextRealm == null) { - contextRealm = container.getLookupRealm(component); - } - - try { - getLifecycleHandler().end(component, this, contextRealm); - } catch (PhaseExecutionException e) { - throw new ComponentLifecycleException("Error ending component lifecycle", e); - } - } - - public MutablePlexusContainer getContainer() { - return container; - } - - public Logger getLogger() { - return container.getLogger(); - } - - public void dissociateComponentRealm(ClassRealm realm) throws ComponentLifecycleException { - synchronized (componentContextRealms) { - for (Iterator> iterator = - componentContextRealms.entrySet().iterator(); - iterator.hasNext(); ) { - Entry entry = iterator.next(); - ClassRealm componentRealm = entry.getValue(); - - if (componentRealm.getId().equals(realm.getId())) { - iterator.remove(); - } - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java deleted file mode 100644 index c79ca59bd..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.concurrent.atomic.AtomicLong; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -/** - * Manages a component manager. - * Determines when a component is shutdown, and when it's started up. Each - * manager deals with only one component class, though may handle multiple - * instances of this class. - * - * @author Jason van Zyl - * - */ -public interface ComponentManager { - String ROLE = ComponentManager.class.getName(); - - /** - * @deprecated for internal use only.. will be removed - */ - AtomicLong NEXT_START_ID = new AtomicLong(1); - - int getConnections(); - - /** - * @return {@link LifecycleHandler}. - * @deprecated use start instead - */ - LifecycleHandler getLifecycleHandler(); - - void dispose() throws ComponentLifecycleException; - - void release(Object component) throws ComponentLifecycleException; - - T getComponent() throws ComponentInstantiationException, ComponentLifecycleException; - - ComponentDescriptor getComponentDescriptor(); - - Class getType(); - - String getRole(); - - String getRoleHint(); - - MutablePlexusContainer getContainer(); - - void dissociateComponentRealm(ClassRealm realm) throws ComponentLifecycleException; - - ClassRealm getRealm(); - - void start(Object component) throws PhaseExecutionException; - - /** - * @return The start id. - * @deprecated for internal use only.. will be removed - */ - long getStartId(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java deleted file mode 100644 index ae8aaf05f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.component.manager; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.lifecycle.LifecycleHandler; - -public interface ComponentManagerFactory { - /** - * Gets the unique identifier of this ComponentManagerFactory. This id is the instantiation strategy specified - * in a component descriptor. - * @return the unique identifier and instantiation strategy name - */ - String getId(); - - /** - * Creates a new component manager for the specified component descriptor. - * @param container {@link MutablePlexusContainer}. - * @param lifecycleHandler {@link LifecycleHandler}. - * @param componentDescriptor {@link ComponentDescriptor} - * @param role The role. - * @param roleHint The hint for the role. - * @param The type. - * @return {@link ComponentManager} - */ - ComponentManager createComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java deleted file mode 100644 index 1abd43c08..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.lifecycle.LifecycleHandler; - -/** - * Creates a new component manager for every lookup - * - * @author Jason van Zyl - * - */ -public class PerLookupComponentManager extends AbstractComponentManager { - public PerLookupComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint) { - super(container, lifecycleHandler, componentDescriptor, role, roleHint); - } - - public void dispose() {} - - public T getComponent() throws ComponentInstantiationException, ComponentLifecycleException { - T component = createComponentInstance(); - - return component; - } - - public void release(Object component) throws ComponentLifecycleException { - decrementConnectionCount(); - endComponentLifecycle(component); - // non cleanup map references for per-lookup cause leak - componentContextRealms.remove(component); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java deleted file mode 100644 index 414a5f0e0..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.component.manager; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.lifecycle.LifecycleHandler; - -public class PerLookupComponentManagerFactory implements ComponentManagerFactory { - public String getId() { - return "per-lookup"; - } - - @SuppressWarnings({"RawUseOfParameterizedType"}) - public ComponentManager createComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint) { - return new PerLookupComponentManager(container, lifecycleHandler, componentDescriptor, role, roleHint); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java deleted file mode 100644 index e0ff6c2a8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.lifecycle.LifecycleHandler; - -/** - * This ensures a component is only used as a singleton, and is only shutdown when the container - * shuts down. - * - * @author Jason van Zyl - */ -public class SingletonComponentManager extends AbstractComponentManager { - private T singleton; - - public SingletonComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint) { - super(container, lifecycleHandler, componentDescriptor, role, roleHint); - } - - public synchronized void release(Object component) throws ComponentLifecycleException { - if (singleton == component) { - dispose(); - } - } - - public synchronized void dispose() throws ComponentLifecycleException { - if (singleton != null) { - endComponentLifecycle(singleton); - singleton = null; - } - } - - public synchronized T getComponent() throws ComponentInstantiationException, ComponentLifecycleException { - if (singleton == null) { - singleton = createComponentInstance(); - } - - incrementConnectionCount(); - - return singleton; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java deleted file mode 100644 index 60c12f239..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.component.manager; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.lifecycle.LifecycleHandler; - -public class SingletonComponentManagerFactory implements ComponentManagerFactory { - public String getId() { - return "singleton"; - } - - @SuppressWarnings({"RawUseOfParameterizedType"}) - public ComponentManager createComponentManager( - MutablePlexusContainer container, - LifecycleHandler lifecycleHandler, - ComponentDescriptor componentDescriptor, - String role, - String roleHint) { - return new SingletonComponentManager(container, lifecycleHandler, componentDescriptor, role, roleHint); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java deleted file mode 100644 index b91f2499f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - */ -public class UndefinedComponentManagerException extends Exception { - public UndefinedComponentManagerException(String message) { - super(message); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java deleted file mode 100644 index e440ba371..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This represents a project which this component depends upon to function - * properly, for example, a required jar file. See Apache Maven for an - * example of a dependency in action. - * - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public class ComponentDependency { - private static final String DEAULT_DEPENDENCY_TYPE = "jar"; - - private String groupId; - - private String artifactId; - - private String type = DEAULT_DEPENDENCY_TYPE; - - private String version; - - /** - * Gets a key for an artifact, which is an alias for a specific - * project timeline in a group. - * @return a key for an artifact - */ - public String getArtifactId() { - return artifactId; - } - - /** - * Sets the dependency's artifact ID. - * @param artifactId the artifact ID - */ - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - /** - * Gets a key for a group, which represents a set of artifacts timelines. - * @return a key for a group - */ - public String getGroupId() { - return groupId; - } - - /** - * Sets the dependency's group ID. - * @param groupId the group ID - */ - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - /** - * Gets the type of dependency, for example a "jar". - * @return the type of dependency - */ - public String getType() { - return type; - } - - /** - * Sets the dependency project's type. - * @param type the dependency's type - */ - public void setType(String type) { - this.type = type; - } - - /** - * Returns a specific point in a project's timeline. - * i.e. version 1, or 2.1.4 - * @return a specific point in a project's timeline - */ - public String getVersion() { - return version; - } - - /** - * Sets the point in a project's development timeline - * @param version the project's version - */ - public void setVersion(String version) { - this.version = version; - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - - sb.append("groupId = ") - .append(groupId) - .append(", artifactId = ") - .append(artifactId) - .append(", version = ") - .append(version) - .append(", type = ") - .append(type); - - return sb.toString(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java deleted file mode 100644 index 2f4eb096a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java +++ /dev/null @@ -1,628 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * Component instantiation description. - * - * @author Jason van Zyl - * @author bob mcwhirter - * @author Michal Maczka - */ -public class ComponentDescriptor { - private String alias = null; - - private String role = null; - - private Class roleClass; - - private String roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT; - - private String implementation; - - private Class implementationClass; - - private String version; - - private String componentType; - - private PlexusConfiguration configuration; - - private String instantiationStrategy; - - private String lifecycleHandler; - - private String componentProfile; - - private final List requirements = new ArrayList(); - - private String componentFactory; - - private String componentComposer; - - private String componentConfigurator; - - private String description; - - private ClassRealm realm; - - // ---------------------------------------------------------------------- - // These two fields allow for the specification of an isolated class realm - // and dependencies that might be specified in a component configuration - // setup by a user i.e. this is here to allow isolation for components - // that are not picked up by the discovery mechanism. - // ---------------------------------------------------------------------- - - private boolean isolatedRealm; - - // ---------------------------------------------------------------------- - - private ComponentSetDescriptor componentSetDescriptor; - - private String source; - - // ---------------------------------------------------------------------- - // Instance methods - // ---------------------------------------------------------------------- - - public ComponentDescriptor() {} - - public ComponentDescriptor(Class implementationClass, ClassRealm realm) { - this.implementationClass = implementationClass; - this.implementation = implementationClass.getName(); - this.realm = realm; - } - - /** - * The location this information came from (descriptor file URI). - * @param source The source of the descriptor. - */ - public void setSource(String source) { - this.source = source; - } - - /** - * The location this information came from (descriptor file URI). - * @return The source. - */ - public String getSource() { - return source; - } - - /** - * Returns a human-friendly key, suitable for display. - * - * @return a human-friendly key - */ - public String getHumanReadableKey() { - StringBuilder key = new StringBuilder(); - - key.append("role: '").append(getRole()).append("'"); - - key.append(", implementation: '").append(getImplementation()).append("'"); - - if (roleHint != null) { - key.append(", role hint: '").append(getRoleHint()).append("'"); - } - - if (alias != null) { - key.append(", alias: '").append(getAlias()).append("'"); - } - - return key.toString(); - } - - /** - * Returns an alias for this component. An alias as an alternate name other than the normal key. - * - * @return an alias for this component - */ - public String getAlias() { - return alias; - } - - /** - * Sets the alias for this component. - * - * @param alias alternate name to set - */ - public void setAlias(String alias) { - this.alias = alias; - } - - /** - * Returns the role of this component. - * - * @return the role of this component - */ - public String getRole() { - return role; - } - - public Class getRoleClass() { - attemptRoleLoad(); - - if (roleClass == null) { - return (Class) Object.class; - } - return (Class) roleClass; - } - - private void attemptRoleLoad() { - if (roleClass == null && getRole() != null && getRealm() != null) { - try { - roleClass = (Class) getRealm().loadClass(getRole()); - Thread.currentThread(); - } catch (Throwable ignored) { - Thread.currentThread(); - } - } - } - - /** - * Sets the role of this component. - * - * @param role this component's role - */ - public void setRole(String role) { - this.role = role; - - // reload role class - roleClass = null; - attemptRoleLoad(); - } - - public void setRoleClass(Class roleClass) { - this.roleClass = roleClass; - - if (roleClass == null) { - role = null; - } else { - role = roleClass.getName(); - } - } - - /** - * Returns the role-hint of this component. - * - * @return the role-hint of this component - */ - public String getRoleHint() { - return roleHint; - } - - /** - * Sets the role-hint of this component. Pasing null will set the hint to the default value. - * - * @param roleHint this component's role-hint - */ - public void setRoleHint(String roleHint) { - if ((roleHint == null) || roleHint.trim().equals("")) { - this.roleHint = PlexusConstants.PLEXUS_DEFAULT_HINT; - } else { - this.roleHint = roleHint; - } - } - - /** - * Returns the implementation of this componet. Implementation is a string denoting a FQCN in normal Java - * components, or some other name or file for other component factory implementations. - * - * @return the implementation of this componet's role. - */ - public String getImplementation() { - return implementation; - } - - /** - * Sets the implementation of this componet. - * - * @param implementation string denoting a FQCN in normal Java components, or some other name or file for other - * component factory implementations - */ - public void setImplementation(String implementation) { - this.implementation = implementation; - - // reload implementation class - implementationClass = null; - attemptImplementationLoad(); - } - - /** - * Returns the implementation class of this componet, or null if the implementation class can not be loaded. - * - * @return the implementation of this componet's role. - */ - public Class getImplementationClass() { - attemptImplementationLoad(); - - if (implementationClass == null) { - return (Class) Object.class; - } - return (Class) implementationClass; - } - - private void attemptImplementationLoad() { - if (implementationClass == null && getImplementation() != null && getRealm() != null) { - try { - implementationClass = (Class) getRealm().loadClass(getImplementation()); - Thread.currentThread(); - } catch (Throwable ignored) { - Thread.currentThread(); - } - } - } - - public void setImplementationClass(Class implementationClass) { - this.implementationClass = implementationClass; - if (implementationClass == null) { - implementation = null; - } else { - implementation = implementationClass.getName(); - } - } - - /** - * Returns a specific point in a components's project timeline. i.e. version 1, or 2.1.4 - * - * @return a specific point in a components's project timeline - */ - public String getVersion() { - return version; - } - - /** - * Sets the point in a components's project development timeline - * - * @param version the components's version - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * Returns the type of this component. - * - * @return the type of this component - */ - public String getComponentType() { - return componentType; - } - - /** - * Sets this component's type. - * - * @param componentType the type to set - */ - public void setComponentType(String componentType) { - this.componentType = componentType; - } - - /** - * Returns the type of instantiation strategy for this component. - * - * @return the type of instantiation strategy for this component - */ - public String getInstantiationStrategy() { - return instantiationStrategy; - } - - /** - * Returns configuration values defined for this component. - * - * @return configuration values defined for this component - */ - public PlexusConfiguration getConfiguration() { - return configuration; - } - - /** - * Sets the configuration hierarchy for this component. - * - * @param configuration the configuration hierarchy to set - */ - public void setConfiguration(PlexusConfiguration configuration) { - this.configuration = configuration; - } - - /** - * Returns true if this component has a configuration. - * - * @return true if this component has a configuration - */ - public boolean hasConfiguration() { - return configuration != null; - } - - /** - * Returns the lifecycle-handler for this component. - * - * @return the lifecycle-handler for this component - */ - public String getLifecycleHandler() { - return lifecycleHandler; - } - - /** - * Sets the lifecycle-handler for this component. For example, "basic", "passive", "bootstrap". - * - * @param lifecycleHandler the lifecycle handler string to set - */ - public void setLifecycleHandler(String lifecycleHandler) { - this.lifecycleHandler = lifecycleHandler; - } - - public String getComponentProfile() { - return componentProfile; - } - - public void setComponentProfile(String componentProfile) { - this.componentProfile = componentProfile; - } - - /** - * Add a project requirement to this component. - * - * @param requirement the requirement to add - */ - public void addRequirement(ComponentRequirement requirement) { - this.requirements.add(requirement); - } - - /** - * Add a project requirement to this component. - * - * @param requirement the requirement to add - */ - public void addRequirement(ComponentRequirement... requirement) { - this.requirements.addAll(Arrays.asList(requirement)); - } - - /** - * Adds a list of requirements to this component. - * - * @param requirements the requirements to add - */ - public void addRequirements(List requirements) { - this.requirements.addAll(requirements); - } - - /** - * Remove a project requirement from this component. - * - * @param requirement the requirement to remove - */ - public void removeRequirement(ComponentRequirement... requirement) { - this.requirements.removeAll(Arrays.asList(requirement)); - } - - /** - * Removes a list of requirements from this component. - * - * @param requirements the requirements to remove - */ - public void removeRequirements(List requirements) { - this.requirements.removeAll(requirements); - } - - /** - * Returns all project requirements of this component. - * - * @return all project requirements of this component - */ - public List getRequirements() { - return Collections.unmodifiableList(requirements); - } - - /** - * Returns an id of the factory used to create this component. - * - * @return an id of the factory used to create this component - */ - public String getComponentFactory() { - return componentFactory; - } - - /** - * Sets the id of the factory to use to create this component. For example, "jruby" will use a JRuby factory. - * - * @param componentFactory The componentFactor. - */ - public void setComponentFactory(String componentFactory) { - this.componentFactory = componentFactory; - } - - /** - * Returns the ID of the type of composer this component will use. For example, "setter" or "field" for the - * different types of dependency injection. - * - * @return the ID of the type of composer this component will use - */ - public String getComponentComposer() { - return componentComposer; - } - - /** - * Sets a representation of the composer this component uses. - * - * @param componentComposer string representation of the composer to use - */ - public void setComponentComposer(String componentComposer) { - this.componentComposer = componentComposer; - } - - /** - * Return a human-readable description of this component. - * - * @return a human-readable description of this component - */ - public String getDescription() { - return description; - } - - /** - * Sets a description of this component for users to read. - * - * @param description a human-readable description of this component - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * Sets the instantiation-strategy for this component. For example, "container". - * - * @param instantiationStrategy The strategy. - */ - public void setInstantiationStrategy(String instantiationStrategy) { - this.instantiationStrategy = instantiationStrategy; - } - - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- - - /** - * Returns true if this may be in an isolated classrealm. - * - * @return true if this may be in an isolated classrealm - */ - public boolean isIsolatedRealm() { - return isolatedRealm; - } - - /** - * Sets the component set descriptor of components and dependencies for this component. - * - * @param componentSetDescriptor the component set descriptor of components and dependencies - */ - public void setComponentSetDescriptor(ComponentSetDescriptor componentSetDescriptor) { - this.componentSetDescriptor = componentSetDescriptor; - } - - /** - * Returns the component set descriptor. - * - * @return the component set descriptor - */ - public ComponentSetDescriptor getComponentSetDescriptor() { - return componentSetDescriptor; - } - - /** - * Sets that this component may be in an isolated classrealm. - * - * @param isolatedRealm true if this component may be in an isolated classrealm - */ - public void setIsolatedRealm(boolean isolatedRealm) { - this.isolatedRealm = isolatedRealm; - } - - /** - * Returns the type of component configurator for this project. For example "basic" for normal, or "map-oriented" - * for map oriented components. - * - * @return the type of component configurator for this project - */ - public String getComponentConfigurator() { - return componentConfigurator; - } - - /** - * Sets the type of component configurator for this project. - * - * @param componentConfigurator The component configurator. - */ - public void setComponentConfigurator(String componentConfigurator) { - this.componentConfigurator = componentConfigurator; - } - - /** - * The ClassRealm that this component lives under. - * - * @return ClassRealm that this component lives under - */ - public ClassRealm getRealm() { - return realm; - } - - /** - * Set the ClassRealm that this component lives under. - * - * @param realm the ClassRealm that this component lives under - */ - public void setRealm(ClassRealm realm) { - this.realm = realm; - - // reload implementation class - implementationClass = null; - attemptImplementationLoad(); - - // reload role class - roleClass = null; - attemptRoleLoad(); - } - - public String toString() { - return getClass().getName() + " [role: '" + getRole() + "', hint: '" + getRoleHint() + "', realm: " - + (realm == null ? "NULL" : "'" + realm + "'") + "]"; - } - - // Component identity established here! - public boolean equals(Object other) { - if (this == other) { - return true; - } - - if (!(other instanceof ComponentDescriptor)) { - return false; - } - - ComponentDescriptor that = (ComponentDescriptor) other; - - return eq(getRole(), that.getRole()) - && eq(getRoleHint(), that.getRoleHint()) - && eq(getRealm(), that.getRealm()); - } - - private static boolean eq(T o1, T o2) { - return (o1 != null) ? o1.equals(o2) : o2 == null; - } - - public int hashCode() { - int hash = 17; - - hash = hash * 31 + hash(getRole()); - hash = hash * 31 + hash(getRoleHint()); - hash = hash * 31 + hash(getRealm()); - - return hash; - } - - private static int hash(Object obj) { - return (obj != null) ? obj.hashCode() : 0; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java deleted file mode 100644 index ca735ebaa..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; - -public interface ComponentRepository { - void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException; - - ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint); - - @Deprecated - ComponentDescriptor getComponentDescriptor(String role, String roleHint, ClassRealm realm); - - Map> getComponentDescriptorMap(Class type, String role); - - List> getComponentDescriptorList(Class type, String role); - - void removeComponentRealm(ClassRealm classRealm); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java deleted file mode 100644 index aa6a10dd8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java +++ /dev/null @@ -1,167 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This represents a component this is required by another component. - * - * @author Michal Maczka - */ -public class ComponentRequirement { - private String role; - - private String roleHint = ""; - - private String fieldName; - - private String fieldMappingType; - - private boolean optional; - - /** - * Returns the field name that this component requirement will inject. - * @return the field name that this component requirement will inject - */ - public String getFieldName() { - return fieldName; - } - - /** - * Sets the name of the field that will be populated by the required - * component. - * @param fieldName the name of the field to be populated - */ - public void setFieldName(String fieldName) { - this.fieldName = fieldName; - } - - /** - * Returns the role of the required component. - * @return the role of the required component - */ - public String getRole() { - return role; - } - - /** - * Sets the role of the require component. - * @param role the required component's role - */ - public void setRole(String role) { - this.role = role; - } - - /** - * Returns the role-hint of the required component. - * @return the role-hint of the required component - */ - public String getRoleHint() { - return roleHint; - } - - /** - * Sets the role-hint of the require component. - * Passing null or an empty string will match any available implementation. - * @param roleHint the required component's role-hint - */ - public void setRoleHint(String roleHint) { - this.roleHint = (roleHint != null) ? roleHint : ""; - } - - /** - * Returns the type of the field this component requirement will inject. - * @return the type of the field this component requirement will inject - */ - public String getFieldMappingType() { - return fieldMappingType; - } - - /** - * Sets the type of the field that will be populated by the required - * component. - * @param fieldType the type of the field to be populated - */ - public void setFieldMappingType(String fieldType) { - this.fieldMappingType = fieldType; - } - - /** - * Whether this component requirement is optional and needs not be satisfied - * - * @return {@code true} if the requested component may be missing, {@code false} if the component is mandatory. - * @since 1.3.0 - */ - public boolean isOptional() { - return optional; - } - - /** - * Controls whether a failure to satisfy this requirement can be tolerated by host component or whether construction - * of the host component should also fail. - * - * @param optional {@code true} if the requested component may be missing, {@code false} if the component is - * mandatory. - * @since 1.3.0 - */ - public void setOptional(boolean optional) { - this.optional = optional; - } - - public String toString() { - return "ComponentRequirement{" + "role='" - + getRole() + "'" + ", " + "roleHint='" - + getRoleHint() + "', " + "fieldName='" - + getFieldName() + "'" + "}"; - } - - /** - * Returns a human-friendly key, suitable for display. - * @return a human-friendly key - */ - public String getHumanReadableKey() { - StringBuilder key = new StringBuilder(); - - key.append("role: '").append(getRole()).append("'"); - - if (getRoleHint() != null) { - key.append(", role-hint: '").append(getRoleHint()).append("'. "); - } - - if (getFieldName() != null) { - key.append(", field name: '").append(getFieldName()).append("' "); - } - - return key.toString(); - } - - public boolean equals(Object other) { - if (other instanceof ComponentRequirement) { - String myId = role + ":" + roleHint; - - ComponentRequirement req = (ComponentRequirement) other; - String otherId = req.role + ":" + req.roleHint; - - return myId.equals(otherId); - } - - return false; - } - - public int hashCode() { - return (role + ":" + roleHint).hashCode(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java deleted file mode 100644 index 288a1f766..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.component.repository; - -import java.util.List; - -/** - * Created by IntelliJ IDEA. - * - * @author Andrew Williams - * @since 1.0 - */ -public class ComponentRequirementList extends ComponentRequirement { - private List roleHints; - - public List getRoleHints() { - return roleHints; - } - - public void setRoleHints(List roleHints) { - this.roleHints = roleHints; - } - - public String getRoleHint() { - StringBuilder buffer = new StringBuilder(); - for (String hint : roleHints) { - if (buffer.length() > 0) { - buffer.append(","); - } - - buffer.append(hint); - } - - return buffer.toString(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java deleted file mode 100644 index 53c21455b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.List; - -/** - * Contains a set of ComponentDescriptors and the set's dependencies. - * - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public class ComponentSetDescriptor { - // This field is not currently used in Maven, or Plexus - private String id; - - /** The source location of this component source descriptor */ - private String source; - - /** Flag to indicate whether this component should be loaded in a realm/classloader of its own. */ - private boolean isolatedRealm; - - /** The component descriptors that can be found within this component set descriptor. */ - private final List> components = new ArrayList>(); - - /** The dependencies that are required by the set of components found in this component set descriptor. */ - private final List dependencies = new ArrayList(); - - /** - * Returns a list of components in this set. - * @return a list of components - */ - public List> getComponents() { - return components; - } - - /** - * Add a new ComponentDescriptor to this set. - * @param cd the ComponentDescriptor to add - */ - public void addComponentDescriptor(ComponentDescriptor cd) { - components.add(cd); - } - - /** - * Sets a List of components as this set's contents. - * @param components the List of components to set - */ - public void setComponents(List> components) { - this.components.clear(); - this.components.addAll(components); - } - - /** - * Returns a List of dependencies of this set of components. - * @return a List of dependencies of this set of components - */ - public List getDependencies() { - return dependencies; - } - - /** - * Add a depenency to this set's contents. - * @param cd the ComponentDependency to add - */ - public void addDependency(ComponentDependency cd) { - dependencies.add(cd); - } - - /** - * Sets a List of dependencies as this set's component dependencies. - * @param dependencies the List of components to set - */ - public void setDependencies(List dependencies) { - this.dependencies.clear(); - this.dependencies.addAll(dependencies); - } - - /** - * Sets that this set of components may be in an isolated classrealm. - * @param isolatedRealm true if this set of components may be in an - * isolated classrealm - */ - public void setIsolatedRealm(boolean isolatedRealm) { - this.isolatedRealm = isolatedRealm; - } - - /** - * Returns true if this set may be in an isolated classrealm. - * @return true if this set may be in an isolated classrealm - */ - public boolean isIsolatedRealm() { - return isolatedRealm; - } - - /** - * Returns the identifier of this set. - * @return the identifier of this set - */ - public String getId() { - return id; - } - - /** - * Sets the identifier of this set. - * @param id the identifier to set - */ - public void setId(String id) { - this.id = id; - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - - sb.append("Component Descriptor: "); - - for (ComponentDescriptor cd : components) { - sb.append(cd.getHumanReadableKey()).append("\n"); - } - - sb.append("---"); - - return sb.toString(); - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java deleted file mode 100644 index 44e0e1106..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java +++ /dev/null @@ -1,215 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; - -import org.codehaus.plexus.ClassRealmUtil; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.composition.CompositionResolver; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.composition.DefaultCompositionResolver; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.util.StringUtils; - -import static org.codehaus.plexus.component.CastUtils.isAssignableFrom; - -/** - * @author Jason van Zyl - */ -public class DefaultComponentRepository extends AbstractLogEnabled implements ComponentRepository { - private final Map>>>> index = - new LinkedHashMap>>>>(); - - private final CompositionResolver compositionResolver = new DefaultCompositionResolver(); - - public DefaultComponentRepository() {} - - // ---------------------------------------------------------------------- - // Accessors - // ---------------------------------------------------------------------- - - private Map>> getComponentDescriptors(String role) { - // verify arguments - if (role == null) { - throw new NullPointerException("role is null"); - } - - // determine realms to search - Set realms = ClassRealmUtil.getContextRealms(null); - if (realms.isEmpty()) { - realms.addAll(index.keySet()); - } - - // Get all valid component descriptors - Map>> roleHintIndex = - new LinkedHashMap>>(); - for (ClassRealm realm : realms) { - SortedMap>>> roleIndex = index.get(realm); - if (roleIndex != null) { - Map>> descriptors = roleIndex.get(role); - if (descriptors != null) { - for (Entry>> descriptor : descriptors.entrySet()) { - Set> componentDescriptors = roleHintIndex.get(descriptor.getKey()); - if (componentDescriptors == null) { - componentDescriptors = new LinkedHashSet>(); - roleHintIndex.put(descriptor.getKey(), componentDescriptors); - } - componentDescriptors.addAll(descriptor.getValue()); - } - } - } - } - return Collections.unmodifiableMap(roleHintIndex); - } - - public ComponentDescriptor getComponentDescriptor(Class type, String role, String roleHint) { - Map>> roleHintIndex = getComponentDescriptors(role); - - Collection> descriptors; - - if (StringUtils.isNotEmpty(roleHint)) { - // specific role hint -> get only those - descriptors = roleHintIndex.get(roleHint); - } else { - // missing role hint -> get all (wildcard) - Collection> allDescriptors = new ArrayList>(); - - descriptors = roleHintIndex.get(PlexusConstants.PLEXUS_DEFAULT_HINT); - if (descriptors != null) { - allDescriptors.addAll(descriptors); - } - - for (String hint : roleHintIndex.keySet()) { - descriptors = roleHintIndex.get(hint); - if (descriptors != null) { - allDescriptors.addAll(descriptors); - } - } - - descriptors = allDescriptors; - } - - if (descriptors != null) { - for (ComponentDescriptor descriptor : descriptors) { - Class implClass = descriptor.getImplementationClass(); - if (isAssignableFrom(type, implClass) || Object.class == implClass && role.equals(type.getName())) { - return (ComponentDescriptor) descriptor; - } - } - } - - return null; - } - - public Map> getComponentDescriptorMap(Class type, String role) { - Map> descriptors = new TreeMap>(); - for (Set> componentDescriptors : - getComponentDescriptors(role).values()) { - for (ComponentDescriptor descriptor : componentDescriptors) { - if (!descriptors.containsKey(descriptor.getRoleHint()) - && isAssignableFrom(type, descriptor.getImplementationClass())) { - descriptors.put(descriptor.getRoleHint(), (ComponentDescriptor) descriptor); - } - } - } - return descriptors; - } - - public List> getComponentDescriptorList(Class type, String role) { - List> descriptors = new ArrayList>(); - for (Set> componentDescriptors : - getComponentDescriptors(role).values()) { - for (ComponentDescriptor descriptor : componentDescriptors) { - if (isAssignableFrom(type, descriptor.getImplementationClass())) { - descriptors.add((ComponentDescriptor) descriptor); - } - } - } - return descriptors; - } - - @Deprecated - public ComponentDescriptor getComponentDescriptor(String role, String roleHint, ClassRealm realm) { - // find all realms from our realm to the root realm - Set realms = new HashSet(); - for (ClassRealm r = realm; r != null; r = r.getParentRealm()) { - realms.add(r); - } - - // get the component descriptors by roleHint - for (ComponentDescriptor componentDescriptor : - getComponentDescriptors(role).get(roleHint)) { - // return the first descriptor from our target realms - if (realms.contains(componentDescriptor.getRealm())) { - return componentDescriptor; - } - } - - return null; - } - - public void removeComponentRealm(ClassRealm classRealm) { - index.remove(classRealm); - } - - // ---------------------------------------------------------------------- - // Lifecylce Management - // ---------------------------------------------------------------------- - - // ---------------------------------------------------------------------- - // Component Descriptor processing. - // ---------------------------------------------------------------------- - - public void addComponentDescriptor(ComponentDescriptor componentDescriptor) - throws CycleDetectedInComponentGraphException { - ClassRealm classRealm = componentDescriptor.getRealm(); - SortedMap>>> roleIndex = index.get(classRealm); - if (roleIndex == null) { - roleIndex = new TreeMap>>>(); - index.put(classRealm, roleIndex); - } - - String role = componentDescriptor.getRole(); - Map>> roleHintIndex = roleIndex.get(role); - if (roleHintIndex == null) { - roleHintIndex = new LinkedHashMap>>(); - roleIndex.put(role, roleHintIndex); - } - String roleHint = componentDescriptor.getRoleHint(); - Set> componentDescriptors = roleHintIndex.get(roleHint); - if (componentDescriptors == null) { - componentDescriptors = new LinkedHashSet>(); - roleHintIndex.put(roleHint, componentDescriptors); - } - componentDescriptors.add(componentDescriptor); - - compositionResolver.addComponentDescriptor(componentDescriptor); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java deleted file mode 100644 index ea0139e46..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentConfigurationException extends Exception { - private static final long serialVersionUID = -921278352685045303L; - - /** - * Construct a new ComponentConfigurationException instance. - * @param message exception message - */ - public ComponentConfigurationException(String message) { - super(message); - } - - /** - * Construct a new ComponentConfigurationException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentConfigurationException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java deleted file mode 100644 index 9e6110ca0..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentDescriptorUnmarshallingException extends Exception { - private static final long serialVersionUID = 6991583130117543536L; - - /** - * Construct a new ComponentDescriptorUnmarshallingException instance. - * @param message exception message - */ - public ComponentDescriptorUnmarshallingException(String message) { - super(message); - } - - /** - * Construct a new ComponentDescriptorUnmarshallingException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentDescriptorUnmarshallingException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java deleted file mode 100644 index efa578293..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - * - */ -public class ComponentImplementationNotFoundException extends Exception { - private static final long serialVersionUID = -9171668987729438489L; - - /** - * Construct a new ComponentImplementationNotFoundException instance. - * @param message exception message - */ - public ComponentImplementationNotFoundException(String message) { - super(message); - } - - /** - * Construct a new ComponentImplementationNotFoundException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentImplementationNotFoundException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java deleted file mode 100644 index b030be9c9..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentLifecycleException extends Exception { - private static final long serialVersionUID = 146489359157036908L; - - /** - * Construct a new ComponentLifecycleException instance. - * @param message exception message - */ - public ComponentLifecycleException(String message) { - super(message); - } - - /** - * Construct a new ComponentLifecycleException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentLifecycleException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java deleted file mode 100644 index 0cd7b2ece..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * The exception which is thrown by a component repository when - * the requested component cannot be found. - * - * @author Jason van Zyl - */ -public class ComponentLookupException extends Exception { - private String LS = System.getProperty("line.separator"); - - private String role; - - private String roleHint; - - private ClassRealm realm; - - public ComponentLookupException(String message, String role, String roleHint) { - super(message); - - this.role = role; - - this.roleHint = roleHint; - } - - public ComponentLookupException(String message, String role, String roleHint, Throwable cause) { - super(message, cause); - - this.role = role; - - this.roleHint = roleHint; - } - - public ComponentLookupException(String message, String role, String roleHint, ClassRealm realm) { - super(message); - - this.role = role; - - this.roleHint = roleHint; - - this.realm = realm; - } - - public ComponentLookupException(String message, String role, String roleHint, ClassRealm realm, Throwable cause) { - super(message, cause); - - this.role = role; - - this.roleHint = roleHint; - - this.realm = realm; - } - - public String getMessage() { - StringBuilder sb = new StringBuilder() - .append(super.getMessage()) - .append(LS) - .append(" role: ") - .append(role) - .append(LS) - .append(" roleHint: ") - .append(roleHint) - .append(LS) - .append("classRealm: "); - - if (realm != null) { - sb.append(realm.getId()).append(LS); - ByteArrayOutputStream os = new ByteArrayOutputStream(1024); - PrintStream ps = new PrintStream(os); - realm.display(ps); - sb.append(os.toString()); - } else { - sb.append("none specified"); - } - - return sb.toString(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java deleted file mode 100644 index f544921ab..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * The exception which is thrown by a component repository when - * the requested component cannot be found. - * - * @author Kristian Rosenvold - */ -public class ComponentLookupRuntimeException extends RuntimeException { - public ComponentLookupRuntimeException(ComponentLookupException cause) { - super(cause); - } - - public String getMessage() { - return getCause().getMessage(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java deleted file mode 100644 index a0bbda0a7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentManagerImplementationNotFoundException extends Exception { - private static final long serialVersionUID = 2365017114180373632L; - - /** - * Construct a new ComponentManagerImplementationNotFoundException instance. - * @param message exception message - */ - public ComponentManagerImplementationNotFoundException(String message) { - super(message); - } - - /** - * Construct a new ComponentManagerImplementationNotFoundException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentManagerImplementationNotFoundException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java deleted file mode 100644 index 529af0c9c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentProfileException extends Exception { - private static final long serialVersionUID = -4099483467183306853L; - - /** - * Construct a new ComponentProfileException instance. - * @param message exception message - */ - public ComponentProfileException(String message) { - super(message); - } - - /** - * Construct a new ComponentProfileException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentProfileException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java deleted file mode 100644 index 3074821c7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.repository.exception; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when the class(es) required for a component - * implementation are not available. - * - * @author Jason van Zyl - */ -public class ComponentRepositoryException extends Exception { - private static final long serialVersionUID = 3698017788731736736L; - - /** - * Construct a new ComponentRepositoryException instance. - * @param message exception message - */ - public ComponentRepositoryException(String message) { - super(message); - } - - /** - * Construct a new ComponentRepositoryException instance. - * @param message exception message - * @param cause causing exception to chain - */ - public ComponentRepositoryException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java deleted file mode 100644 index c7263ea87..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java +++ /dev/null @@ -1,258 +0,0 @@ -package org.codehaus.plexus.component.repository.io; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.PrintStream; -import java.io.Reader; -import java.io.StringReader; -import java.util.LinkedList; -import java.util.List; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDependency; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.component.repository.ComponentRequirementList; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.configuration.io.XmlPlexusConfigurationReader; - -/** - * @author Jason van Zyl - */ -public class PlexusTools { - public static PlexusConfiguration buildConfiguration(String resourceName, Reader configuration) - throws PlexusConfigurationException { - try { - XmlPlexusConfigurationReader reader = new XmlPlexusConfigurationReader(); - - PlexusConfiguration result = reader.read(configuration); - - return result; - } catch (PlexusConfigurationException e) { - throw new PlexusConfigurationException( - "PlexusConfigurationException building configuration from: " + resourceName, e); - } catch (IOException e) { - throw new PlexusConfigurationException("IO error building configuration from: " + resourceName, e); - } - } - - public static PlexusConfiguration buildConfiguration(String configuration) throws PlexusConfigurationException { - return buildConfiguration("", new StringReader(configuration)); - } - - public static ComponentDescriptor buildComponentDescriptor(String configuration, ClassRealm realm) - throws PlexusConfigurationException { - return buildComponentDescriptor(buildConfiguration(configuration), realm); - } - - public static ComponentDescriptor buildComponentDescriptor(PlexusConfiguration configuration) - throws PlexusConfigurationException { - return buildComponentDescriptorImpl(configuration, null); - } - - public static ComponentDescriptor buildComponentDescriptor(PlexusConfiguration configuration, ClassRealm realm) - throws PlexusConfigurationException { - if (realm == null) { - throw new NullPointerException("realm is null"); - } - - return buildComponentDescriptorImpl(configuration, realm); - } - - private static ComponentDescriptor buildComponentDescriptorImpl( - PlexusConfiguration configuration, ClassRealm realm) throws PlexusConfigurationException { - String implementation = configuration.getChild("implementation").getValue(); - if (implementation == null) { - throw new PlexusConfigurationException("implementation is null"); - } - - ComponentDescriptor cd; - try { - if (realm != null) { - Class implementationClass = realm.loadClass(implementation); - cd = new ComponentDescriptor(implementationClass, realm); - } else { - cd = new ComponentDescriptor(); - cd.setImplementation(implementation); - } - } catch (Throwable e) { - throw new PlexusConfigurationException( - "Can not load implementation class " + implementation + " from realm " + realm, e); - } - - cd.setRole(configuration.getChild("role").getValue()); - - cd.setRoleHint(configuration.getChild("role-hint").getValue()); - - cd.setVersion(configuration.getChild("version").getValue()); - - cd.setComponentType(configuration.getChild("component-type").getValue()); - - cd.setInstantiationStrategy( - configuration.getChild("instantiation-strategy").getValue()); - - cd.setLifecycleHandler(configuration.getChild("lifecycle-handler").getValue()); - - cd.setComponentProfile(configuration.getChild("component-profile").getValue()); - - cd.setComponentComposer(configuration.getChild("component-composer").getValue()); - - cd.setComponentConfigurator( - configuration.getChild("component-configurator").getValue()); - - cd.setComponentFactory(configuration.getChild("component-factory").getValue()); - - cd.setDescription(configuration.getChild("description").getValue()); - - cd.setAlias(configuration.getChild("alias").getValue()); - - String s = configuration.getChild("isolated-realm").getValue(); - - if (s != null) { - cd.setIsolatedRealm(s.equals("true") ? true : false); - } - - // ---------------------------------------------------------------------- - // Here we want to look for directives for inlining external - // configurations. we probably want to take them from files or URLs. - // ---------------------------------------------------------------------- - - cd.setConfiguration(configuration.getChild("configuration")); - - // ---------------------------------------------------------------------- - // Requirements - // ---------------------------------------------------------------------- - - PlexusConfiguration[] requirements = - configuration.getChild("requirements").getChildren("requirement"); - - for (PlexusConfiguration requirement : requirements) { - ComponentRequirement cr; - - PlexusConfiguration[] hints = requirement.getChild("role-hints").getChildren("role-hint"); - if (hints != null && hints.length > 0) { - cr = new ComponentRequirementList(); - - List hintList = new LinkedList(); - for (PlexusConfiguration hint : hints) { - hintList.add(hint.getValue()); - } - - ((ComponentRequirementList) cr).setRoleHints(hintList); - } else { - cr = new ComponentRequirement(); - - cr.setRoleHint(requirement.getChild("role-hint").getValue()); - } - - cr.setRole(requirement.getChild("role").getValue()); - - cr.setOptional(Boolean.parseBoolean(requirement.getChild("optional").getValue())); - - cr.setFieldName(requirement.getChild("field-name").getValue()); - - cd.addRequirement(cr); - } - - return cd; - } - - public static ComponentSetDescriptor buildComponentSet(PlexusConfiguration c) throws PlexusConfigurationException { - return buildComponentSet(c, null); - } - - public static ComponentSetDescriptor buildComponentSet(PlexusConfiguration c, ClassRealm realm) - throws PlexusConfigurationException { - ComponentSetDescriptor csd = new ComponentSetDescriptor(); - - // ---------------------------------------------------------------------- - // Components - // ---------------------------------------------------------------------- - - PlexusConfiguration[] components = c.getChild("components").getChildren("component"); - - for (PlexusConfiguration component : components) { - csd.addComponentDescriptor(buildComponentDescriptorImpl(component, realm)); - } - - // ---------------------------------------------------------------------- - // Dependencies - // ---------------------------------------------------------------------- - - PlexusConfiguration[] dependencies = c.getChild("dependencies").getChildren("dependency"); - - for (PlexusConfiguration d : dependencies) { - ComponentDependency cd = new ComponentDependency(); - - cd.setArtifactId(d.getChild("artifact-id").getValue()); - - cd.setGroupId(d.getChild("group-id").getValue()); - - String type = d.getChild("type").getValue(); - if (type != null) { - cd.setType(type); - } - - cd.setVersion(d.getChild("version").getValue()); - - csd.addDependency(cd); - } - - return csd; - } - - public static void writeConfiguration(PrintStream out, PlexusConfiguration configuration) - throws PlexusConfigurationException { - writeConfiguration(out, configuration, ""); - } - - private static void writeConfiguration(PrintStream out, PlexusConfiguration configuration, String indent) - throws PlexusConfigurationException { - out.print(indent + "<" + configuration.getName()); - String[] atts = configuration.getAttributeNames(); - - if (atts.length > 0) { - for (String att : atts) { - out.print("\n" + indent + " " + att + "='" + configuration.getAttribute(att) + "'"); - } - } - - PlexusConfiguration[] pc = configuration.getChildren(); - - if ((configuration.getValue() != null && configuration.getValue().trim().length() > 0) || pc.length > 0) { - out.print(">" - + (configuration.getValue() == null - ? "" - : configuration.getValue().trim())); - - if (pc.length > 0) { - out.println(); - for (PlexusConfiguration aPc : pc) { - writeConfiguration(out, aPc, indent + " "); - } - out.print(indent); - } - - out.println(""); - } else { - out.println("/>"); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java deleted file mode 100644 index bbad08ac7..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - */ -public class DefaultPlexusConfiguration implements PlexusConfiguration { - - private String name; - - private String value; - - private Map attributes; - - private Map> childMap; - - private List childList; - - protected DefaultPlexusConfiguration() { - this("configuration"); - } - - protected DefaultPlexusConfiguration(String name) { - this(name, null); - } - - protected DefaultPlexusConfiguration(String name, String value) { - super(); - - this.name = name; - - this.value = value; - - this.attributes = new LinkedHashMap(); - - this.childMap = new LinkedHashMap>(); - - this.childList = new ArrayList(); - } - - // ---------------------------------------------------------------------- - // Name handling - // ---------------------------------------------------------------------- - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - // ---------------------------------------------------------------------- - // Value handling - // ---------------------------------------------------------------------- - - public String getValue() { - return value; - } - - public String getValue(String defaultValue) { - String value = getValue(); - - if (value == null) { - value = defaultValue; - } - - return value; - } - - public void setValue(String val) { - value = val; - } - - public PlexusConfiguration setValueAndGetSelf(String val) { - setValue(val); - - return this; - } - - // ---------------------------------------------------------------------- - // Attribute handling - // ---------------------------------------------------------------------- - public void setAttribute(String name, String value) { - attributes.put(name, value); - } - - public String getAttribute(String name) { - return attributes.get(name); - } - - public String getAttribute(String name, String defaultValue) { - String value = getAttribute(name); - - if (value == null) { - value = defaultValue; - } - - return value; - } - - public String[] getAttributeNames() { - return attributes.keySet().toArray(new String[attributes.size()]); - } - - // ---------------------------------------------------------------------- - // Child handling - // ---------------------------------------------------------------------- - - public PlexusConfiguration getChild(String name) { - return getChild(name, true); - } - - public PlexusConfiguration getChild(int i) { - return childList.get(i); - } - - public PlexusConfiguration getChild(String name, boolean createChild) { - List childs = childMap.get(name); - - boolean noneFound = (childs == null || childs.size() == 0); - - if (noneFound && createChild) { - addChild(name); - - return getChild(name, false); - } else if (noneFound && !createChild) { - return null; - } else { - return childs.get(0); - } - } - - public PlexusConfiguration[] getChildren() { - return childList.toArray(new PlexusConfiguration[childList.size()]); - } - - public PlexusConfiguration[] getChildren(String name) { - List childs = new ArrayList(); - - List childList = childMap.get(name); - - if (childList != null) { - childs.addAll(childList); - } - - return childs.toArray(new PlexusConfiguration[childs.size()]); - } - - public void addChild(PlexusConfiguration child) { - childList.add(child); - - List children = childMap.get(child.getName()); - if (children == null) { - childMap.put(child.getName(), children = new ArrayList()); - } - - children.add(child); - } - - public PlexusConfiguration addChild(String name) { - // we are using reflection to try to create same class childs as parent is, - // since many Maven and Maven plugins stuff casts the incoming result of this call - // to the evil XmlPlexusConfiguration - PlexusConfiguration child = null; - - try { - child = getClass().newInstance(); - - child.setName(name); - } catch (Exception e) { - // we have a PlexusConfiguration that has no constructor(name) - child = new DefaultPlexusConfiguration(name); - } - - addChild(child); - - return this; - } - - public PlexusConfiguration addChild(String name, String value) { - PlexusConfiguration child = new DefaultPlexusConfiguration(name, value); - - addChild(child); - - return this; - } - - public int getChildCount() { - return this.childList.size(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java deleted file mode 100644 index 286ee31d8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.codehaus.plexus.configuration; - -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.xml.Xpp3DomBuilder; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - -/** - * - * @author Kenney Westerhof - * - */ -public class PlexusComponentDescriptorMerger { - /** - * Merges override and target, where target is updated with override. - * @param override {@link ComponentDescriptor} - * @param target {@link ComponentDescriptor}. - */ - public static void merge(ComponentDescriptor override, ComponentDescriptor target) { - if (override.getImplementation() != null) { - target.setImplementation(override.getImplementation()); - } - - mergeRequirements(override, target); - - mergeConfiguration(override, target); - - // TODO: other getters/setters. - } - - private static void mergeConfiguration(ComponentDescriptor override, ComponentDescriptor target) { - // try to parse the override dom. If this fails, do not update anything and keep - // the original target configuration. - Xpp3Dom overrideDom; - - try { - - overrideDom = Xpp3DomBuilder.build( - new StringReader(override.getConfiguration().toString())); - } catch (XmlPullParserException e1) { - return; - } catch (IOException e1) { - return; - } - - // try to parse the target dom. if this fails, replace it with the override configuration, - // dom, otherwise merge it. - - Xpp3Dom targetDom = null; - - if (target.getConfiguration() != null) { - try { - targetDom = Xpp3DomBuilder.build( - new StringReader(target.getConfiguration().toString())); - } catch (XmlPullParserException e1) { - } catch (IOException e1) { - } - } - - if (targetDom != null) { - Xpp3Dom.mergeXpp3Dom(overrideDom, targetDom); - } else { - targetDom = overrideDom; - } - - target.setConfiguration(new XmlPlexusConfiguration(targetDom)); - } - - private static void mergeRequirements(ComponentDescriptor override, ComponentDescriptor target) { - List toAdd = new ArrayList(); - List toRemove = new ArrayList(); - - for (ComponentRequirement sourceReq : override.getRequirements()) { - for (ComponentRequirement targetReq : target.getRequirements()) { - // if a fieldName is specified, only override target requirements - // that also have a fieldname. - if (sourceReq.getFieldName() != null) { - if (sourceReq.getFieldName().equals(targetReq.getFieldName())) { - toRemove.add(targetReq); - toAdd.add(sourceReq); - break; - } - } else if (targetReq.getFieldName() == null) { - // no fieldnames specified - just check for the role; hints may be - // overriden too. - - if (sourceReq.getRole().equals(targetReq.getRole())) { - toRemove.add(targetReq); - toAdd.add(sourceReq); - } - } - } - } - - target.removeRequirements(toRemove); - target.addRequirements(toAdd); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java deleted file mode 100644 index d68924fda..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * A configuration data hierarchy for configuring aspects of plexus. For - * example, to populate a ComponentDescriptor. Implementation of - * PlexusConfiguration may be populated by any means, for example, by XML file. - */ -public interface PlexusConfiguration { - // ---------------------------------------------------------------------- - // Name handling - // ---------------------------------------------------------------------- - - /** - * Returns the name of this configuration. - * @return the name of this configuration - */ - String getName(); - - /** - * Sets the name of this configuration. - * @param name The name of the configuration. - */ - void setName(String name); - - // ---------------------------------------------------------------------- - // Value handling - // ---------------------------------------------------------------------- - - /** - * Returns the value of this configuration. - * @return the value of this configuration - * @throws PlexusConfigurationException in case of an error. - */ - String getValue() throws PlexusConfigurationException; - - /** - * Returns the value of this configuration, or default if one cannot be - * found. - * @param defaultValue value to return if none is found - * @return the value of this configuration - */ - String getValue(String defaultValue); - - /** - * Set the value of a configuration element. - * @param value The value of the configuration element. - */ - void setValue(String value); - - /** - * Set the value of a configuration element and return the PlexusConfiguration object - * so that further operations can be carried out. - * @param value set the value. - * @return {@link PlexusConfiguration} - */ - PlexusConfiguration setValueAndGetSelf(String value); - - // ---------------------------------------------------------------------- - // Attribute handling - // ---------------------------------------------------------------------- - - /** - * Sets an attribute on this configuration. - * @param name name of the attribute - * @param value the value of the attribute. - */ - void setAttribute(String name, String value); - - /** - * Returns an array of attribute names. - * @return an array of attribute names - */ - String[] getAttributeNames(); - - /** - * Returns the value of the named attribute. - * @param paramName The name of the attribute. - * @return the value of the named attribute - * @throws PlexusConfigurationException in case of an error. - */ - String getAttribute(String paramName) throws PlexusConfigurationException; - - /** - * Returns the value of the named attribute, or default if one cannot be - * found. - * @param name The name of the attribute. - * @param defaultValue value to return if none is found - * @return the value of the named attribute - */ - String getAttribute(String name, String defaultValue); - - // ---------------------------------------------------------------------- - // Child handling - // ---------------------------------------------------------------------- - - /** - * Returns the child configuration of the given name. - * @param child the name of the child to return - * @return the child configuration of the given name - */ - PlexusConfiguration getChild(String child); - - /** - * Returns the child configuration at the given location. - * @param i the position of the child under this configuration - * @return the child configuration at the given location - */ - PlexusConfiguration getChild(int i); - - /** - * Returns the child configuration of the given name. - * @param child the name of the child to return - * @param createChild true if a new child should be create, if none found - * @return the child configuration of the given name, or new child if - * created - */ - PlexusConfiguration getChild(String child, boolean createChild); - - /** - * Returns an array of all child configurations. - * @return an array of all child configurations - */ - PlexusConfiguration[] getChildren(); - - /** - * Returns an array of all child configurations with the given name. - * @param name the name of the children configurations to return - * @return an array of all child configurations with the given name - */ - PlexusConfiguration[] getChildren(String name); - - /** - * Adds a configuration under this configuration, which acts as - * a parent. - * @param configuration the child configuration to add - */ - void addChild(PlexusConfiguration configuration); - - /** - * Add a child element with a given name and return the newly created element. - * @param name The name of the element. - * @return {@link PlexusConfiguration} - */ - PlexusConfiguration addChild(String name); - - /** - * Add a child element with a given name, and given value and return the - * newly created element. - * @param name The name of the child element. - * @param value The value of the child element. - * @return {@link PlexusConfiguration} - */ - PlexusConfiguration addChild(String name, String value); - - /** - * Returns the number of directly children under this configuration. - * @return the number of directly children under this configuration. - */ - int getChildCount(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java deleted file mode 100644 index 69e84fd93..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception that is thrown when an expected configuration value encounters - * problems loading correctly. - */ -public class PlexusConfigurationException extends Exception { - private static final long serialVersionUID = 7559886640184983689L; - - /** - * Construct a new PlexusConfigurationException instance. - * @param message exception message - */ - public PlexusConfigurationException(String message) { - this(message, null); - } - - /** - * Construct a new PlexusConfigurationException instance. - * @param message exception message - * @param throwable causing exception to chain - */ - public PlexusConfigurationException(String message, Throwable throwable) { - super(message, throwable); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java deleted file mode 100644 index ab782da05..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java +++ /dev/null @@ -1,309 +0,0 @@ -package org.codehaus.plexus.configuration; - -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * TODO: This merger explicity uses the XML implementation of the plexus configuration but - * it must work for configurations coming from any source. - */ -public class PlexusConfigurationMerger { - // -----------------------------------+----------------------------------------------------------------- - // E L E M E N T | - // -----------------------------------+----------------------------------------------------------------- - // load-on-start | user - // -----------------------------------+----------------------------------------------------------------- - // system-properties | user - // -----------------------------------+----------------------------------------------------------------- - // configurations-directory | user - // -----------------------------------+----------------------------------------------------------------- - // logging | user wins - // -----------------------------------+----------------------------------------------------------------- - // component-repository | user wins - // -----------------------------------+----------------------------------------------------------------- - // resources | user wins, but system resources show through - // -----------------------------------+----------------------------------------------------------------- - // component-manager-manager | user wins, but system resources show through - // -----------------------------------+----------------------------------------------------------------- - // component-discoverer-manager | user wins, but system resources show through - // -----------------------------------+----------------------------------------------------------------- - // component-factory-manager | user wins, but system resources show through - // -----------------------------------+----------------------------------------------------------------- - // lifecycle-handler-manager | user wins, but system lifecycles show through - // -----------------------------------+----------------------------------------------------------------- - // component-composer-manager | user wins, but system lifecycles show through - // -----------------------------------+----------------------------------------------------------------- - // components | user - // -----------------------------------+----------------------------------------------------------------- - - public static PlexusConfiguration merge(PlexusConfiguration user, PlexusConfiguration system) { - PlexusConfiguration mergedConfiguration = new XmlPlexusConfiguration("plexus"); - - // ---------------------------------------------------------------------- - // Load on start - // ---------------------------------------------------------------------- - - PlexusConfiguration loadOnStart = user.getChild("load-on-start"); - - if (loadOnStart.getChildCount() != 0) { - mergedConfiguration.addChild(loadOnStart); - } - - // ---------------------------------------------------------------------- - // System properties - // ---------------------------------------------------------------------- - - PlexusConfiguration systemProperties = user.getChild("system-properties"); - - if (systemProperties.getChildCount() != 0) { - mergedConfiguration.addChild(systemProperties); - } - - // ---------------------------------------------------------------------- - // Configurations directory - // ---------------------------------------------------------------------- - - PlexusConfiguration[] configurationsDirectories = user.getChildren("configurations-directory"); - - if (configurationsDirectories.length != 0) { - for (PlexusConfiguration configurationsDirectory : configurationsDirectories) { - mergedConfiguration.addChild(configurationsDirectory); - } - } - - // ---------------------------------------------------------------------- - // Logging - // ---------------------------------------------------------------------- - - PlexusConfiguration logging = user.getChild("logging"); - - if (logging.getChildCount() != 0) { - mergedConfiguration.addChild(logging); - } else { - mergedConfiguration.addChild(system.getChild("logging")); - } - - // ---------------------------------------------------------------------- - // Container initialization phases - // ---------------------------------------------------------------------- - - mergedConfiguration.addChild(system.getChild("container-initialization")); - - mergedConfiguration.addChild(system.getChild("component-lookup-manager")); - - // ---------------------------------------------------------------------- - // Component repository - // ---------------------------------------------------------------------- - - PlexusConfiguration componentRepository = user.getChild("component-repository"); - - if (componentRepository.getChildCount() != 0) { - mergedConfiguration.addChild(componentRepository); - } else { - mergedConfiguration.addChild(system.getChild("component-repository")); - } - - // ---------------------------------------------------------------------- - // Resources - // ---------------------------------------------------------------------- - - copyResources(system, mergedConfiguration); - - copyResources(user, mergedConfiguration); - - // ---------------------------------------------------------------------- - // Component manager manager - // ---------------------------------------------------------------------- - - PlexusConfiguration componentManagerManager = user.getChild("component-manager-manager"); - - if (componentManagerManager.getChildCount() != 0) { - mergedConfiguration.addChild(componentManagerManager); - - copyComponentManagers(system.getChild("component-manager-manager"), componentManagerManager); - } else { - mergedConfiguration.addChild(system.getChild("component-manager-manager")); - } - - // ---------------------------------------------------------------------- - // Component discoverer manager - // ---------------------------------------------------------------------- - - PlexusConfiguration componentDiscovererManager = user.getChild("component-discoverer-manager"); - - if (componentDiscovererManager.getChildCount() != 0) { - mergedConfiguration.addChild(componentDiscovererManager); - - copyComponentDiscoverers(system.getChild("component-discoverer-manager"), componentDiscovererManager); - } else { - mergedConfiguration.addChild(system.getChild("component-discoverer-manager")); - } - - // ---------------------------------------------------------------------- - // Component factory manager - // ---------------------------------------------------------------------- - - PlexusConfiguration componentFactoryManager = user.getChild("component-factory-manager"); - - if (componentFactoryManager.getChildCount() != 0) { - mergedConfiguration.addChild(componentFactoryManager); - - copyComponentFactories(system.getChild("component-factory-manager"), componentFactoryManager); - } else { - mergedConfiguration.addChild(system.getChild("component-factory-manager")); - } - - // ---------------------------------------------------------------------- - // Lifecycle handler managers - // ---------------------------------------------------------------------- - - PlexusConfiguration lifecycleHandlerManager = user.getChild("lifecycle-handler-manager"); - - if (lifecycleHandlerManager.getChildCount() != 0) { - mergedConfiguration.addChild(lifecycleHandlerManager); - - copyLifecycles(system.getChild("lifecycle-handler-manager"), lifecycleHandlerManager); - } else { - mergedConfiguration.addChild(system.getChild("lifecycle-handler-manager")); - } - - // ---------------------------------------------------------------------- - // Component factory manager - // ---------------------------------------------------------------------- - - PlexusConfiguration componentComposerManager = user.getChild("component-composer-manager"); - - if (componentComposerManager.getChildCount() != 0) { - mergedConfiguration.addChild(componentComposerManager); - - copyComponentComposers(system.getChild("component-composer-manager"), componentComposerManager); - } else { - mergedConfiguration.addChild(system.getChild("component-composer-manager")); - } - - // ---------------------------------------------------------------------- - // Components - // ---------------------------------------------------------------------- - // We grab the system components first and then add the user defined - // components so that user defined components will win. When component - // descriptors are processed the last definition wins because the component - // descriptors are stored in a Map in the component repository. - // ---------------------------------------------------------------------- - - PlexusConfiguration components = system.getChild("components"); - - mergedConfiguration.addChild(components); - - copyComponents(user.getChild("components"), components); - - return mergedConfiguration; - } - - private static void copyResources(PlexusConfiguration source, PlexusConfiguration destination) { - PlexusConfiguration handlers[] = source.getChild("resources").getChildren(); - - PlexusConfiguration dest = destination.getChild("resources"); - - for (PlexusConfiguration handler : handlers) { - dest.addChild(handler); - } - } - - private static void copyComponentManagers(PlexusConfiguration source, PlexusConfiguration destination) { - try { - PlexusConfiguration id = destination.getChild("default-component-manager-id"); - - String sid = source.getChild("default-component-manager-id").getValue(); - - if (id.getValue() == null) { - id.setValue(sid); - } - } catch (PlexusConfigurationException e) { - // do nothing - } - - PlexusConfiguration handlers[] = source.getChild("component-managers").getChildren("component-manager"); - - PlexusConfiguration dest = destination.getChild("component-managers"); - - for (PlexusConfiguration handler : handlers) { - dest.addChild(handler); - } - } - - private static void copyComponentDiscoverers(PlexusConfiguration source, PlexusConfiguration destination) { - PlexusConfiguration handlers[] = - source.getChild("component-discoverers").getChildren("component-discoverer"); - - PlexusConfiguration dest = destination.getChild("component-discoverers"); - - for (PlexusConfiguration handler : handlers) { - dest.addChild(handler); - } - } - - private static void copyComponentFactories(PlexusConfiguration source, PlexusConfiguration destination) { - PlexusConfiguration handlers[] = source.getChild("component-factories").getChildren("component-factory"); - - PlexusConfiguration dest = destination.getChild("component-factories"); - - for (PlexusConfiguration handler : handlers) { - dest.addChild(handler); - } - } - - private static void copyComponentComposers(PlexusConfiguration source, PlexusConfiguration destination) { - try { - PlexusConfiguration id = destination.getChild("default-component-composer-id"); - - String sid = source.getChild("default-component-composer-id").getValue(); - - if (id.getValue() == null) { - id.setValue(sid); - } - } catch (PlexusConfigurationException e) { - // do nothing - } - - PlexusConfiguration composers[] = source.getChild("component-composers").getChildren("component-composer"); - - PlexusConfiguration dest = destination.getChild("component-composers"); - - for (PlexusConfiguration composer : composers) { - dest.addChild(composer); - } - } - - private static void copyLifecycles(PlexusConfiguration source, PlexusConfiguration destination) { - PlexusConfiguration handlers[] = source.getChild("lifecycle-handlers").getChildren("lifecycle-handler"); - - PlexusConfiguration dest = destination.getChild("lifecycle-handlers"); - - for (PlexusConfiguration handler : handlers) { - dest.addChild(handler); - } - } - - private static void copyComponents(PlexusConfiguration source, PlexusConfiguration destination) { - PlexusConfiguration components[] = source.getChildren("component"); - - for (PlexusConfiguration component : components) { - destination.addChild(component); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java deleted file mode 100644 index 3573560ab..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class PlexusConfigurationResourceException extends Exception { - public PlexusConfigurationResourceException(String message) { - super(message); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java deleted file mode 100644 index 8a93b239d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; - -public interface PlexusConfigurationReader { - public PlexusConfiguration read(Reader reader) throws IOException, PlexusConfigurationException; - - public PlexusConfiguration read(InputStream inputStream) throws IOException, PlexusConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java deleted file mode 100644 index 1eb1df0ae..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public interface PlexusConfigurationWriter { - void write(Writer writer, PlexusConfiguration configuration) throws IOException; - - void write(OutputStream outputStream, PlexusConfiguration configuration) throws IOException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java deleted file mode 100644 index dd19a99b8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; - -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.xml.Xpp3DomBuilder; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - -public class XmlPlexusConfigurationReader implements PlexusConfigurationReader { - - public PlexusConfiguration read(InputStream inputStream) throws IOException, PlexusConfigurationException { - return read(new InputStreamReader(inputStream)); - } - - public PlexusConfiguration read(Reader reader) throws IOException, PlexusConfigurationException { - try { - Xpp3Dom dom = Xpp3DomBuilder.build(reader); - - return new XmlPlexusConfiguration(dom); - } catch (XmlPullParserException e) { - throw new PlexusConfigurationException( - "Failed to parse configuration resource!\nError was: \'" + e.getLocalizedMessage() + "\'", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java deleted file mode 100644 index 7221981bf..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public class XmlPlexusConfigurationWriter implements PlexusConfigurationWriter { - - public void write(OutputStream outputStream, PlexusConfiguration configuration) throws IOException { - write(new OutputStreamWriter(outputStream), configuration); - } - - public void write(Writer writer, PlexusConfiguration configuration) throws IOException { - int depth = 0; - - display(configuration, writer, depth); - } - - private void display(PlexusConfiguration c, Writer w, int depth) throws IOException { - int count = c.getChildCount(); - - if (count == 0) { - displayTag(c, w, depth); - } else { - indent(depth, w); - w.write('<'); - w.write(c.getName()); - - attributes(c, w); - - w.write('>'); - w.write('\n'); - - for (int i = 0; i < count; i++) { - PlexusConfiguration child = c.getChild(i); - - display(child, w, depth + 1); - } - - indent(depth, w); - w.write('<'); - w.write('/'); - w.write(c.getName()); - w.write('>'); - w.write('\n'); - } - } - - private void displayTag(PlexusConfiguration c, Writer w, int depth) throws IOException { - String value = c.getValue(null); - - if (value != null) { - indent(depth, w); - w.write('<'); - w.write(c.getName()); - - attributes(c, w); - - w.write('>'); - w.write(c.getValue(null)); - w.write('<'); - w.write('/'); - w.write(c.getName()); - w.write('>'); - w.write('\n'); - } else { - indent(depth, w); - w.write('<'); - w.write(c.getName()); - - attributes(c, w); - - w.write('/'); - w.write('>'); - w.write("\n"); - } - } - - private void attributes(PlexusConfiguration c, Writer w) throws IOException { - String[] names = c.getAttributeNames(); - - for (String name : names) { - w.write(' '); - w.write(name); - w.write('='); - w.write('"'); - w.write(c.getAttribute(name, null)); - w.write('"'); - } - } - - private void indent(int depth, Writer w) throws IOException { - for (int i = 0; i < depth; i++) { - w.write(' '); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java deleted file mode 100644 index 09fc5934b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import java.util.List; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * A configuration source that delegates to any number of underlying configuration sources. If you are an application - * author and want to create a custom source of configuration for the components in your application then you would most - * likely want to create a chained configuration source where you can decide the order of processing, but still have the - * container perform its default behavior. - * - * @author Jason van Zyl - */ -public class ChainedConfigurationSource implements ConfigurationSource { - private List configurationSources; - - public ChainedConfigurationSource(List configurationSources) { - this.configurationSources = configurationSources; - } - - public PlexusConfiguration getConfiguration(ComponentDescriptor componentDescriptor) { - for (Object configurationSource1 : configurationSources) { - ConfigurationSource configurationSource = (ConfigurationSource) configurationSource1; - - PlexusConfiguration configuration = configurationSource.getConfiguration(componentDescriptor); - - if (configuration != null) { - return configuration; - } - } - - return null; - } - - public List getConfigurationSources() { - return configurationSources; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java deleted file mode 100644 index 25ec1f765..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * A source for component configurations which may reside outside the configuration within a component descriptor. A - * common usecase for this is to create a unified configuration for a set of components. For an application it is more - * convenient to present the user with a single configuration, instead of making users work directly with a Plexus - * configuration file which exposes component details including implementation, and wiring information. - * - * @author Jason van Zyl - */ -public interface ConfigurationSource { - String ROLE = ConfigurationSource.class.getName(); - - PlexusConfiguration getConfiguration(ComponentDescriptor componentDescriptor); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java deleted file mode 100644 index 63ae94f1f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** @author Jason van Zyl */ -public class ContainerConfigurationSource implements ConfigurationSource { - public PlexusConfiguration getConfiguration(ComponentDescriptor componentDescriptor) { - if (componentDescriptor.hasConfiguration()) { - return componentDescriptor.getConfiguration(); - } - - return null; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java b/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java deleted file mode 100644 index 05825fcac..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.codehaus.plexus.configuration.xml; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.StringWriter; - -import org.codehaus.plexus.configuration.DefaultPlexusConfiguration; -import org.codehaus.plexus.configuration.io.XmlPlexusConfigurationWriter; -import org.codehaus.plexus.util.xml.Xpp3Dom; - -/** - */ -public class XmlPlexusConfiguration extends DefaultPlexusConfiguration { - public XmlPlexusConfiguration() { - super(); - } - - public XmlPlexusConfiguration(String name) { - super(name); - } - - public XmlPlexusConfiguration(String name, String value) { - super(name, value); - } - - public XmlPlexusConfiguration(Xpp3Dom dom) { - super(dom.getName(), dom.getValue()); - - // attrs - String[] attributes = dom.getAttributeNames(); - - for (String attribute : attributes) { - setAttribute(attribute, dom.getAttribute(attribute)); - } - - // children - int childCount = dom.getChildCount(); - for (int i = 0; i < childCount; i++) { - addChild(new XmlPlexusConfiguration(dom.getChild(i))); - } - } - - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- - - public String toString() { - StringWriter sw = new StringWriter(); - - XmlPlexusConfigurationWriter xw = new XmlPlexusConfigurationWriter(); - - try { - xw.write(sw, this); - } catch (IOException e) { - // will not happen with StringWriter - } - - return sw.toString(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java deleted file mode 100644 index 69b656b14..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - */ -public abstract class AbstractContainerInitializationPhase implements ContainerInitializationPhase {} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java deleted file mode 100644 index fd6709d46..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** @author Jason van Zyl */ -public abstract class AbstractCoreComponentInitializationPhase extends AbstractContainerInitializationPhase { - public void execute(ContainerInitializationContext context) throws ContainerInitializationException { - initializeCoreComponent(context); - } - - protected abstract void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java deleted file mode 100644 index c2536e4cb..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Jason van Zyl - */ -public class ContainerInitializationContext { - private DefaultPlexusContainer container; - - ClassWorld classWorld; - - ClassRealm containerRealm; - - PlexusConfiguration containerXmlConfiguration; - - ContainerConfiguration containerConfiguration; - - public ContainerInitializationContext( - DefaultPlexusContainer container, - ClassWorld classWorld, - ClassRealm containerRealm, - PlexusConfiguration configuration, - ContainerConfiguration containerConfiguration) { - this.container = container; - - this.classWorld = classWorld; - - this.containerRealm = containerRealm; - - this.containerXmlConfiguration = configuration; - - this.containerConfiguration = containerConfiguration; - } - - public DefaultPlexusContainer getContainer() { - return container; - } - - public ClassWorld getClassWorld() { - return classWorld; - } - - public ClassRealm getContainerRealm() { - return containerRealm; - } - - public PlexusConfiguration getContainerXmlConfiguration() { - return containerXmlConfiguration; - } - - public ContainerConfiguration getContainerConfiguration() { - return containerConfiguration; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java deleted file mode 100644 index 9571143e9..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - */ -public class ContainerInitializationException extends Exception { - public ContainerInitializationException(String id) { - super(id); - } - - public ContainerInitializationException(String id, Throwable throwable) { - super(id, throwable); - } - - public ContainerInitializationException(Throwable throwable) { - super(throwable); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java deleted file mode 100644 index cc030d93d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - */ -public interface ContainerInitializationPhase { - String ROLE = ContainerInitializationPhase.class.getName(); - - void execute(ContainerInitializationContext context) throws ContainerInitializationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java deleted file mode 100644 index 22e85fe6a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.component.discovery.ComponentDiscovererManager; -import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; - -/** - * @author Jason van Zyl - */ -public class InitializeComponentDiscovererManagerPhase extends AbstractCoreComponentInitializationPhase { - public void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException { - ComponentDiscovererManager componentDiscovererManager = - context.getContainerConfiguration().getComponentDiscovererManager(); - - context.getContainer().setComponentDiscovererManager(componentDiscovererManager); - - for (ComponentDiscoveryListener listener : - componentDiscovererManager.getComponentDiscoveryListeners().keySet()) { - try { - // This is a hack until we have completely live components - - context.getContainer() - .addComponent(listener, listener.getClass().getName()); - - context.getContainer().getComponentDiscovererManager().removeComponentDiscoveryListener(listener); - - ComponentDiscoveryListener cdl = context.getContainer().lookup(listener.getClass()); - - context.getContainer().getComponentDiscovererManager().registerComponentDiscoveryListener(cdl); - } catch (Exception e) { - throw new ContainerInitializationException("Error initializing component discovery listener.", e); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java deleted file mode 100644 index a02de88ec..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.component.factory.ComponentFactoryManager; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; - -/** - * @author Jason van Zyl - */ -public class InitializeComponentFactoryManagerPhase extends AbstractCoreComponentInitializationPhase { - public void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException { - ComponentFactoryManager componentFactoryManager = - context.getContainerConfiguration().getComponentFactoryManager(); - - if (componentFactoryManager instanceof Contextualizable) { - // TODO: this is wrong here jvz. - context.getContainer().getContext().put(PlexusConstants.PLEXUS_KEY, context.getContainer()); - - try { - ((Contextualizable) componentFactoryManager) - .contextualize(context.getContainer().getContext()); - } catch (ContextException e) { - throw new ContainerInitializationException("Error contextualization component factory manager.", e); - } - } - - context.getContainer().setComponentFactoryManager(componentFactoryManager); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java deleted file mode 100644 index 8188c8624..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.ComponentRegistry; -import org.codehaus.plexus.DefaultComponentRegistry; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.manager.PerLookupComponentManagerFactory; -import org.codehaus.plexus.component.manager.SingletonComponentManagerFactory; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRepository; -import org.codehaus.plexus.component.repository.io.PlexusTools; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.lifecycle.LifecycleHandlerManager; - -/** - * @author Jason van Zyl - */ -public class InitializeComponentRegistryPhase implements ContainerInitializationPhase { - public void execute(ContainerInitializationContext context) throws ContainerInitializationException { - ComponentRepository repository = getComponentRepository(context); - - LifecycleHandlerManager lifecycleHandlerManager = getLifecycleHandlerManager(context); - - ComponentRegistry componentRegistry = - new DefaultComponentRegistry(context.getContainer(), repository, lifecycleHandlerManager); - - componentRegistry.registerComponentManagerFactory(new PerLookupComponentManagerFactory()); - - componentRegistry.registerComponentManagerFactory(new SingletonComponentManagerFactory()); - - context.getContainer().setComponentRegistry(componentRegistry); - } - - private ComponentRepository getComponentRepository(ContainerInitializationContext context) - throws ContainerInitializationException { - ComponentRepository repository = context.getContainerConfiguration().getComponentRepository(); - - // Add the components defined in the container xml configuration - try { - PlexusConfiguration configuration = context.getContainerXmlConfiguration(); - - PlexusConfiguration[] componentConfigurations = - configuration.getChild("components").getChildren("component"); - for (PlexusConfiguration componentConfiguration : componentConfigurations) { - ComponentDescriptor componentDescriptor = PlexusTools.buildComponentDescriptor( - componentConfiguration, context.getContainer().getContainerRealm()); - componentDescriptor.setRealm(context.getContainer().getContainerRealm()); - repository.addComponentDescriptor(componentDescriptor); - } - } catch (PlexusConfigurationException e) { - throw new ContainerInitializationException( - "Error initializing component repository: " + "Cannot unmarshall component descriptor: ", e); - } catch (CycleDetectedInComponentGraphException e) { - throw new ContainerInitializationException( - "A cycle has been detected in the components of the system: ", e); - } - - return repository; - } - - private LifecycleHandlerManager getLifecycleHandlerManager(ContainerInitializationContext context) { - LifecycleHandlerManager lifecycleHandlerManager = - context.getContainerConfiguration().getLifecycleHandlerManager(); - lifecycleHandlerManager.initialize(); - return lifecycleHandlerManager; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java deleted file mode 100644 index d7877716c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.configuration.source.ConfigurationSource; -import org.codehaus.plexus.configuration.source.ContainerConfigurationSource; - -/** - * @author Jason van Zyl - * @author cstamas - */ -public class InitializeContainerConfigurationSourcePhase extends AbstractCoreComponentInitializationPhase { - public void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException { - ConfigurationSource configurationSource = context.getContainer().getConfigurationSource(); - - // ---------------------------------------------------------------------- - // The configurationSource may have been set programmatically so we need - // to check. If it hasn't then we will add the default container config source. - // ---------------------------------------------------------------------- - - if (configurationSource == null) { - // adding default source for container to enable lookups - context.getContainer().setConfigurationSource(new ContainerConfigurationSource()); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java deleted file mode 100644 index 5f635f9fc..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.logging.console.ConsoleLoggerManager; - -/** @author Jason van Zyl */ -public class InitializeLoggerManagerPhase extends AbstractCoreComponentInitializationPhase { - public void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException { - LoggerManager loggerManager = context.getContainer().getLoggerManager(); - - // ---------------------------------------------------------------------- - // The logger manager may have been set programmatically so we need - // to check. If it hasn't then we will try to look up a logger manager - // that may have been specified in the plexus.xml file. If that doesn't - // work then we'll programmatcially stuff in the console logger. - // ---------------------------------------------------------------------- - - if (loggerManager == null) { - try { - loggerManager = context.getContainer().lookup(LoggerManager.class); - } catch (ComponentLookupException e) { - ComponentDescriptor cd = new ComponentDescriptor(); - - cd.setRole(LoggerManager.ROLE); - - cd.setRoleHint(PlexusConstants.PLEXUS_DEFAULT_HINT); - - cd.setImplementation(ConsoleLoggerManager.class.getName()); - - try { - context.getContainer().addComponentDescriptor(cd); - } catch (CycleDetectedInComponentGraphException cre) { - throw new ContainerInitializationException("Error setting up logging manager.", cre); - } - - loggerManager = new ConsoleLoggerManager("info"); - } - - context.getContainer().setLoggerManager(loggerManager); - } - - Logger logger = loggerManager.getLoggerForComponent(PlexusContainer.class.getName()); - - context.getContainer().enableLogging(logger); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java deleted file mode 100644 index 52b2ebdff..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Jason van Zyl - */ -public class InitializeSystemPropertiesPhase extends AbstractContainerInitializationPhase { - public void execute(ContainerInitializationContext context) throws ContainerInitializationException { - PlexusConfiguration[] systemProperties = context.getContainerXmlConfiguration() - .getChild("system-properties") - .getChildren("property"); - - for (PlexusConfiguration systemProperty : systemProperties) { - String name = systemProperty.getAttribute("name", null); - - String value = systemProperty.getAttribute("value", null); - - if (name == null) { - throw new ContainerInitializationException("Missing 'name' attribute in 'property' tag. "); - } - - if (value == null) { - throw new ContainerInitializationException("Missing 'value' attribute in 'property' tag. "); - } - - System.getProperties().setProperty(name, value); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java deleted file mode 100644 index 7d6a0461b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.codehaus.plexus.container.initialization; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.source.ChainedConfigurationSource; -import org.codehaus.plexus.configuration.source.ConfigurationSource; - -/** - * @author Jason van Zyl - * @author cstamas - */ -public class InitializeUserConfigurationSourcePhase extends AbstractCoreComponentInitializationPhase { - public void initializeCoreComponent(ContainerInitializationContext context) - throws ContainerInitializationException { - ConfigurationSource existingConfigurationSource = context.getContainer().getConfigurationSource(); - - try { - // is the user overriding the ConfigurationSource (role-hint: default) or only extending it? - if (context.getContainer().hasComponent(ConfigurationSource.class, PlexusConstants.PLEXUS_DEFAULT_HINT)) { - // overriding - - ConfigurationSource cs = context.getContainer().lookup(ConfigurationSource.class); - - // swap the user provided configuration source with current one - context.getContainer().setConfigurationSource(cs); - } else { - // extending - List userConfigurationSources = - context.getContainer().lookupList(ConfigurationSource.class); - - if (userConfigurationSources.size() > 0) { - List configurationSources = - new ArrayList(userConfigurationSources.size() + 1); - - // adding user provied ones to be able to interfere - configurationSources.addAll(userConfigurationSources); - - // at the end adding the container source, to make sure config will be returned - // from plexus.xml if no user interference is given - configurationSources.add(existingConfigurationSource); - - ConfigurationSource configurationSource = new ChainedConfigurationSource(configurationSources); - - context.getContainer().setConfigurationSource(configurationSource); - } - - // register the default source, either the chained or the existing one as default - ComponentDescriptor cd = new ComponentDescriptor(); - - cd.setRole(ConfigurationSource.ROLE); - - cd.setRoleHint(PlexusConstants.PLEXUS_DEFAULT_HINT); - - cd.setImplementationClass( - context.getContainer().getConfigurationSource().getClass()); - - try { - context.getContainer().addComponentDescriptor(cd); - } catch (CycleDetectedInComponentGraphException cre) { - throw new ContainerInitializationException("Error setting up configuration source.", cre); - } - } - - } catch (ComponentLookupException e) { - throw new ContainerInitializationException("Error setting up user configuration source.", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java b/plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java deleted file mode 100644 index c03373590..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.codehaus.plexus.context; - -import java.util.Map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Context is a Map of arbitrary data associated with the container. - */ -public interface Context { - /** - * Returns true if this context contains a value for the specified key. - * - * @param key the key to search - * @return true if the key was found; false otherwise - */ - boolean contains(Object key); - - /** - * Returns the value of the key. If the key can't be found it will throw a exception. - * - * @param key the key of the value to look up. - * @return returns the value associated with the key - * @throws ContextException if the key doesn't exist - */ - Object get(Object key) throws ContextException; - - /** - * Utility method to retrieve containerContext data. - * The returned Map is an unmodifiable view. - * @return the containerContext data - * @since 1.0-alpha-18 - */ - Map getContextData(); - - /** - * Adds the item to the containerContext. - * - * @param key the key of the item - * @param value the item - * @throws IllegalStateException if this context is read-only - */ - public void put(Object key, Object value) throws IllegalStateException; - - // todo [dain] this isn't needed anymore since containers are no longer nestable - /** - * Hides the item in the containerContext. - * After remove(key) has been called, a get(key) - * will always fail, even if the parent containerContext - * has such a mapping. - * - * @param key the items key - * @throws IllegalStateException if this context is read-only - */ - void hide(Object key) throws IllegalStateException; - - /** - * Make the containerContext read-only. - * Any attempt to write to the containerContext via put() - * will result in an IllegalStateException. - */ - void makeReadOnly(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java deleted file mode 100644 index a9eea45f8..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.codehaus.plexus.context; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Exception signalling a badly formed Context. - * - * This can be thrown by Context object when a entry is not - * found. It can also be thrown manually in contextualize() - * when Component detects a malformed containerContext value. - * - * @author Avalon Development Team - * @version CVS $Revision$ $Date$ - */ -public class ContextException extends Exception { - private static final long serialVersionUID = 2030206863811644180L; - - /** - * Construct a new ContextException instance. - * - * @param message The detail message for this exception. - */ - public ContextException(final String message) { - this(message, null); - } - - /** - * Construct a new ContextException instance. - * - * @param message The detail message for this exception. - * @param throwable the root cause of the exception - */ - public ContextException(final String message, final Throwable throwable) { - super(message, throwable); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java b/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java deleted file mode 100644 index d59e856ae..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.codehaus.plexus.context; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.HashMap; - -public class ContextMapAdapter extends HashMap { - private Context context; - - public ContextMapAdapter(Context context) { - this.context = context; - } - - public Object get(Object key) { - try { - Object value = context.get(key); - - if (value instanceof String) { - return value; - } else { - return null; - } - } catch (ContextException e) { - return null; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java b/plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java deleted file mode 100644 index 17d236d5d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.codehaus.plexus.context; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * Default implementation of Context. - * - * This implementation is a static hierarchial store. It has the normal get() - * and put methods. The hide method will hide a property. When - * a property has been hidden the containerContext will not search in the parent containerContext for the value. - * - * @author Avalon Development Team - */ -public class DefaultContext implements Context { - /** - * Context data. - */ - private final ConcurrentMap contextData = new ConcurrentHashMap(); - - /** - * Is the containerContext read only. - */ - private final AtomicBoolean readOnly = new AtomicBoolean(false); - - /** - * Create an empty Context. - */ - public DefaultContext() {} - - /** - * Create a Context with specified data. The specified data is copied into the context so any subsequent updates - * to supplied map are not reflected in this context. Additionally, changes to this context are not reflected in - * the specified map. - * - * @param contextData the containerContext data - */ - public DefaultContext(Map contextData) { - if (contextData == null) { - throw new NullPointerException("contextData is null"); - } - - // check for nulls in key and value - for (Entry entry : contextData.entrySet()) { - Object key = entry.getKey(); - Object value = entry.getValue(); - if (key == null) { - throw new IllegalArgumentException("Key is null"); - } - if (value != null) { - this.contextData.put(key, value); - } - } - } - - public boolean contains(Object key) { - Object data = contextData.get(key); - - return data != null; - } - - public Object get(Object key) throws ContextException { - Object data = contextData.get(key); - - if (data == null) { - // There is no data for the key - throw new ContextException("Unable to resolve context key: " + key); - } - return data; - } - - public void put(Object key, Object value) throws IllegalStateException { - checkWriteable(); - - // check for a null key - if (key == null) { - throw new IllegalArgumentException("Key is null"); - } - - if (value == null) { - contextData.remove(key); - } else { - contextData.put(key, value); - } - } - - public void hide(Object key) throws IllegalStateException { - checkWriteable(); - - contextData.remove(key); - } - - /** - * Utility method to retrieve containerContext data - * - * @return the containerContext data - */ - public Map getContextData() { - return Collections.unmodifiableMap(contextData); - } - - /** - * Make the containerContext read-only. - * Any attempt to write to the containerContext via put() - * will result in an IllegalStateException. - */ - public void makeReadOnly() { - readOnly.set(true); - } - - /** - * Utility method to check if containerContext is writeable and if not throw exception. - * - * @throws java.lang.IllegalStateException if containerContext is read only - */ - protected void checkWriteable() throws IllegalStateException { - if (readOnly.get()) { - throw new IllegalStateException("Context is read only and can not be modified"); - } - } - - public String toString() { - return contextData.toString(); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java deleted file mode 100644 index 208906c45..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.List; - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.Phase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -public abstract class AbstractLifecycleHandler implements LifecycleHandler { - private List beginSegment; - - private List endSegment; - - // ---------------------------------------------------------------------- - // Begin Segment - // ---------------------------------------------------------------------- - - public void addBeginSegment(Phase phase) { - if (beginSegment == null) { - beginSegment = new ArrayList(); - } - - beginSegment.add(phase); - } - - public List getBeginSegment() { - return beginSegment; - } - - public void addEndSegment(Phase phase) { - if (endSegment == null) { - endSegment = new ArrayList(); - } - - endSegment.add(phase); - } - - public List getEndSegment() { - return endSegment; - } - - // ---------------------------------------------------------------------- - // Lifecylce Management - // ---------------------------------------------------------------------- - - /** - * @deprecated - */ - public void start(Object component, ComponentManager manager) throws PhaseExecutionException { - start(component, manager, manager.getContainer().getLookupRealm(component)); - } - - /** - * Start a component's lifecycle. - */ - public void start(Object component, ComponentManager manager, ClassRealm realm) throws PhaseExecutionException { - if (segmentIsEmpty(getBeginSegment())) { - return; - } - - for (Object o : getBeginSegment()) { - Phase phase = (Phase) o; - - phase.execute(component, manager, realm); - } - } - - /** - * End a component's lifecycle. - * @deprecated - */ - public void end(Object component, ComponentManager manager) throws PhaseExecutionException { - end(component, manager, manager.getContainer().getLookupRealm(component)); - } - - /** - * End a component's lifecycle. - */ - public void end(Object component, ComponentManager manager, ClassRealm contextRealm) - throws PhaseExecutionException { - if (segmentIsEmpty(getEndSegment())) { - return; - } - - for (Object o : getEndSegment()) { - Phase phase = (Phase) o; - - phase.execute(component, manager, contextRealm); - } - } - - private boolean segmentIsEmpty(List segment) { - if (segment == null || segment.size() == 0) { - return true; - } - - return false; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java deleted file mode 100644 index 73484f376..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class BasicLifecycleHandler extends AbstractLifecycleHandler { - protected String id; - - public BasicLifecycleHandler(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - /** @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable#initialize */ - public void initialize() {} -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java deleted file mode 100644 index 0ae7b707c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -/** - * @author Jason van Zyl - */ -public class DefaultLifecycleHandlerManager implements LifecycleHandlerManager { - private final ConcurrentMap lifecycleHandlers = - new ConcurrentHashMap(); - - private String defaultLifecycleHandlerId = "plexus"; - - public void addLifecycleHandler(LifecycleHandler lifecycleHandler) { - lifecycleHandlers.put(lifecycleHandler.getId(), lifecycleHandler); - } - - public void initialize() { - for (LifecycleHandler lifecycleHandler : lifecycleHandlers.values()) { - lifecycleHandler.initialize(); - } - } - - public LifecycleHandler getLifecycleHandler(String id) throws UndefinedLifecycleHandlerException { - if (id == null) { - id = defaultLifecycleHandlerId; - } - - LifecycleHandler lifecycleHandler = lifecycleHandlers.get(id); - - if (lifecycleHandler == null) { - throw new UndefinedLifecycleHandlerException("Specified lifecycle handler cannot be found: " + id); - } - - return lifecycleHandler; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java deleted file mode 100644 index a462b74df..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.Phase; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -public interface LifecycleHandler { - String getId(); - - /** - * @param phase {@link Phase} - */ - void addBeginSegment(Phase phase); - - /** - * @param phase {@link Phase} - */ - void addEndSegment(Phase phase); - - /** - * @param component The component. - * @param manager The {@link ComponentManager} - * @throws PhaseExecutionException in case of an error. - * @deprecated - */ - void start(Object component, ComponentManager manager) throws PhaseExecutionException; - - /** - * @param component The component. - * @param manager The {@link ComponentManager} - * @param realm The {@link ClassRealm}. - * @throws PhaseExecutionException in case of an error. - */ - void start(Object component, ComponentManager manager, ClassRealm realm) throws PhaseExecutionException; - - /** - * @param component The component. - * @param manager The {@link ComponentManager} - * @throws PhaseExecutionException in case of an error. - * @deprecated - */ - void end(Object component, ComponentManager manager) throws PhaseExecutionException; - - /** - * - * @param component The component. - * @param manager The {@link ComponentManager} - * @param componentContextRealm the realm used to create the component, which may not be the component's realm; this - * component could have requirements that were satisfied using components from this realm. It could be - * used to lookup the same manager components that were used to start the component. - * @throws PhaseExecutionException in case of an error. - */ - void end(Object component, ComponentManager manager, ClassRealm componentContextRealm) - throws PhaseExecutionException; - - /** - * initialize. - */ - void initialize(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java deleted file mode 100644 index 44ca6b819..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * LifecycleHandlerManager is a simple index (registry) of LifecycleHandler instances. - * - * @author Jason van Zyl - * - */ -public interface LifecycleHandlerManager { - void initialize(); - - void addLifecycleHandler(LifecycleHandler lifecycleHandler); - - LifecycleHandler getLifecycleHandler(String id) throws UndefinedLifecycleHandlerException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java deleted file mode 100644 index 29fcfec42..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.lifecycle; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class UndefinedLifecycleHandlerException extends Exception { - public UndefinedLifecycleHandlerException(String message) { - super(message); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java deleted file mode 100644 index b2028361c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.codehaus.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -public abstract class AbstractPhase implements Phase { - /** {@inheritDoc} */ - public abstract void execute(Object component, ComponentManager manager, ClassRealm realm) - throws PhaseExecutionException; - - /** - * @param component The component. - * @param manager The {@link ComponentManager}. - * @throws PhaseExecutionException in case of an error. - * @deprecated - */ - public final void execute(Object component, ComponentManager manager) throws PhaseExecutionException { - execute(component, manager, manager.getContainer().getLookupRealm(component)); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java deleted file mode 100644 index fe40e5e12..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException; - -public interface Phase { - /** - * Execute the phase. - * @param component The component. - * @param manager {@link ComponentManager} - * @param realm {@link ClassRealm} - * @throws PhaseExecutionException in case of an error. - */ - public void execute(Object component, ComponentManager manager, ClassRealm realm) throws PhaseExecutionException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java deleted file mode 100644 index b42a8de18..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public abstract class AbstractLogEnabled implements LogEnabled { - private Logger logger; - - public void enableLogging(Logger logger) { - this.logger = logger; - } - - protected Logger getLogger() { - return logger; - } - - protected void setupLogger(Object component) { - setupLogger(component, logger); - } - - protected void setupLogger(Object component, String subCategory) { - if (subCategory == null) { - throw new IllegalStateException("Logging category must be defined."); - } - - Logger logger = this.logger.getChildLogger(subCategory); - - setupLogger(component, logger); - } - - protected void setupLogger(Object component, Logger logger) { - if (component instanceof LogEnabled) { - ((LogEnabled) component).enableLogging(logger); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java deleted file mode 100644 index 8f2305fbc..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * LICENSE - */ - -/** - * @author Trygve Laugstøl - */ -public abstract class AbstractLogger implements Logger { - private int threshold; - - private String name; - - public AbstractLogger(int threshold, String name) { - if (!isValidThreshold(threshold)) { - throw new IllegalArgumentException("Threshold " + threshold + " is not valid"); - } - - this.threshold = threshold; - this.name = name; - } - - public int getThreshold() { - return threshold; - } - - public void setThreshold(int threshold) { - this.threshold = threshold; - } - - public String getName() { - return name; - } - - public void debug(String message) { - debug(message, null); - } - - public boolean isDebugEnabled() { - return threshold <= LEVEL_DEBUG; - } - - public void info(String message) { - info(message, null); - } - - public boolean isInfoEnabled() { - return threshold <= LEVEL_INFO; - } - - public void warn(String message) { - warn(message, null); - } - - public boolean isWarnEnabled() { - return threshold <= LEVEL_WARN; - } - - public void error(String message) { - error(message, null); - } - - public boolean isErrorEnabled() { - return threshold <= LEVEL_ERROR; - } - - public void fatalError(String message) { - fatalError(message, null); - } - - public boolean isFatalErrorEnabled() { - return threshold <= LEVEL_FATAL; - } - - protected boolean isValidThreshold(int threshold) { - if (threshold == LEVEL_DEBUG) { - return true; - } - if (threshold == LEVEL_INFO) { - return true; - } - if (threshold == LEVEL_WARN) { - return true; - } - if (threshold == LEVEL_ERROR) { - return true; - } - if (threshold == LEVEL_FATAL) { - return true; - } - if (threshold == LEVEL_DISABLED) { - return true; - } - - return false; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java deleted file mode 100644 index 4a6c48ced..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public abstract class AbstractLoggerManager implements LoggerManager { - /** */ - public AbstractLoggerManager() {} - - public void setThreshold(String role, int threshold) { - setThreshold(role, null, threshold); - } - - public int getThreshold(String role) { - return getThreshold(role, null); - } - - public Logger getLoggerForComponent(String role) { - return getLoggerForComponent(role, null); - } - - public void returnComponentLogger(String role) { - returnComponentLogger(role, null); - } - - /** - * Creates a string key useful as keys in Map's. - * - * @param role The component role. - * @param roleHint The component role hint. - * @return Returns a string thats useful as a key for components. - */ - protected String toMapKey(String role, String roleHint) { - if (roleHint == null) { - return role; - } else { - return role + ":" + roleHint; - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java deleted file mode 100644 index 6ba3400a1..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; - -/** - * Base class for all LoggerManagers which use cache of Loggers. - * - * @author Michal Maczka - */ -public abstract class BaseLoggerManager extends AbstractLoggerManager implements Initializable { - private Map loggerCache = new HashMap(); - - private String threshold = "info"; - - private int currentThreshold; - - public void initialize() { - currentThreshold = parseThreshold(threshold); - - if (currentThreshold == -1) { - currentThreshold = Logger.LEVEL_DEBUG; - } - } - - protected int parseThreshold(String text) { - text = text.trim().toLowerCase(Locale.ENGLISH); - - if (text.equals("debug")) { - return Logger.LEVEL_DEBUG; - } else if (text.equals("info")) { - return Logger.LEVEL_INFO; - } else if (text.equals("warn")) { - return Logger.LEVEL_WARN; - } else if (text.equals("error")) { - return Logger.LEVEL_ERROR; - } else if (text.equals("fatal")) { - return Logger.LEVEL_FATAL; - } - - return -1; - } - - /** - * Sets the threshold for all new loggers. It will NOT affect the existing loggers. - *

This is usually only set once while the logger manager is configured.

- * - * @param currentThreshold The new threshold. - */ - public void setThreshold(int currentThreshold) { - this.currentThreshold = currentThreshold; - } - - /** - * Sets the threshold for all new loggers. It will NOT affect the existing loggers. - *

This is usually only set once while the logger manager is configured.

- * - * @param currentThreshold The new threshold. - */ - public void setThresholds(int currentThreshold) { - this.currentThreshold = currentThreshold; - - for (Object o : loggerCache.values()) { - Logger logger = (Logger) o; - logger.setThreshold(currentThreshold); - } - } - - /** - * Returns the current threshold for all new loggers. - * - * @return Returns the current threshold for all new loggers. - */ - public int getThreshold() { - return currentThreshold; - } - - public void setThreshold(String role, String roleHint, int threshold) { - AbstractLogger logger; - - String key = toMapKey(role, roleHint); - - logger = (AbstractLogger) loggerCache.get(key); - - if (logger == null) { - return; // nothing to do - } - - logger.setThreshold(threshold); - } - - public int getThreshold(String role, String roleHint) { - AbstractLogger logger; - - String key = toMapKey(role, roleHint); - - logger = (AbstractLogger) loggerCache.get(key); - - if (logger == null) { - return Logger.LEVEL_DEBUG; // does not return null because that could create a NPE - } - - return logger.getThreshold(); - } - - public Logger getLoggerForComponent(String role, String roleHint) { - Logger logger; - - String key = toMapKey(role, roleHint); - - logger = (Logger) loggerCache.get(key); - - if (logger != null) { - return logger; - } - - logger = createLogger(key); - - loggerCache.put(key, logger); - - return logger; - } - - protected abstract Logger createLogger(String key); - - public void returnComponentLogger(String role, String roleHint) { - Object obj; - - String key = toMapKey(role, roleHint); - - obj = loggerCache.remove(key); - - if (obj == null) { - // TODO: use a logger! - System.err.println("There was no such logger '" + key + "' " + hashCode() + "."); - } - } - - public int getActiveLoggerCount() { - return loggerCache.size(); - } - - public String getThresholdAsString() { - return threshold; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java deleted file mode 100644 index 84a6b3f2a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - */ -public interface LogEnabled { - void enableLogging(Logger logger); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java deleted file mode 100644 index 15bb4737b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public interface Logger { - /** Typecode for debugging messages. */ - int LEVEL_DEBUG = 0; - - /** Typecode for informational messages. */ - int LEVEL_INFO = 1; - - /** Typecode for warning messages. */ - int LEVEL_WARN = 2; - - /** Typecode for error messages. */ - int LEVEL_ERROR = 3; - - /** Typecode for fatal error messages. */ - int LEVEL_FATAL = 4; - - /** Typecode for disabled log levels. */ - int LEVEL_DISABLED = 5; - - void debug(String message); - - void debug(String message, Throwable throwable); - - boolean isDebugEnabled(); - - void info(String message); - - void info(String message, Throwable throwable); - - boolean isInfoEnabled(); - - void warn(String message); - - void warn(String message, Throwable throwable); - - boolean isWarnEnabled(); - - void error(String message); - - void error(String message, Throwable throwable); - - boolean isErrorEnabled(); - - void fatalError(String message); - - void fatalError(String message, Throwable throwable); - - boolean isFatalErrorEnabled(); - - Logger getChildLogger(String name); - - int getThreshold(); - - void setThreshold(int threshold); - - String getName(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java deleted file mode 100644 index 5eed77c63..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public interface LoggerManager { - String ROLE = LoggerManager.class.getName(); - - /** - * Sets the threshold for all new loggers. It will NOT affect the existing loggers. - * - * This is usually only set once while the logger manager is configured. - * - * @param threshold The new threshold. - */ - void setThreshold(int threshold); - - /** - * Returns the current threshold for all new loggers. - * - * @return Returns the current threshold for all new loggers. - */ - int getThreshold(); - - /** - * Sets the threshold for all loggers. It affects all the existing loggers - * as well as future loggers. - * - * @param threshold The new threshold. - */ - void setThresholds(int threshold); - - // The new stuff - void setThreshold(String role, int threshold); - - void setThreshold(String role, String roleHint, int threshold); - - int getThreshold(String role); - - int getThreshold(String role, String roleHint); - - Logger getLoggerForComponent(String role); - - Logger getLoggerForComponent(String role, String roleHint); - - void returnComponentLogger(String role); - - void returnComponentLogger(String role, String hint); - - int getActiveLoggerCount(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java deleted file mode 100644 index 53c5165de..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.codehaus.plexus.logging.console; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.logging.AbstractLogger; -import org.codehaus.plexus.logging.Logger; - -/** - * Logger sending everything to the standard output streams. - * This is mainly for the cases when you have a utility that - * does not have a logger to supply. - * - * @author Avalon Development Team - */ -public final class ConsoleLogger extends AbstractLogger { - public ConsoleLogger(int threshold, String name) { - super(threshold, name); - } - - public void debug(String message, Throwable throwable) { - if (isDebugEnabled()) { - System.out.print("[DEBUG] "); - System.out.println(message); - - if (null != throwable) { - throwable.printStackTrace(System.out); - } - } - } - - public void info(String message, Throwable throwable) { - if (isInfoEnabled()) { - System.out.print("[INFO] "); - System.out.println(message); - - if (null != throwable) { - throwable.printStackTrace(System.out); - } - } - } - - public void warn(String message, Throwable throwable) { - if (isWarnEnabled()) { - System.out.print("[WARNING] "); - System.out.println(message); - - if (null != throwable) { - throwable.printStackTrace(System.out); - } - } - } - - public void error(String message, Throwable throwable) { - if (isErrorEnabled()) { - System.out.print("[ERROR] "); - System.out.println(message); - - if (null != throwable) { - throwable.printStackTrace(System.out); - } - } - } - - public void fatalError(String message, Throwable throwable) { - if (isFatalErrorEnabled()) { - System.out.print("[FATAL ERROR] "); - System.out.println(message); - - if (null != throwable) { - throwable.printStackTrace(System.out); - } - } - } - - public Logger getChildLogger(String name) { - return this; - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java b/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java deleted file mode 100644 index 96c766749..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java +++ /dev/null @@ -1,226 +0,0 @@ -package org.codehaus.plexus.logging.console; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import org.codehaus.plexus.logging.AbstractLoggerManager; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; - -/** - * This is a simple logger manager that will only write the logging statements to the console. - * - * Sample configuration: - * 
{@code
- * 
- *   org.codehaus.plexus.logging.ConsoleLoggerManager
- *   
- *     DEBUG
- *   
- * 
- * }
- * - * @author Jason van Zyl - * @author Trygve Laugstøl - */ -public class ConsoleLoggerManager extends AbstractLoggerManager implements LoggerManager, Initializable { - /** - * Message of this level or higher will be logged. - * - * This field is set by the plexus container thus the name is 'threshold'. The field - * currentThreshold contains the current setting of the threshold. - */ - private String threshold = "info"; - - private int currentThreshold; - - private Map loggers; - - /** The number of active loggers in use. */ - private int loggerCount; - - private boolean bootTimeLogger = false; - - public ConsoleLoggerManager() {} - - /** - * This special constructor is called directly when the container is bootstrapping itself. - * @param threshold The threshold. - */ - public ConsoleLoggerManager(String threshold) { - this.threshold = threshold; - - bootTimeLogger = true; - - initialize(); - } - - public void initialize() { - debug("Initializing ConsoleLoggerManager: " + this.hashCode() + "."); - // if ( !bootTimeLogger ) - // new Throwable().printStackTrace(System.err); - currentThreshold = parseThreshold(threshold); - - if (currentThreshold == -1) { - debug("Could not parse the threshold level: '" + threshold + "', setting to debug."); - currentThreshold = Logger.LEVEL_DEBUG; - } - - loggers = new HashMap(); - } - - public void setThreshold(int currentThreshold) { - this.currentThreshold = currentThreshold; - } - - public void setThresholds(int currentThreshold) { - this.currentThreshold = currentThreshold; - - for (Object o : loggers.values()) { - Logger logger = (Logger) o; - logger.setThreshold(currentThreshold); - } - } - - /** - * @return Returns the threshold. - */ - public int getThreshold() { - return currentThreshold; - } - - // new stuff - - public void setThreshold(String role, String roleHint, int threshold) { - ConsoleLogger logger; - String name; - - name = toMapKey(role, roleHint); - logger = (ConsoleLogger) loggers.get(name); - - if (logger == null) { - debug("Trying to set the threshold of a unknown logger '" + name + "'."); - return; // nothing to do - } - - logger.setThreshold(threshold); - } - - public int getThreshold(String role, String roleHint) { - ConsoleLogger logger; - String name; - - name = toMapKey(role, roleHint); - logger = (ConsoleLogger) loggers.get(name); - - if (logger == null) { - debug("Trying to get the threshold of a unknown logger '" + name + "'."); - return Logger.LEVEL_DEBUG; // does not return null because that could create a NPE - } - - return logger.getThreshold(); - } - - public Logger createLogger(int threshold, String name) { - return new ConsoleLogger(threshold, name); - } - - public Logger getLoggerForComponent(String role, String roleHint) { - Logger logger; - String name; - - name = toMapKey(role, roleHint); - logger = (Logger) loggers.get(name); - - if (logger != null) return logger; - - debug("Creating logger '" + name + "' " + this.hashCode() + "."); - logger = createLogger(getThreshold(), name); - loggers.put(name, logger); - - return logger; - } - - public void returnComponentLogger(String role, String roleHint) { - Object obj; - String name; - - name = toMapKey(role, roleHint); - obj = loggers.remove(name); - - if (obj == null) { - debug("There was no such logger '" + name + "' " + this.hashCode() + "."); - } else { - debug("Removed logger '" + name + "' " + this.hashCode() + "."); - } - } - - public int getActiveLoggerCount() { - return loggers.size(); - } - - private int parseThreshold(String text) { - text = text.trim().toLowerCase(Locale.ENGLISH); - - if (text.equals("debug")) { - return ConsoleLogger.LEVEL_DEBUG; - } else if (text.equals("info")) { - return ConsoleLogger.LEVEL_INFO; - } else if (text.equals("warn")) { - return ConsoleLogger.LEVEL_WARN; - } else if (text.equals("error")) { - return ConsoleLogger.LEVEL_ERROR; - } else if (text.equals("fatal")) { - return ConsoleLogger.LEVEL_FATAL; - } - - return -1; - } - - private String decodeLogLevel(int logLevel) { - switch (logLevel) { - case ConsoleLogger.LEVEL_DEBUG: - return "debug"; - case ConsoleLogger.LEVEL_INFO: - return "info"; - case ConsoleLogger.LEVEL_WARN: - return "warn"; - case ConsoleLogger.LEVEL_ERROR: - return "error"; - case ConsoleLogger.LEVEL_FATAL: - return "fatal"; - case ConsoleLogger.LEVEL_DISABLED: - return "disabled"; - default: - return "unknown"; - } - } - - /** - * Remove this method and all references when this code is verified. - * - * @param msg - */ - private void debug(String msg) { - // if ( !bootTimeLogger ) - // System.out.println( "[Console] " + msg ); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java deleted file mode 100644 index b30f81b9e..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; -import org.codehaus.plexus.component.configurator.ComponentConfigurator; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; -import org.codehaus.plexus.util.StringUtils; - -public class AutoConfigurePhase extends AbstractPhase { - public static final String DEFAULT_CONFIGURATOR_ID = "default"; - - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - try { - ComponentDescriptor descriptor = manager.getComponentDescriptor(); - - String configuratorId = descriptor.getComponentConfigurator(); - - if (StringUtils.isEmpty(configuratorId)) { - configuratorId = DEFAULT_CONFIGURATOR_ID; - } - - ComponentConfigurator componentConfigurator = - manager.getContainer().lookup(ComponentConfigurator.class, configuratorId); - - PlexusConfiguration configuration = - manager.getContainer().getConfigurationSource().getConfiguration(descriptor); - - if (configuration != null) { - ClassRealm realm = manager.getRealm(); - - componentConfigurator.configureComponent(object, configuration, realm); - } - } catch (ComponentLookupException e) { - throw new PhaseExecutionException( - "Unable to auto-configure component as its configurator could not be found", e); - } catch (ComponentConfigurationException e) { - throw new PhaseExecutionException("Unable to auto-configure component", e); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java deleted file mode 100644 index 8baa74c8d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; - -/** - * Configures a component. - * - * @author Dan Diephouse - */ -public interface Configurable { - void configure(PlexusConfiguration configuration) throws PlexusConfigurationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java deleted file mode 100644 index 859e8d384..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class ConfigurablePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof Configurable) { - try { - ((Configurable) object) - .configure(manager.getComponentDescriptor().getConfiguration()); - } catch (PlexusConfigurationException e) { - throw new PhaseExecutionException("Error occurred during phase execution", e); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java deleted file mode 100644 index 0f65882b4..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; - -/** - * @author Jason van Zyl - */ -public interface Contextualizable { - public void contextualize(Context context) throws ContextException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java deleted file mode 100644 index bf75d6981..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class ContextualizePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof Contextualizable) { - Context context = manager.getContainer().getContext(); - - ClassRealm origRealm = manager.getContainer().setLookupRealm(lookupRealm); - - try { - ((Contextualizable) object).contextualize(context); - } catch (ContextException e) { - throw new PhaseExecutionException("Unable to contextualize component", e); - } finally { - manager.getContainer().setLookupRealm(origRealm); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java deleted file mode 100644 index 185609725..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Disposable { - public void dispose(); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java deleted file mode 100644 index ad74ac072..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class DisposePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Disposable) { - ((Disposable) object).dispose(); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java deleted file mode 100644 index 4d29ec728..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Initializable { - public void initialize() throws InitializationException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java deleted file mode 100644 index aaf89b521..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Indicates a problem occurred when initialising a component. - * - * @author Brett Porter - */ -public class InitializationException extends Exception { - public InitializationException(String message) { - super(message); - } - - public InitializationException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java deleted file mode 100644 index b03ffd1dd..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class InitializePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof Initializable) { - try { - ((Initializable) object).initialize(); - } catch (InitializationException e) { - throw new PhaseExecutionException("Error initialising component", e); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java deleted file mode 100644 index 2a4115851..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2007 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; -import org.codehaus.plexus.logging.LogEnabled; -import org.codehaus.plexus.logging.LoggerManager; - -/** - * @author Trygve Laugstøl - */ -public class LogDisablePhase extends AbstractPhase { - public void execute(Object object, ComponentManager componentManager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof LogEnabled) { - LoggerManager loggerManager = componentManager.getContainer().getLoggerManager(); - loggerManager.returnComponentLogger(componentManager.getRole(), componentManager.getRoleHint()); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java deleted file mode 100644 index b5e301205..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2007 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; -import org.codehaus.plexus.logging.LogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; - -public class LogEnablePhase extends AbstractPhase { - public void execute(Object object, ComponentManager componentManager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof LogEnabled) { - LogEnabled logEnabled = (LogEnabled) object; - - LoggerManager loggerManager = componentManager.getContainer().getLoggerManager(); - - Logger logger = - loggerManager.getLoggerForComponent(componentManager.getRole(), componentManager.getRoleHint()); - - logEnabled.enableLogging(logger); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java deleted file mode 100644 index 0c62f936a..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Describes an error that has occurred during the execution of a phase. - * - * @author Brett Porter - */ -public class PhaseExecutionException extends Exception { - public PhaseExecutionException(String message, Throwable throwable) { - super(message, throwable); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java deleted file mode 100644 index 4ad39ae1c..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - -/** - * A ServiceLocator for PlexusContainer. - * - * @author Dan Diephouse - */ -public class PlexusContainerLocator implements ServiceLocator { - private PlexusContainer container; - - public PlexusContainerLocator(PlexusContainer container) { - this.container = container; - } - - public Object lookup(String role) throws ComponentLookupException { - return container.lookup(role); - } - - public Object lookup(String role, String roleHint) throws ComponentLookupException { - return container.lookup(role, roleHint); - } - - public Map lookupMap(String role) throws ComponentLookupException { - return container.lookupMap(role); - } - - public List lookupList(String role) throws ComponentLookupException { - return container.lookupList(role); - } - - public void release(Object component) throws ComponentLifecycleException { - container.release(component); - } - - public void releaseAll(Map components) throws ComponentLifecycleException { - container.releaseAll(components); - } - - public void releaseAll(List components) throws ComponentLifecycleException { - container.releaseAll(components); - } - - public boolean hasComponent(String componentKey) { - return container.hasComponent(componentKey); - } - - public boolean hasComponent(String role, String roleHint) { - return container.hasComponent(role, roleHint); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java deleted file mode 100644 index 57a1d6b2b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class ResumePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Suspendable) { - ((Suspendable) object).resume(); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java deleted file mode 100644 index 80b20177e..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - -/** - * Provides services to components by means of a lookup. - * - * @author Dan Diephouse - */ -public interface ServiceLocator { - // ---------------------------------------------------------------------- - // Component lookup - // ---------------------------------------------------------------------- - - Object lookup(String componentKey) throws ComponentLookupException; - - Object lookup(String role, String roleHint) throws ComponentLookupException; - - Map lookupMap(String role) throws ComponentLookupException; - - List lookupList(String role) throws ComponentLookupException; - - // ---------------------------------------------------------------------- - // Component release - // ---------------------------------------------------------------------- - - void release(Object component) throws ComponentLifecycleException; - - void releaseAll(Map components) throws ComponentLifecycleException; - - void releaseAll(List components) throws ComponentLifecycleException; - - // ---------------------------------------------------------------------- - // Component discovery - // ---------------------------------------------------------------------- - - boolean hasComponent(String componentKey); - - boolean hasComponent(String role, String roleHint); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java deleted file mode 100644 index 6c0f7eedc..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Indicates that a class wants a hold on a ServiceLocator. - * - * @author Dan Diephouse - */ -public interface Serviceable { - void service(ServiceLocator locator); -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java deleted file mode 100644 index f648a483f..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class ServiceablePhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Serviceable) { - PlexusContainer container = manager.getContainer(); - - ((Serviceable) object).service(new PlexusContainerLocator(container)); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java deleted file mode 100644 index cbba44360..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class StartPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof Startable) { - try { - ((Startable) object).start(); - } catch (StartingException e) { - throw new PhaseExecutionException("Error starting component", e); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java deleted file mode 100644 index d56286124..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface Startable { - void start() throws StartingException; - - void stop() throws StoppingException; -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java deleted file mode 100644 index ae81fd976..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Error occuring while starting a component. - * - * @author Brett Porter - */ -public class StartingException extends Exception { - public StartingException(String message) { - super(message); - } - - public StartingException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java deleted file mode 100644 index 1acc2272b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class StopPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) - throws PhaseExecutionException { - if (object instanceof Startable) { - try { - ((Startable) object).stop(); - } catch (StoppingException e) { - throw new PhaseExecutionException("Error stopping component", e); - } - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java deleted file mode 100644 index c68c5acd9..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Error occuring while starting a component. - * - * @author Brett Porter - */ -public class StoppingException extends Exception { - public StoppingException(String message) { - super(message); - } - - public StoppingException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java deleted file mode 100644 index 16d0f8a1d..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class SuspendPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Suspendable) { - ((Suspendable) object).suspend(); - } - } -} diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java b/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java deleted file mode 100644 index ae675450b..000000000 --- a/plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.personality.plexus.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface Suspendable { - void suspend(); - - void resume(); -} diff --git a/plexus-container-default/src/main/mdo/components.mdo b/plexus-container-default/src/main/mdo/components.mdo deleted file mode 100644 index 0fb934404..000000000 --- a/plexus-container-default/src/main/mdo/components.mdo +++ /dev/null @@ -1,245 +0,0 @@ - - - - plexus-components - PlexusComponents - - This is a documentation for the Plexus Components descriptor: META-INF/plexus/components.xml.

-

An XSD is available at - http://plexus.codehaus.org/xsd/components-1.3.0.xsd. -

]]> - - - - - ComponentSetDescriptor - javadoc.]]> - - 1.0.0+ - - - components - 1.0.0+ - - ComponentDescriptor - * - - The component descriptors that can be found within this component set descriptor. - - - dependencies - 1.0.0+ - - ComponentDependency - * - - The dependencies that are required by the set of components found in this component set descriptor. - - - - - - ComponentDescriptor - javadoc.]]> - - 1.0.0+ - - - role - 1.0.0+ - String - the role of this component. - - - role-hint - 1.0.0+ - String - the role-hint of this component. - - - implementation - 1.0.0+ - String - - the implementation of this component. Implementation is a string denoting a FQCN in normal Java - components, or some other name or file for other component factory implementations. - - - - version - 1.0.0+ - String - a specific point in a components's project timeline. i.e. version 1, or 2.1.4 - - - component-type - 1.0.0+ - String - the type of this component. - - - instantiation-strategy - 1.0.0+ - String - the type of instantiation strategy for this component: one of "per-lookup", "singleton", "keep-alive" or "poolable". - singleton - - - lifecycle-handler - 1.0.0+ - String - the lifecycle-handler for this component. For example, "basic", "passive", "bootstrap". - - - component-profile - 1.0.0+ - String - - - - component-composer - 1.0.0+ - String - - the ID of the type of composer this component will use. For example, "setter" or "field" for the - different types of dependency injection. - - - - component-configurator - 1.0.0+ - String - - the type of component configurator for this project. For example "basic" for normal, or "map-oriented" - for map oriented components. - - - - component-factory - 1.0.0+ - String - an id of the factory used to create this component. For example, "jruby" will use a JRuby factory. - - - description - 1.0.0+ - String - a human-readable description of this component. - - - alias - 1.0.0+ - String - an alias for this component. An alias is as an alternate name other than the normal key. - - - isolated-realm - 1.0.0+ - boolean - true if this may be in an isolated classrealm. - - - configuration - 1.0.0+ - DOM - configuration values defined for this component. - - - requirements - 1.0.0+ - - ComponentRequirement - * - - project requirements to this component. - - - - - ComponentRequirement - - This represents a component that is required by another component. - - 1.0.0+ - - - role - 1.0.0+ - String - the role of the required component. - - - field-name - 1.0.0+ - String - the name of the field that will be populated by the required component. - - - role-hint - 1.0.0+ - String - the role-hint of the required component. - default - - - role-hints - 1.0.0+ - - String - * - - the role-hints of the required component. - - - optional - 1.3.0+ - boolean - - Controls whether a failure to satisfy this requirement can be tolerated by host component or whether construction - of the host component should also fail. - - - - - - ComponentDependency - - - 1.0.0+ - - - artifact-id - 1.0.0+ - String - the dependency's artifact ID. - - - group-id - 1.0.0+ - String - the dependency's group ID. - - - type - 1.0.0+ - String - the type of dependency, for example a "jar". - - - version - 1.0.0+ - String - the point in a project's development timeline - - - - - diff --git a/plexus-container-default/src/main/mdo/plexus.mdo b/plexus-container-default/src/main/mdo/plexus.mdo deleted file mode 100644 index 42d3834eb..000000000 --- a/plexus-container-default/src/main/mdo/plexus.mdo +++ /dev/null @@ -1,190 +0,0 @@ - - - - plexus-configuration - PlexusConfiguration - - This is a Work In Progress for a documentation for the Plexus Container descriptor: META-INF/plexus/plexus.xml.

-

An XSD will be available at - http://plexus.codehaus.org/xsd/plexus-1.3.0.xsd. -

-

Note that since plexus.xml is a superset of components.xml, - this documentation only focuses on elements only available in plexus.xml.

- ]]> - - - - - PlexusDescriptor - - - see org.codehaus.plexus.configuration.PlexusConfigurationMerger - 1.0.0+ - - - load-on-start - 1.0.0+ - TBD - DOM - - - system-properties - 1.0.0+ - TBD - DOM - - - configurations-directory - 1.0.0+ - TBD - DOM - - - logging - 1.0.0+ - TBD - DOM - - - component-repository - 1.0.0+ - TBD - DOM - - - resources - 1.0.0+ - TBD - DOM - - - component-manager-manager - 1.0.0+ - TBD - DOM - - - component-discoverer-manager - 1.0.0+ - TBD - - ComponentDiscovererManager - - - - component-factory-manager - 1.0.0+ - TBD - DOM - - - lifecycle-handler-manager - 1.0.0+ - TBD - DOM - - - component-composer-manager - 1.0.0+ - TBD - DOM - - - components - 1.0.0+ - DOM - components.xml.]]> - - - - - - - ComponentDiscovererManager - org.codehaus.plexus.component.discovery.ComponentDiscovererManager - source - javadoc.]]> - - 1.0.0+ - - - implementation - 1.0.0+ - Implementation class. - String - - - listeners - 1.0.0+ - - * - ComponentDiscoveryListener - - - - component-discoverers - 1.0.0+ - - * - ComponentDiscoverer - - - - - - ComponentDiscoveryListener - org.codehaus.plexus.component.discovery.ComponentDiscoveryListener - source - javadoc.]]> - - 1.0.0+ - - - implementation - 1.0.0+ - Implementation class. - String - - - configuration - 1.0.0+ - Configuration of the class. - Content - - - - - ComponentDiscoverer - org.codehaus.plexus.component.discovery.ComponentDiscoverer - source - javadoc.]]> - - 1.0.0+ - - - implementation - 1.0.0+ - Implementation class. - String - - - configuration - 1.0.0+ - Configuration of the class. - Content - - - - - diff --git a/plexus-container-default/src/main/resources/META-INF/plexus/components.xml b/plexus-container-default/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index 3a4d4d7d1..000000000 --- a/plexus-container-default/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - org.codehaus.plexus.component.configurator.BasicComponentConfigurator - org.codehaus.plexus.component.configurator.ComponentConfigurator - basic - - - org.codehaus.plexus.component.configurator.MapOrientedComponentConfigurator - org.codehaus.plexus.component.configurator.ComponentConfigurator - map-oriented - - - \ No newline at end of file diff --git a/plexus-container-default/src/site/apt/index.apt b/plexus-container-default/src/site/apt/index.apt deleted file mode 100644 index 9bbe8284c..000000000 --- a/plexus-container-default/src/site/apt/index.apt +++ /dev/null @@ -1,43 +0,0 @@ - ----- - plexus-container-default - ----- - Hervé Boutemy - ----- - 2009-10-06 - ----- - -Overview - - <<>> is Plexus' (IoC) container. It is composed of: - - * its public API: the root class is - <<<{{{./apidocs/org/codehaus/plexus/PlexusContainer.html}org.codehaus.plexus.PlexusContainer}}>>>, - - * its default implementation: the root class is - <<<{{{./apidocs/org/codehaus/plexus/DefaultPlexusContainer.html}org.codehaus.plexus.DefaultPlexusContainer}}>>>. - - [] - - - Default implementation reads configuration in XML files: - - * multiple <<<{{{./plexus-components.html}META-INF/plexus/components.xml}}>>> files that declare components, - - * one <<<{{{./plexus-configuration.html}META-INF/plexus/plexus.xml}}>>> file that can be used to configure - the plexus container and runtime in addition to declaring components. - - [] - - But it is not limited to these files: Plexus container is by nature very extensible, it can be configured - programmatically too or extended to read configuration from any source. It is used for example in Maven 2 to - read plugins configuration from <<>> and instanciate Mojos downloaded from - Maven repositories. - -* Deprecated - - <<>> is replaced by: - - * {{{https://github.com/eclipse/sisu.inject}Sisu container}}, reading <<>> index files, - - * and optional {{{https://github.com/eclipse/sisu.plexus}Plexus shim <<>>}} for compatibility with legacy Plexus <<>>. - See also Plexus shim {{{https://eclipse.github.io/sisu.plexus/apidocs/reference/packages.html}javadoc}}. diff --git a/plexus-container-default/src/site/site.xml b/plexus-container-default/src/site/site.xml deleted file mode 100644 index 6561cc283..000000000 --- a/plexus-container-default/src/site/site.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/DefaultComponentLookupManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/DefaultComponentLookupManagerTest.java deleted file mode 100644 index 3620c21a8..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/DefaultComponentLookupManagerTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.codehaus.plexus; - -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.test.ComponentA; - -/** - * @author Trygve Laugstøl - */ -public class DefaultComponentLookupManagerTest extends PlexusTestCase { - public void testLookupsWithAndWithoutRoleHint() throws Exception { - String resource = getConfigurationName("components.xml"); - - System.out.println("resource = " + resource); - - assertNotNull(resource); - - ContainerConfiguration c = - new DefaultContainerConfiguration().setName("test").setContainerConfiguration(resource); - - DefaultPlexusContainer container = new DefaultPlexusContainer(c); - - try { - container.lookup(ComponentA.class); - - fail("Expected exception"); - } catch (ComponentLookupException e) { - // expected - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/DyanamicComponentKungFuTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/DyanamicComponentKungFuTest.java deleted file mode 100644 index 2e191ff92..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/DyanamicComponentKungFuTest.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * This is the start of the sketch which outlines some of the things - * I would like to do with components during runtime. - * - * @author Jason van Zyl - * - */ -public class DyanamicComponentKungFuTest extends TestCase { - /** - * Component additions during container operation. - * - *
    - *
  1. Add a component at runtime - *
      - *
    • Additions could be made by specifying an URL which will be compatible with Wagon - * and specifically Maven's way of using Wagon.
      • - *
    - *
    2. - * - *
  2. Configure the dynamically added component - *
      - *
    • We need to be able to deal with different flavours of components but we can focus - * on Plexus components to start with. But some components may have meta information - * and some may not like pico components. But one of the first flavours I want to - * support is phoenix components because I specifically need the FTP server.
      • - *
    - *
    3. - * - *
  3. Let the component perform its role
    4. - *
  4. Suspend the component - *
      - *
    1. Define the criteria for which we can suspend a component - *
        - *
      • When there are no client connections?
        • - *
      • Even when there are no connections and a client tries to obtain a connection what do we do?
        • - *
      • If we are in desperate need to suspend the component, say for urgent security requirement, and - * clients simply won't bugger off what do we do?
        • - *
      - *
      2. - *
    - *
    5. - * - *
  5. Reconfigure the component
    6. - * - *
  6. Resume the component
    7. - * - *
  7. Let the component perform its role
    8. - * - *
  8. Release the component
    9. - *
- * - * @throws Exception in case of a failure. - */ - public void testAdditionOfComponentDuringContainerOperation() throws Exception {} - - /** - * Component replacement during container operation. - * - * This will force the design of a mechanism where the components communicate - * with one another via a connector. In order for components to be replaced - * dynamically the components cannot be directly coupled to one another. - * - * How to decide if a component is a suitable replacement given the versions - * of the specifications of the component and any required components if the - * component is a composite component. - * - * Definitely need to simulate the connection (a MockConnection) during - * runtime to make sure that in the event something goes wrong the container - * can just refuse to allow the component substitution. This shouldn't be trial - * and error but until much field testing has occurred I'm sure there will be - * instances where miscalculations happen simply due to lack of experience and - * usage with dynamic component replacement. - * - * @throws Exception in case of a failure. - */ - public void testComponentReplacementDuringContainerOperation() throws Exception {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusJUnit4TestCaseTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusJUnit4TestCaseTest.java deleted file mode 100644 index 3a72f9d51..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusJUnit4TestCaseTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus; - -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.Test; -import org.junit.runner.JUnitCore; - -import static org.junit.Assert.*; - -public class PlexusJUnit4TestCaseTest { - - private static AtomicBoolean run = new AtomicBoolean(false); - - public static class MyTest extends PlexusJUnit4TestCase { - - @Test - public void yeah() { - run.set(true); - } - } - - @Test - public void runMytest() { - JUnitCore.runClasses(MyTest.class); - assertTrue(run.get()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusTestCaseTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusTestCaseTest.java deleted file mode 100644 index b8d2eda24..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/PlexusTestCaseTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.codehaus.plexus; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; - -import junit.framework.TestCase; -import org.codehaus.plexus.component.discovery.DiscoveredComponent; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.test.DefaultLoadOnStartService; - -/** - * @author Jason van Zyl - */ -public class PlexusTestCaseTest extends TestCase { - private String basedir; - - public void setUp() { - basedir = System.getProperty("basedir"); - - if (basedir == null) { - basedir = new File(".").getAbsolutePath(); - } - } - - public void testPlexusTestCase() throws Exception { - PlexusTestCase tc = new PlexusTestCase() {}; - - tc.setUp(); - - try { - tc.lookup(DiscoveredComponent.class, "unknown"); - - fail("Expected ComponentLookupException."); - } catch (ComponentLookupException ex) { - assertTrue(true); - } - - // This component is discovered from src/test/META-INF/plexus/components.xml - DiscoveredComponent component = tc.lookup(DiscoveredComponent.class); - - assertNotNull(component); - - assertNotNull(tc.getClassLoader()); - - tc.tearDown(); - } - - public void testLoadOnStartComponents() throws Exception { - PlexusTestCase tc = new PlexusTestCase() { - protected String getCustomConfigurationName() { - return PlexusTestCase.getTestConfiguration(getClass()); - } - }; - - tc.setupContainer(); - - // Assert that the load on start component has started. - - assertTrue("The load on start components haven't been started.", DefaultLoadOnStartService.isStarted); - - tc.tearDown(); - } - - public void testGetFile() { - File file = PlexusTestCase.getTestFile("pom.xml"); - - assertTrue(file.exists()); - - file = PlexusTestCase.getTestFile(basedir, "pom.xml"); - - assertTrue(file.exists()); - } - - public void testGetPath() { - File file = new File(PlexusTestCase.getTestPath("pom.xml")); - - assertTrue(file.exists()); - - file = new File(PlexusTestCase.getTestPath(basedir, "pom.xml")); - - assertTrue(file.exists()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/MapOrientedComponentProcessingTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/MapOrientedComponentProcessingTest.java deleted file mode 100644 index 3fbec0dae..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/MapOrientedComponentProcessingTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.codehaus.plexus.component; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; - -import junit.framework.TestCase; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentRequirement; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.logging.LoggerManager; - -public class MapOrientedComponentProcessingTest extends TestCase { - - public void testShouldFindAndInitializeMapOrientedComponent() throws Exception { - PlexusContainer embedder = new DefaultPlexusContainer(); - - ComponentDescriptor descriptor = - new ComponentDescriptor(TestMapOrientedComponent.class, embedder.getContainerRealm()); - - descriptor.setRole(TestMapOrientedComponent.ROLE); - - descriptor.setImplementation(TestMapOrientedComponent.ROLE); - - descriptor.setComponentComposer("map-oriented"); - - descriptor.setComponentConfigurator("map-oriented"); - - ComponentRequirement requirement = new ComponentRequirement(); - - requirement.setFieldName("testRequirement"); - - requirement.setRole(LoggerManager.ROLE); - - descriptor.addRequirement(requirement); - - PlexusConfiguration param = new XmlPlexusConfiguration("testParameter"); - - param.setValue("testValue"); - - PlexusConfiguration configuration = new XmlPlexusConfiguration("configuration"); - - configuration.addChild(param); - - descriptor.setConfiguration(configuration); - - embedder.addComponentDescriptor(descriptor); - - TestMapOrientedComponent component = embedder.lookup(TestMapOrientedComponent.class); - - Map context = component.getContext(); - - assertTrue( - "requirement (LogManager) missing from containerContext.", - (context.get("testRequirement") instanceof LoggerManager)); - - assertEquals("parameter missing from containerContext.", "testValue", context.get("testParameter")); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/PlexusTestCaseTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/PlexusTestCaseTest.java deleted file mode 100644 index 867afa453..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/PlexusTestCaseTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.codehaus.plexus.component; - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; - -public class PlexusTestCaseTest extends PlexusTestCase { - - private static final String CUSTOM_PROPERTY = "custom.property"; - private static final String CUSTOM_VALUE = "custom.value"; - - @Override - protected void customizeContext(Context context) { - super.customizeContext(context); - - context.put(CUSTOM_PROPERTY, CUSTOM_VALUE); - } - - public void testCustomizeContext() throws ContextException { - String value = (String) getContainer().getContext().get(CUSTOM_PROPERTY); - - assertEquals(CUSTOM_VALUE, value); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/TestMapOrientedComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/TestMapOrientedComponent.java deleted file mode 100644 index 3660e671a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/TestMapOrientedComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.codehaus.plexus.component; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; -import java.util.TreeMap; - -import org.codehaus.plexus.component.repository.ComponentRequirement; - -public class TestMapOrientedComponent implements MapOrientedComponent { - - public static final String ROLE = TestMapOrientedComponent.class.getName(); - - private Map context = new TreeMap(); - - public void addComponentRequirement(ComponentRequirement requirementDescriptor, Object requirementValue) { - context.put(requirementDescriptor.getFieldName(), requirementValue); - } - - public void setComponentConfiguration(Map componentConfiguration) { - context.putAll(componentConfiguration); - } - - public Map getContext() { - return context; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractComponent.java deleted file mode 100644 index 340f36f33..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractComponent.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class AbstractComponent implements Component { - private ComponentA componentA; - - public ComponentA getComponentA() { - return componentA; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractCompositionResolverTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractCompositionResolverTest.java deleted file mode 100644 index e3528b9ec..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/AbstractCompositionResolverTest.java +++ /dev/null @@ -1,208 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import junit.framework.TestCase; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.io.PlexusTools; - -/** - * - * - * @author Jason van Zyl - * - */ -public abstract class AbstractCompositionResolverTest extends TestCase { - - /** - * - * @return {@link CompositionResolver} - */ - protected abstract CompositionResolver getCompositionResolver(); - - // ------------------------------------------------------------------------ - // - // +-------+ +-------+ - // | c1 | --------> | c2 | - // +-------+ +-------+ - // | - // | - // V - // +-------+ - // | c3 | - // +-------+ - // - // ------------------------------------------------------------------------ - public void testSimpleComponentResolution() throws Exception { - String cc1 = "" + " java.lang.String" - + " c1" - + " " - + " " - + " c2" - + " " - + " " - + " c3" - + " " - + " " - + ""; - - String cc2 = "" + " java.lang.String" - + " c2" - + ""; - - String cc3 = "" + " java.lang.String" - + " c3" - + ""; - - ClassWorld classWorld = new ClassWorld("test", Thread.currentThread().getContextClassLoader()); - ClassRealm realm = classWorld.getRealm("test"); - - CompositionResolver compositionResolver = getCompositionResolver(); - - ComponentDescriptor c1 = PlexusTools.buildComponentDescriptor(cc1, realm); - - ComponentDescriptor c2 = PlexusTools.buildComponentDescriptor(cc2, realm); - - ComponentDescriptor c3 = PlexusTools.buildComponentDescriptor(cc3, realm); - - compositionResolver.addComponentDescriptor(c1); - - compositionResolver.addComponentDescriptor(c2); - - compositionResolver.addComponentDescriptor(c3); - - List dependencies = compositionResolver.getRequirements(c1.getRole(), c1.getRoleHint()); - - assertEquals(2, dependencies.size()); - - assertTrue(dependencies.contains(c2.getRole() + CompositionResolver.SEPARATOR_CHAR + c2.getRoleHint())); - - assertTrue(dependencies.contains(c3.getRole() + CompositionResolver.SEPARATOR_CHAR + c2.getRoleHint())); - - assertEquals(2, dependencies.size()); - } - - // ------------------------------------------------------------------------ - // - // +-------+ +-------+ - // | c1 | --------> | c2 | - // +-------+ +-------+ - // | - // | - // V - // +-------+ +-------+ - // | c3 | --------> | c4 | - // +-------+ +-------+ - // | - // | - // V - // +-------+ - // | c5 | - // +-------+ - // - // ------------------------------------------------------------------------ - public void testComplexComponentResolution() throws Exception { - String cc1 = "" + " java.lang.String" - + " c1" - + " " - + " " - + " c2" - + " " - + " " - + " c3" - + " " - + " " - + ""; - - String cc2 = "" + " java.lang.String" - + " c2" - + ""; - - String cc3 = "" + " java.lang.String" - + " c3" - + " " - + " " - + " c4" - + " " - + " " - + " c5" - + " " - + " " - + ""; - - String cc4 = "" + " java.lang.String" - + " c4" - + ""; - - String cc5 = "" + " java.lang.String" - + " c5" - + ""; - - ClassWorld classWorld = new ClassWorld("test", Thread.currentThread().getContextClassLoader()); - ClassRealm realm = classWorld.getRealm("test"); - - CompositionResolver compositionResolver = getCompositionResolver(); - - ComponentDescriptor c1 = PlexusTools.buildComponentDescriptor(cc1, realm); - - ComponentDescriptor c2 = PlexusTools.buildComponentDescriptor(cc2, realm); - - ComponentDescriptor c3 = PlexusTools.buildComponentDescriptor(cc3, realm); - - ComponentDescriptor c4 = PlexusTools.buildComponentDescriptor(cc4, realm); - - ComponentDescriptor c5 = PlexusTools.buildComponentDescriptor(cc5, realm); - - compositionResolver.addComponentDescriptor(c1); - - compositionResolver.addComponentDescriptor(c2); - - compositionResolver.addComponentDescriptor(c3); - - compositionResolver.addComponentDescriptor(c4); - - compositionResolver.addComponentDescriptor(c5); - - List dependencies = compositionResolver.getRequirements(c1.getRole(), c1.getRoleHint()); - - assertEquals(2, dependencies.size()); - - // I just leave this at the moment as I am just 99% sure that this is not needed and not - // correct. compositionResolver.getComponentDependencies() should return only direct dependencies - // - // I will need to add a method like getSortedComponents() - // which will do topological sort of DAG and return list of ordered component which can be used - // by ComponentComposer. - // Possibility of checking if there are cycles probably also must be exposed in API (DAG has it alredy) - // and it should be used - // I can implement cycle detecting from single node (source) as after adding new component - // we don't have to probably check entire graph but we will probably have to check - // if there are cycles. - - /** - * // c5 must come before c3 - * assertTrue( dependencies.indexOf( "c5" ) < dependencies.indexOf( "c3" ) ); - * - * // c4 must come before c3 - * assertTrue( dependencies.indexOf( "c4" ) < dependencies.indexOf( "c3" ) ); - */ - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/Component.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/Component.java deleted file mode 100644 index 6368a9d3d..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/Component.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Component {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentA.java deleted file mode 100644 index fea5dc33a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentA.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentA { - String ROLE = ComponentA.class.getName(); - - ComponentB getComponentB(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentB.java deleted file mode 100644 index f9625fc06..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentB.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentB { - ComponentC getComponentC(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentC.java deleted file mode 100644 index 1a473c2de..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentC.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentC {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentD.java deleted file mode 100644 index 501acc81b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentD.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentD {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentE.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentE.java deleted file mode 100644 index 9c38c6bef..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentE.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ComponentE {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentF.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentF.java deleted file mode 100644 index 35d40705f..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentF.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -/** - * @author Michal Maczka - */ -public class ComponentF { - private ComponentA componentA; - private ComponentB componentB; - private ComponentC[] componentC; - private List componentD; - private Map componentE; - - public ComponentA getComponentA() { - return componentA; - } - - public void setComponentA(ComponentA componentA) { - this.componentA = componentA; - } - - public ComponentB getComponentB() { - return componentB; - } - - public void setComponentB(ComponentB componentB) { - this.componentB = componentB; - } - - public ComponentC[] getComponentC() { - return componentC; - } - - public void setComponentC(ComponentC[] componentC) { - this.componentC = componentC; - } - - public List getComponentD() { - return componentD; - } - - public void setComponentD(List componentD) { - this.componentD = componentD; - } - - public Map getComponentE() { - return componentE; - } - - public void setComponentE(Map componentE) { - this.componentE = componentE; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentRealmCompositionTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentRealmCompositionTest.java deleted file mode 100644 index c7c5ba920..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentRealmCompositionTest.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.codehaus.plexus.component.composition; - -import java.io.File; -import java.net.URL; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; - -import static org.codehaus.plexus.PlexusConstants.PLEXUS_DEFAULT_HINT; - -/** @author Jason van Zyl */ -public class ComponentRealmCompositionTest extends PlexusTestCase { - // - // Component archives - // - private static final String PLUGIN_0_JAR = "src/test/test-components/plugin0-1.0-SNAPSHOT.jar"; - private static final String PLUGIN_1_JAR = "src/test/test-components/plugin1-1.0-SNAPSHOT.jar"; - private static final String COMPONENT_A_JAR = "src/test/test-components/component-a-1.0-SNAPSHOT.jar"; - private static final String COMPONENT_B_JAR = "src/test/test-components/component-b-1.0-SNAPSHOT.jar"; - private static final String COMPONENT_C_JAR = "src/test/test-components/component-c-1.0-SNAPSHOT.jar"; - private static final String ARCHIVER_JAR = "src/test/test-components/plexus-archiver-1.0-alpha-8.jar"; - - // - // Component roles - // - private static final String PLUGIN_0_ROLE = "org.codehaus.plexus.plugins.Plugin0"; - private static final String PLUGIN_1_ROLE = "org.codehaus.plexus.plugins.Plugin1"; - - // - // Component realms - // - private static final String PLUGIN_0_REALM = "plugin0Realm"; - private static final String PLUGIN_1_REALM = "plugin1Realm"; - - protected void setUp() throws Exception { - super.setUp(); - - // Create ClassRealm plugin0 with plugin0 -> A, plugin0 -> B - createClassRealm(PLUGIN_0_REALM, PLUGIN_0_JAR, COMPONENT_A_JAR, COMPONENT_B_JAR, ARCHIVER_JAR); - - // Create ClassRealm plugin1 with plugin1 -> A, plugin1 -> C - createClassRealm(PLUGIN_1_REALM, PLUGIN_1_JAR, COMPONENT_A_JAR, COMPONENT_C_JAR, ARCHIVER_JAR); - } - - /* - * We are testing that when the same component implementation exists in more then one - * realm and components depend on those implementations, that the right realm is used - * to wire up the components. - * - * An example of this in practice are Maven plugins where each plugin is loaded into - * a separate realm and the plugin may have dependencies on other components. We want - * to make sure that a requirement, say a JarArchiver, for a given component, say the - * maven-jar-plugin, is wired up with a JarArchiver taken from the same realm as the - * maven-jar-plugin and not a different realm. - */ - - public void testCompositionWhereTheSameImplementationExistsInDifferentRealms() throws Exception { - // Plugin0 - getContainer().lookup(PLUGIN_0_ROLE); - - // Plugin1 - getContainer().lookup(PLUGIN_1_ROLE); - - // Plugin0(alt) - getContainer().lookup(PLUGIN_0_ROLE, "alt"); - - // Plugin1(alt) - getContainer().lookup(PLUGIN_1_ROLE, "alt"); - } - - public void testThatASingletonComponentIntheCoreRealmWhenLookedUpInComponentRealmsYieldsTheSameInstance() - throws Exception {} - - public void testMultiRealmLookupMap() throws Exception { - Map plugin0Map = getContainer().lookupMap(PLUGIN_0_ROLE); - assertNotNull("plugin0Map is null", plugin0Map); - assertNotNull("plugin0Map does not contain a DefaultPlugin0", plugin0Map.get(PLEXUS_DEFAULT_HINT)); - assertNotNull("plugin0Map does not contain a AltPlugin0", plugin0Map.get("alt")); - assertEquals("Expected only 2 components in plugin0Map", 2, plugin0Map.size()); - - Map plugin1Map = getContainer().lookupMap(PLUGIN_1_ROLE); - assertNotNull("plugin1Map is null", plugin1Map); - assertNotNull("plugin1Map does not contain a DefaultPlugin1", plugin1Map.get(PLEXUS_DEFAULT_HINT)); - assertNotNull("plugin1Map does not contain a AltPlugin1", plugin1Map.get("alt")); - assertEquals("Expected only 2 components in plugin1Map", 2, plugin1Map.size()); - } - - public void testMultiRealmLookupList() throws Exception { - List plugin0List = getContainer().lookupList(PLUGIN_0_ROLE); - assertNotNull("plugin0List is null", plugin0List); - Map plugin0Map = mapByClassSimpleName(plugin0List); - assertNotNull("plugin0List does not contain a DefaultPlugin0", plugin0Map.get("DefaultPlugin0")); - assertNotNull("plugin0List does not contain a AltPlugin0", plugin0Map.get("AltPlugin0")); - assertEquals("Expected only 2 components in plugin0Map", 2, plugin0Map.size()); - - List plugin1List = getContainer().lookupList(PLUGIN_1_ROLE); - assertNotNull("plugin1List is null", plugin1List); - Map plugin1Map = mapByClassSimpleName(plugin1List); - assertNotNull("plugin1List does not contain a DefaultPlugin1", plugin1Map.get("DefaultPlugin1")); - assertNotNull("plugin1List does not contain a AltPlugin1", plugin1Map.get("AltPlugin1")); - assertEquals("Expected only 2 components in plugin0Map", 2, plugin1Map.size()); - } - - private ClassRealm createClassRealm(String id, String... jars) throws Exception { - // create the realm - ClassRealm classRealm = getContainer().createChildRealm(id); - - // populate the realm - for (String jar : jars) { - File file = new File(jar); - assertTrue(jar + " is not a file", file.isFile()); - - URL url = file.toURI().toURL(); - classRealm.addURL(url); - } - - // descover all component definitions in the realm and register them with the repository - getContainer().discoverComponents(classRealm); - - return classRealm; - } - - private Map mapByClassSimpleName(List objects) { - Map map = new TreeMap(); - for (Object object : objects) { - map.put(object.getClass().getSimpleName(), object); - } - return map; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentWithSeveralFieldsOfTheSameType.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentWithSeveralFieldsOfTheSameType.java deleted file mode 100644 index b113c7e4a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/ComponentWithSeveralFieldsOfTheSameType.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Trygve Laugstøl - */ -public class ComponentWithSeveralFieldsOfTheSameType { - private ComponentE one; - - private ComponentE two; - - public ComponentE getOne() { - return one; - } - - public ComponentE getTwo() { - return two; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponent.java deleted file mode 100644 index 708319e90..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponent.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultComponent extends AbstractComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentA.java deleted file mode 100644 index 85da06c96..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentA.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultComponentA implements ComponentA { - private ComponentB componentB; - - private String host; - - private String port; - - // Just so we can retrieve the value of componentB for testing. */ - public ComponentB getComponentB() { - return componentB; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentB.java deleted file mode 100644 index 71405d3e4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentB.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Jason van Zyl - * - */ -public class DefaultComponentB implements ComponentB { - private ComponentC componentC; - - public ComponentC getComponentC() { - return componentC; - } - - public void setComponentC(ComponentC componentC) { - System.out.println("Setting componentC:" + componentC); - - this.componentC = componentC; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentC.java deleted file mode 100644 index 279f9fca3..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentC.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultComponentC implements ComponentC {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentComposerManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentComposerManagerTest.java deleted file mode 100644 index 9b8b12e72..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultComponentComposerManagerTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusTestCase; - -/** - * @author Michal Maczka - */ -public class DefaultComponentComposerManagerTest extends PlexusTestCase { - protected String getCustomConfigurationName() { - return "org/codehaus/plexus/component/composition/components.xml"; - } - - public void testComposition() throws Exception { - ComponentA componentA = lookup(ComponentA.class); - - assertNotNull(componentA); - - ComponentB componentB = componentA.getComponentB(); - - assertNotNull(componentB); - - ComponentC componentC = componentB.getComponentC(); - - assertNotNull(componentC); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultCompositionResolverTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultCompositionResolverTest.java deleted file mode 100644 index 021e40dad..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/composition/DefaultCompositionResolverTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.component.composition; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultCompositionResolverTest extends AbstractCompositionResolverTest { - protected CompositionResolver getCompositionResolver() { - return new DefaultCompositionResolver(); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponent.java deleted file mode 100644 index 2179af6be..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class AbstractComponent implements Component { - private String name; - - public String getName() { - return name; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponentConfiguratorTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponentConfiguratorTest.java deleted file mode 100644 index e04e8c2bd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractComponentConfiguratorTest.java +++ /dev/null @@ -1,850 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.io.File; -import java.io.StringReader; -import java.lang.annotation.ElementType; -import java.net.URI; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.Vector; - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.component.configurator.expression.TypeAwareExpressionEvaluator; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.io.PlexusTools; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; - -/** - * @author Michal Maczka - */ -public abstract class AbstractComponentConfiguratorTest extends PlexusTestCase { - protected void configureComponent(Object component, ComponentDescriptor descriptor, ClassRealm realm) - throws Exception { - ComponentConfigurator cc = getComponentConfigurator(); - cc.configureComponent(component, descriptor.getConfiguration(), realm); - } - - protected void configureComponent( - Object component, ComponentDescriptor descriptor, ClassRealm realm, ExpressionEvaluator expressionEvaluator) - throws Exception { - ComponentConfigurator cc = getComponentConfigurator(); - cc.configureComponent(component, descriptor.getConfiguration(), expressionEvaluator, realm); - } - - protected abstract ComponentConfigurator getComponentConfigurator() throws Exception; - - public void testComponentConfigurator() throws Exception { - String xml = "" + " true" - + " 64" - + " -128" - + " -1" - + " 1" - + " 2" - + " 3" - + " X" - + " foo" - + " test.txt" - + " http://www.apache.org/" - + " http://maven.apache.org/" - + " " - + " jason" - + " tess" - + " " - + " " - + " jason" - + " " - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ConfigurableComponent component = new ConfigurableComponent(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals("check boolean value", true, component.getBooleanValue()); - - assertEquals("check byte value", 64, component.getByteValue()); - - assertEquals("check short value", -128, component.getShortValue()); - - assertEquals("check integer value", -1, component.getIntValue()); - - assertEquals("check float value", 1.0f, component.getFloatValue(), 0.001f); - - assertEquals("check long value", 2L, component.getLongValue()); - - assertEquals("check double value", 3.0, component.getDoubleValue(), 0.001); - - assertEquals('X', component.getCharValue()); - - assertEquals("foo", component.getStringValue()); - - assertEquals(new File("test.txt"), component.getFileValue()); - - assertEquals(new URI("http://www.apache.org/"), component.getUriValue()); - - assertEquals(new URL("http://maven.apache.org/"), component.getUrlValue()); - - List list = component.getImportantThings(); - - assertEquals(2, list.size()); - - assertEquals("jason", ((ImportantThing) list.get(0)).getName()); - - assertEquals("tess", ((ImportantThing) list.get(1)).getName()); - - // Embedded Configuration - - PlexusConfiguration c = component.getConfiguration(); - - assertEquals("jason", c.getChild("name").getValue()); - } - - public void testComponentConfiguratorWithAComponentThatProvidesSettersForConfiguration() throws Exception { - String xml = "" + " 0" + " 1" - + " 2" + " 3" - + " foo" + " " - + " jason" - + " tess" + " " - + " " + " jason" + " " + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithSetters component = new ComponentWithSetters(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals("check integer value", 0, component.getIntValue()); - - assertTrue(component.intValueSet); - - assertEquals("check float value", 1.0f, component.getFloatValue(), 0.001f); - - assertTrue(component.floatValueSet); - - assertEquals("check long value", 2L, component.getLongValue()); - - assertTrue(component.longValueSet); - - assertEquals("check double value", 3.0, component.getDoubleValue(), 0.001); - - assertTrue(component.doubleValueSet); - - assertEquals("foo", component.getStringValue()); - - assertTrue(component.stringValueSet); - - List list = component.getImportantThings(); - - assertEquals(2, list.size()); - - assertEquals("jason", ((ImportantThing) list.get(0)).getName()); - - assertEquals("tess", ((ImportantThing) list.get(1)).getName()); - - assertTrue(component.importantThingsValueSet); - - // Embedded Configuration - - PlexusConfiguration c = component.getConfiguration(); - - assertEquals("jason", c.getChild("name").getValue()); - - assertTrue(component.configurationValueSet); - } - - public void testComponentConfigurationWhereFieldsToConfigureResideInTheSuperclass() throws Exception { - String xml = "" + " jason" + "
bollywood
" + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - DefaultComponent component = new DefaultComponent(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals("jason", component.getName()); - - assertEquals("bollywood", component.getAddress()); - } - - public void testComponentConfigurationWhereFieldsAreCollections() throws Exception { - String xml = "" + " " + " " + " life" - + " " + " " + " " + " " - + " life" + " " + " " - + " " + " " - + " life" + " " + " " + " " - + " abc" + " def" + " " - + " abc" - + " abc" + - // TODO: implement List etc.. - // "" + - // " 12" + - // " 34" + - // "" + - ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithCollectionFields component = new ComponentWithCollectionFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - Vector vector = component.getVector(); - - assertEquals("life", ((ImportantThing) vector.get(0)).getName()); - - assertEquals(1, vector.size()); - - Set set = component.getHashSet(); - - assertEquals(1, set.size()); - - Object[] setContents = set.toArray(); - - assertEquals("life", ((ImportantThing) setContents[0]).getName()); - - List list = component.getList(); - - assertEquals(list.getClass(), LinkedList.class); - - assertEquals("life", ((ImportantThing) list.get(0)).getName()); - - assertEquals(1, list.size()); - - List stringList = component.getStringList(); - - assertEquals("abc", (String) stringList.get(0)); - - assertEquals("def", (String) stringList.get(1)); - - assertEquals(2, stringList.size()); - - set = component.getSet(); - - assertEquals(1, set.size()); - - set = component.getSortedSet(); - - assertEquals(1, set.size()); - } - - public void testComponentConfigurationWhereFieldsAreArrays() throws Exception { - String xml = "" + " " + " value1" - + " value2" + " " + " " - + " 42" + " 69" + " " - + " " + " Hello" - + " World!" + " " - + " " + " some string" - + " something important" - + " 303" + " " - + " " - + " http://foo.com/bar" + " file://localhost/c:/windows" + " " - + " " + " c:/windows" + " /usr/local/bin/foo.sh" - + " " + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithArrayFields component = new ComponentWithArrayFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - String[] stringArray = component.getStringArray(); - - assertEquals(2, stringArray.length); - - assertEquals("value1", stringArray[0]); - - assertEquals("value2", stringArray[1]); - - Integer[] integerArray = component.getIntegerArray(); - - assertEquals(2, integerArray.length); - - assertEquals(new Integer(42), integerArray[0]); - - assertEquals(new Integer(69), integerArray[1]); - - ImportantThing[] importantThingArray = component.getImportantThingArray(); - - assertEquals(2, importantThingArray.length); - - assertEquals("Hello", importantThingArray[0].getName()); - - assertEquals("World!", importantThingArray[1].getName()); - - Object[] objectArray = component.getObjectArray(); - - assertEquals(3, objectArray.length); - - assertEquals("some string", objectArray[0]); - - assertEquals("something important", ((ImportantThing) objectArray[1]).getName()); - - assertEquals(303, objectArray[2]); - - URL[] urls = component.getUrlArray(); - - assertEquals(new URL("http://foo.com/bar"), urls[0]); - - assertEquals(new URL("file://localhost/c:/windows"), urls[1]); - - File[] files = component.getFileArray(); - - assertEquals(new File("c:/windows"), files[0]); - - assertEquals(new File("/usr/local/bin/foo.sh"), files[1]); - } - - public void testComponentConfigurationWithCompositeFields() throws Exception { - - String xml = "" - + " " - + " I am not abstract!" + " " + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithCompositeFields component = new ComponentWithCompositeFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertNotNull(component.getThing()); - - assertEquals("I am not abstract!", component.getThing().getName()); - } - - public void testInvalidComponentConfiguration() throws Exception { - - String xml = "theName"; - - try { - PlexusTools.buildConfiguration("", new StringReader(xml)); - - fail("Should have caused an error because of the invalid XML."); - } catch (PlexusConfigurationException e) { - // Error should be caught here. - } catch (Exception e) { - fail("Should have caught the invalid plexus configuration exception."); - } - } - - public void testComponentConfigurationWithPropertiesFields() throws Exception { - - String xml = "" + " " + " " + " firstname" - + " michal" + " " + " " - + " lastname" + " maczka" + " " - + " " + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithPropertiesField component = new ComponentWithPropertiesField(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - Properties properties = component.getSomeProperties(); - - assertNotNull(properties); - - assertEquals("michal", properties.get("firstname")); - - assertEquals("maczka", properties.get("lastname")); - } - - public void testComponentConfigurationWithPropertiesFieldsWithExpression() throws Exception { - - String xml = - "" + " ${injectedProperties} " + ""; - - final Properties propertiesInterpolated = new Properties(); - propertiesInterpolated.put("firstname", "olivier"); - propertiesInterpolated.put("lastname", "lamy"); - - ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator() { - public Object evaluate(String expression) { - return propertiesInterpolated; - } - - public File alignToBaseDirectory(File file) { - return null; - } - }; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithPropertiesField component = new ComponentWithPropertiesField(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm, expressionEvaluator); - - Properties properties = component.getSomeProperties(); - - assertNotNull(properties); - - assertEquals("olivier", properties.get("firstname")); - - assertEquals("lamy", properties.get("lastname")); - } - - public void testComponentConfigurationWithPropertiesFieldsWithExpressions() throws Exception { - - String xml = "" + "" // - + "${theName}${theValue}" // - + "empty" // - + "" + ""; - - final Properties values = new Properties(); - values.put("${theName}", "test"); - values.put("${theValue}", "PASSED"); - - ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator() { - public Object evaluate(String expression) { - return values.containsKey(expression) ? values.get(expression) : expression; - } - - public File alignToBaseDirectory(File file) { - return null; - } - }; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithPropertiesField component = new ComponentWithPropertiesField(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm, expressionEvaluator); - - Properties properties = component.getSomeProperties(); - - assertNotNull(properties); - - assertEquals("PASSED", properties.get("test")); - assertEquals("", properties.get("empty")); - } - - public void testComponentConfigurationWithMapField() throws Exception { - String xml = "" + " " + " Kenney" - + " Westerhof" + " " + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithMapField component = new ComponentWithMapField(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - Map map = component.getMap(); - - assertNotNull(map); - - assertEquals("Kenney", map.get("firstName")); - - assertEquals("Westerhof", map.get("lastName")); - } - - public void testComponentConfigurationWhereFieldIsBadArray() throws Exception { - String xml = "" // - + " string" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithArrayFields component = new ComponentWithArrayFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - try { - configureComponent(component, descriptor, realm); - fail("Configuration did not fail"); - } catch (ComponentConfigurationException e) { - } - } - - public void testComponentConfigurationWhereFieldIsEnum() throws Exception { - String xml = "" // - + " TYPE" // - + " ONE" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithEnumFields component = new ComponentWithEnumFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals(ElementType.TYPE, component.getSimpleEnum()); - - assertEquals(ComponentWithEnumFields.NestedEnum.ONE, component.getNestedEnum()); - } - - public void testComponentConfigurationWithAmbiguousExpressionValue() throws Exception { - String xml = "" // - + "
${address}
" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - DefaultComponent component = new DefaultComponent(); - - ExpressionEvaluator expressionEvaluator = new TypeAwareExpressionEvaluator() { - public Object evaluate(String expression) throws ExpressionEvaluationException { - return evaluate(expression, null); - } - - public File alignToBaseDirectory(File file) { - return null; - } - - public Object evaluate(String expression, Class type) throws ExpressionEvaluationException { - if (String.class == type) { - return "PASSED"; - } else { - return Boolean.FALSE; - } - } - }; - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm, expressionEvaluator); - - assertEquals("PASSED", component.getAddress()); - } - - public void testComponentConfigurationWithPrimitiveValueConversion() throws Exception { - String xml = "" // - + " ${primitive}" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ConfigurableComponent component = new ConfigurableComponent(); - - ExpressionEvaluator expressionEvaluator = new TypeAwareExpressionEvaluator() { - public Object evaluate(String expression) throws ExpressionEvaluationException { - return evaluate(expression, null); - } - - public File alignToBaseDirectory(File file) { - return null; - } - - public Object evaluate(String expression, Class type) throws ExpressionEvaluationException { - // java.lang.Short -> short -> int - return (short) 23; - } - }; - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm, expressionEvaluator); - - assertEquals(23, component.getIntValue()); - } - - public void testComponentConfigurationWithEmptyContentForBasicField() throws Exception { - String xml = "" // - + "
" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - DefaultComponent component = new DefaultComponent(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals(null, component.getAddress()); - } - - public void testComponentConfigurationWithEmptyContentForCompositeField() throws Exception { - String xml = "" // - + " " // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithCompositeFields component = new ComponentWithCompositeFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertNotNull(component.getBean()); - } - - public void testComponentConfigurationWithUnresolvedExpressionContentForCompositeFieldOfNonInstantiatableType() - throws Exception { - String xml = "" // - + " ${null-valued-expression}" // - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithCompositeFields component = new ComponentWithCompositeFields(); - - ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator() { - public Object evaluate(String expression) throws ExpressionEvaluationException { - return null; - } - - public File alignToBaseDirectory(File file) { - return null; - } - }; - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm, expressionEvaluator); - - assertEquals(null, component.getThing()); - } - - public void testComponentConfiguratorFileNormalizesSeparator() throws Exception { - String xml = "" + " dir/test.txt" - + " dir\\test.txt" - + ""; - - PlexusConfiguration configuration = PlexusTools.buildConfiguration("", new StringReader(xml)); - - ComponentWithArrayFields component = new ComponentWithArrayFields(); - - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setRole("role"); - - descriptor.setImplementation(component.getClass().getName()); - - descriptor.setConfiguration(configuration); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm realm = classWorld.newRealm("test", getClass().getClassLoader()); - - configureComponent(component, descriptor, realm); - - assertEquals(new File("dir", "test.txt"), component.getFileArray()[0]); - assertEquals(new File("dir", "test.txt"), component.getFileArray()[1]); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractThing.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractThing.java deleted file mode 100644 index 5e6dbda57..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/AbstractThing.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public abstract class AbstractThing {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/BasicComponentConfiguratorTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/BasicComponentConfiguratorTest.java deleted file mode 100644 index 5e4645027..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/BasicComponentConfiguratorTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public class BasicComponentConfiguratorTest extends AbstractComponentConfiguratorTest { - protected ComponentConfigurator getComponentConfigurator() throws Exception { - return new BasicComponentConfigurator(); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/Component.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/Component.java deleted file mode 100644 index de3edd21a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/Component.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Component {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithArrayFields.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithArrayFields.java deleted file mode 100644 index f797ce82b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithArrayFields.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.io.File; -import java.net.URL; - -/** - * @author Kenney Westerhof - */ -public class ComponentWithArrayFields { - private String[] stringArray; - - private Integer[] integerArray; - - private ImportantThing[] importantThingArray; - - private Object[] objectArray; - - private AbstractThing[] abstractArray; - - private URL[] urlArray; - - private File[] fileArray; - - public String[] getStringArray() { - return stringArray; - } - - public Integer[] getIntegerArray() { - return integerArray; - } - - public ImportantThing[] getImportantThingArray() { - return importantThingArray; - } - - public Object[] getObjectArray() { - return objectArray; - } - - public AbstractThing[] getAbstractThingArray() { - return abstractArray; - } - - public URL[] getUrlArray() { - return urlArray; - } - - public File[] getFileArray() { - return fileArray; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCollectionFields.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCollectionFields.java deleted file mode 100644 index 9bbb1316f..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCollectionFields.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.Vector; - -/** - * @author Michal Maczka - */ -public class ComponentWithCollectionFields { - private Vector vector; - - private HashSet hashSet; - - private List list; - - private List stringList; - - private Set set; - - private SortedSet sortedSet; - - public Vector getVector() { - return vector; - } - - public HashSet getHashSet() { - return hashSet; - } - - public List getList() { - return list; - } - - public List getStringList() { - return stringList; - } - - public Set getSet() { - return set; - } - - public SortedSet getSortedSet() { - return sortedSet; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCompositeFields.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCompositeFields.java deleted file mode 100644 index 9dcc359ab..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithCompositeFields.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * - * @author Michal Maczka - * - */ -public class ComponentWithCompositeFields { - private ThingInterface thing; - - private DefaultComponent bean; - - public ThingInterface getThing() { - return thing; - } - - public DefaultComponent getBean() { - return bean; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithEnumFields.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithEnumFields.java deleted file mode 100644 index da964b449..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithEnumFields.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.lang.annotation.ElementType; - -/** - * @author Benjamin Bentmann - */ -public class ComponentWithEnumFields { - - public enum NestedEnum { - ONE, - TWO, - THREE, - } - - private NestedEnum nestedEnum; - - private ElementType simpleEnum; - - public NestedEnum getNestedEnum() { - return nestedEnum; - } - - public ElementType getSimpleEnum() { - return simpleEnum; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithMapField.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithMapField.java deleted file mode 100644 index 2dac3d9d0..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithMapField.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Map; - -/** - * - * @author Michal Maczka - * - */ -public class ComponentWithMapField { - private Map map; - - public Map getMap() { - return map; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithPropertiesField.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithPropertiesField.java deleted file mode 100644 index fef0c5b6a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithPropertiesField.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Properties; - -/** - * - * @author Michal Maczka - * - */ -public class ComponentWithPropertiesField { - private Properties someProperties; - - public Properties getSomeProperties() { - return someProperties; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithSetters.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithSetters.java deleted file mode 100644 index 8387adbd7..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ComponentWithSetters.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.List; - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ComponentWithSetters { - private int intValueVariable; - private float floatValueVariable; - private long longValueVariable; - private double doubleValueVariable; - private String stringValueVariable; - private List importantThingsVariable; - private PlexusConfiguration configurationVariable; - - public int getIntValue() { - return intValueVariable; - } - - public float getFloatValue() { - return floatValueVariable; - } - - public long getLongValue() { - return longValueVariable; - } - - public double getDoubleValue() { - return doubleValueVariable; - } - - public String getStringValue() { - return stringValueVariable; - } - - public List getImportantThings() { - return importantThingsVariable; - } - - public PlexusConfiguration getConfiguration() { - return configurationVariable; - } - - // ---------------------------------------------------------------------- - // setters - // ---------------------------------------------------------------------- - - boolean intValueSet; - boolean floatValueSet; - boolean longValueSet; - boolean doubleValueSet; - boolean stringValueSet; - boolean importantThingsValueSet; - boolean configurationValueSet; - - public void setIntValue(int intValue) { - this.intValueVariable = intValue; - - intValueSet = true; - } - - public void setFloatValue(float floatValue) { - this.floatValueVariable = floatValue; - - floatValueSet = true; - } - - public void setLongValue(long longValue) { - this.longValueVariable = longValue; - - longValueSet = true; - } - - public void setDoubleValue(double doubleValue) { - this.doubleValueVariable = doubleValue; - - doubleValueSet = true; - } - - public void setStringValue(String stringValue) { - this.stringValueVariable = stringValue; - - stringValueSet = true; - } - - public void setImportantThings(List importantThings) { - this.importantThingsVariable = importantThings; - - importantThingsValueSet = true; - } - - public void setConfiguration(PlexusConfiguration configuration) { - this.configurationVariable = configuration; - - configurationValueSet = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ConfigurableComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ConfigurableComponent.java deleted file mode 100644 index e98a465fb..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ConfigurableComponent.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.io.File; -import java.net.URI; -import java.net.URL; -import java.util.List; - -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ConfigurableComponent { - private boolean booleanValue; - private byte byteValue; - private short shortValue; - private int intValue; - private float floatValue; - private long longValue; - private double doubleValue; - private char charValue; - private String stringValue; - private File fileValue; - private URI uriValue; - private URL urlValue; - private List importantThings; - private PlexusConfiguration configuration; - - public boolean getBooleanValue() { - return booleanValue; - } - - public int getByteValue() { - return byteValue; - } - - public int getShortValue() { - return shortValue; - } - - public int getIntValue() { - return intValue; - } - - public float getFloatValue() { - return floatValue; - } - - public long getLongValue() { - return longValue; - } - - public double getDoubleValue() { - return doubleValue; - } - - public char getCharValue() { - return charValue; - } - - public String getStringValue() { - return stringValue; - } - - public File getFileValue() { - return fileValue; - } - - public URI getUriValue() { - return uriValue; - } - - public URL getUrlValue() { - return urlValue; - } - - public List getImportantThings() { - return importantThings; - } - - public PlexusConfiguration getConfiguration() { - return configuration; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/DefaultComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/DefaultComponent.java deleted file mode 100644 index 2ac3f6a34..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/DefaultComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultComponent extends AbstractComponent { - private String address; - - public String getAddress() { - return address; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ImportantThing.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ImportantThing.java deleted file mode 100644 index 8506f56d4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ImportantThing.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ImportantThing extends AbstractThing implements ThingInterface { - private String name; - - public String getName() { - return name; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ThingInterface.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ThingInterface.java deleted file mode 100644 index e35a622f6..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/ThingInterface.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -public interface ThingInterface { - String getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/XBeanComponentConfiguratorTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/XBeanComponentConfiguratorTest.java deleted file mode 100644 index 08a52fac3..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/configurator/XBeanComponentConfiguratorTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.codehaus.plexus.component.configurator; - -import org.apache.xbean.recipe.ConstructionException; -import org.apache.xbean.recipe.DefaultExecutionContext; -import org.apache.xbean.recipe.ExecutionContext; -import org.apache.xbean.recipe.ObjectRecipe; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.builder.XBeanComponentBuilder; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public class XBeanComponentConfiguratorTest extends AbstractComponentConfiguratorTest { - @Override - protected void configureComponent(Object component, ComponentDescriptor descriptor, ClassRealm realm) - throws Exception { - XBeanComponentBuilder componentBuilder = new XBeanComponentBuilder(); - ObjectRecipe recipe = componentBuilder.createObjectRecipe(component, descriptor, realm); - - // need a caller context - ExecutionContext executionContext = new DefaultExecutionContext(); - executionContext.push(new ObjectRecipe(component.getClass())); - - // call the recipie setProperties directly, but setup the thead state first - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(realm); - ExecutionContext.setContext(executionContext); - try { - recipe.setProperties(component); - } catch (ConstructionException e) { - throw new ComponentConfigurationException("Failed to configure component", e); - } finally { - ExecutionContext.setContext(null); - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - protected void configureComponent( - Object component, ComponentDescriptor descriptor, ClassRealm realm, ExpressionEvaluator expressionEvaluator) - throws Exception { - this.configureComponent(component, descriptor, realm); - } - - public void testComponentConfigurationWithPropertiesFieldsWithExpression() throws Exception { - // expression evalator is not supported since it is not used by normal AutoConfigurePhase - } - - public void testComponentConfigurationWithPropertiesFieldsWithExpressions() throws Exception { - // expression evalator is not supported since it is not used by normal AutoConfigurePhase - } - - public void testComponentConfigurationWithAmbiguousExpressionValue() throws Exception { - // expression evalator is not supported since it is not used by normal AutoConfigurePhase - } - - public void testComponentConfigurationWithPrimitiveValueConversion() throws Exception { - // expression evalator is not supported since it is not used by normal AutoConfigurePhase - } - - public void testComponentConfigurationWithUnresolvedExpressionContentForCompositeFieldOfNonInstantiatableType() - throws Exception { - // expression evalator is not supported since it is not used by normal AutoConfigurePhase - } - - protected ComponentConfigurator getComponentConfigurator() throws Exception { - // this should never be called because the configureComponent is overridden - throw new UnsupportedOperationException(); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/ComponentDiscovererTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/ComponentDiscovererTest.java deleted file mode 100644 index 7f18ad12b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/ComponentDiscovererTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.ComponentSetDescriptor; -import org.codehaus.plexus.context.DefaultContext; - -/** - * @author Jason van Zyl - * - */ -public class ComponentDiscovererTest extends PlexusTestCase { - public void testDefaultComponentDiscoverer() throws Exception { - ComponentDiscoverer componentDiscoverer = new DefaultComponentDiscoverer(); - - ClassWorld classWorld = new ClassWorld(); - - ClassRealm core = classWorld.newRealm("core"); - - File testClasses = new File(getBasedir(), "target/test-classes"); - - core.addURL(testClasses.toURL()); - - File classes = new File(getBasedir(), "target/classes"); - - core.addURL(classes.toURL()); - - List componentSetDescriptors = - componentDiscoverer.findComponents(new DefaultContext(), core); - - ComponentDescriptor componentDescriptor = byImplementation(componentSetDescriptors) - .get("org.codehaus.plexus.component.discovery.DefaultDiscoveredComponent"); - - assertNotNull("componentDescriptor is null", componentDescriptor); - - assertEquals("org.codehaus.plexus.component.discovery.DiscoveredComponent", componentDescriptor.getRole()); - - assertEquals( - "org.codehaus.plexus.component.discovery.DefaultDiscoveredComponent", - componentDescriptor.getImplementation()); - } - - private static Map> byImplementation(List descriptorSets) { - TreeMap> index = new TreeMap>(); - for (ComponentSetDescriptor descriptorSet : descriptorSets) { - for (ComponentDescriptor descriptor : descriptorSet.getComponents()) { - index.put(descriptor.getImplementation(), descriptor); - } - } - return index; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DefaultDiscoveredComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DefaultDiscoveredComponent.java deleted file mode 100644 index d1197a6b9..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DefaultDiscoveredComponent.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultDiscoveredComponent implements DiscoveredComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DiscoveredComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DiscoveredComponent.java deleted file mode 100644 index 0c0580fa1..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/discovery/DiscoveredComponent.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.component.discovery; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface DiscoveredComponent { - String ROLE = DiscoveredComponent.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/Component.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/Component.java deleted file mode 100644 index b96679973..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/Component.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Michal Maczka - * @version $Id$ - */ -public interface Component {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplA.java deleted file mode 100644 index 48686223c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplA.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ComponentImplA implements Component {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplB.java deleted file mode 100644 index 49babe9aa..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplB.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Michal Maczka - * @version $Id$ - */ -public class ComponentImplB {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplC.java deleted file mode 100644 index 5d98f904b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/ComponentImplC.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Michal Maczka - * @version $Id$ - */ -public abstract class ComponentImplC {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/DiscoveredComponentFactoryTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/DiscoveredComponentFactoryTest.java deleted file mode 100644 index 67177a86b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/DiscoveredComponentFactoryTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public class DiscoveredComponentFactoryTest extends PlexusTestCase { - public void testShouldFindComponentFactoriesDefinedInBothPlexusXmlAndComponentsXml() throws Exception { - assertNotNull( - "Cannot find test component factory from plexus.xml test resource.", - lookup(ComponentFactory.class, "testFactory1")); - - assertNotNull( - "Cannot find test component factory from components.xml test resource.", - lookup(ComponentFactory.class, "testFactory2")); - } - - public void testShouldInstantiateComponentUsingFactoryDiscoveredInPlexusXml() throws Exception {} - - public void testShouldInstantiateComponentUsingFactoryDiscoveredInComponentsXml() throws Exception { - lookupTestComponent("testFactory2"); - } - - private void lookupTestComponent(String factoryId) throws Exception { - ComponentDescriptor descriptor = new ComponentDescriptor(); - - descriptor.setComponentFactory(factoryId); - - descriptor.setRole("role"); - - descriptor.setRoleHint("hint"); - - descriptor.setImplementation("something interesting"); - - getContainer().addComponentDescriptor(descriptor); - - Object component = lookup("role", "hint"); - - assertTrue(component instanceof TestFactoryResultComponent); - - assertEquals(factoryId, ((TestFactoryResultComponent) component).getFactoryId()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory1.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory1.java deleted file mode 100644 index ad120eb98..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory1.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public class TestComponentFactory1 implements ComponentFactory { - - public String getId() { - return "testFactory1"; - } - - public Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException { - return new TestFactoryResultComponent(getId()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory2.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory2.java deleted file mode 100644 index 052b9a1b5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestComponentFactory2.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -public class TestComponentFactory2 implements ComponentFactory { - - public String getId() { - return "testFactory2"; - } - - public Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException { - return new TestFactoryResultComponent(getId()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestFactoryResultComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestFactoryResultComponent.java deleted file mode 100644 index ae80517d5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/TestFactoryResultComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.codehaus.plexus.component.factory; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class TestFactoryResultComponent { - - private final String factoryId; - - public TestFactoryResultComponent(String factoryId) { - this.factoryId = factoryId; - } - - public String getFactoryId() { - return factoryId; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/java/JavaComponentFactoryTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/java/JavaComponentFactoryTest.java deleted file mode 100644 index 80e75a1e4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/java/JavaComponentFactoryTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.codehaus.plexus.component.factory.java; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.DefaultContainerConfiguration; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.component.factory.Component; -import org.codehaus.plexus.component.factory.ComponentImplA; -import org.codehaus.plexus.component.factory.ComponentImplB; -import org.codehaus.plexus.component.factory.ComponentImplC; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** - * @author Jason van Zyl - * @author Michal Maczka - */ -public class JavaComponentFactoryTest extends TestCase { - public void testComponentCreation() throws Exception { - JavaComponentFactory factory = new JavaComponentFactory(); - - ComponentDescriptor componentDescriptor = new ComponentDescriptor(); - - componentDescriptor.setRole(Component.class.getName()); - - componentDescriptor.setImplementation(ComponentImplA.class.getName()); - - ClassWorld classWorld = new ClassWorld(); - - classWorld.newRealm("core", Thread.currentThread().getContextClassLoader()); - - PlexusContainer container = new DefaultPlexusContainer(containerConfiguration(classWorld)); - - Object component = factory.newInstance(componentDescriptor, classWorld.getRealm("core"), container); - - assertNotNull(component); - } - - public void testComponentCreationWithNotMatchingRoleAndImplemenation() throws Exception { - JavaComponentFactory factory = new JavaComponentFactory(); - - ComponentDescriptor componentDescriptor = new ComponentDescriptor(); - - componentDescriptor.setRole(Component.class.getName()); - - componentDescriptor.setImplementation(ComponentImplB.class.getName()); - - ClassWorld classWorld = new ClassWorld(); - - classWorld.newRealm("core", Thread.currentThread().getContextClassLoader()); - - PlexusContainer container = new DefaultPlexusContainer(containerConfiguration(classWorld)); - - factory.newInstance(componentDescriptor, classWorld.getRealm("core"), container); - } - - public void testInstanciationOfAAbstractComponent() throws Exception { - JavaComponentFactory factory = new JavaComponentFactory(); - - ComponentDescriptor componentDescriptor = new ComponentDescriptor(); - - componentDescriptor.setRole(Component.class.getName()); - - componentDescriptor.setImplementation(ComponentImplC.class.getName()); - - ClassWorld classWorld = new ClassWorld(); - - classWorld.newRealm("core", Thread.currentThread().getContextClassLoader()); - - PlexusContainer container = new DefaultPlexusContainer(containerConfiguration(classWorld)); - - try { - factory.newInstance(componentDescriptor, classWorld.getRealm("core"), container); - - fail("Expected ComponentInstantiationException when instanciating a abstract class."); - } catch (ComponentInstantiationException ex) { - assertTrue(true); - } - } - - private ContainerConfiguration containerConfiguration(ClassWorld classWorld) { - ContainerConfiguration c = new DefaultContainerConfiguration().setClassWorld(classWorld); - - return c; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactory.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactory.java deleted file mode 100644 index 5b68cbf60..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.component.factory.nonjava; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.factory.ComponentFactory; -import org.codehaus.plexus.component.factory.ComponentInstantiationException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; - -/** @author Jason van Zyl */ -public class NonJavaComponentFactory implements ComponentFactory { - public String getId() { - return "nonjava"; - } - - public Object newInstance(ComponentDescriptor componentDescriptor, ClassRealm classRealm, PlexusContainer container) - throws ComponentInstantiationException { - return "component"; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.java deleted file mode 100644 index 37d533a81..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.component.factory.nonjava; - -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.component.factory.ComponentFactory; - -/** @author Jason van Zyl */ -public class NonJavaComponentFactoryTest extends PlexusTestCase { - public void testNonJavaComponentFactory() throws Exception { - ComponentFactory factory = lookup(ComponentFactory.class, "nonjava"); - - assertNotNull(factory); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.java deleted file mode 100644 index c22402336..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.codehaus.plexus.component.manager; - -import org.codehaus.plexus.PlexusTestCase; - -/** - * @author Ben Walding - */ -public class ClassicSingletonComponentManagerTest extends PlexusTestCase { - public void testSequentialLookupsReturnTheSameInstance() throws Exception { - Component a = lookup(Component.class); - - Component b = lookup(Component.class); - - Component c = lookup(Component.class); - - Component d = lookup(Component.class); - - assertTrue(a == b); - - assertTrue(a == c); - - assertTrue(a == d); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/Component.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/Component.java deleted file mode 100644 index b63639233..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/Component.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/** @author Jason van Zyl */ -public interface Component { - String ROLE = Component.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/DefaultComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/DefaultComponent.java deleted file mode 100644 index 28b5787b8..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/DefaultComponent.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/** @author Jason van Zyl */ -public class DefaultComponent implements Component {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponent.java deleted file mode 100644 index 9bb04c1fd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponent.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; - -/** - * A slow starting component that checks that sleeps during its Start phase. - * - * Configuration: - * delay - number of milliseconds to sleep during start() - * @author Ben Walding - */ -public class SlowComponent implements Startable { - public static final String ROLE = SlowComponent.class.getName(); - - /* Number of ms to sleep during start() */ - private long delay; - - public void start() { - try { - Thread.sleep(delay); - } catch (InterruptedException e) { - } - } - - public void stop() {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java deleted file mode 100644 index b5d8fb3f5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.codehaus.plexus.component.manager; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.PlexusTestCase; - -/** - * @author Ben Walding - */ -public class SlowComponentClassicSingletonComponentManagerTest extends PlexusTestCase { - public void testThreads1() throws Exception { - test(1); - } - - /** - * Tests that multiple concurrent threads don't acquire different components. - * @throws Exception in case of an error. - */ - public void testThreads1000() throws Exception { - test(1000); - } - - private void test(int count) throws Exception { - ComponentLookupThread components[] = new ComponentLookupThread[count]; - // Create them - for (int i = 0; i < count; i++) { - components[i] = new ComponentLookupThread(getContainer()); - } - // Start them - for (int i = 0; i < count; i++) { - components[i].start(); - } - - // Wait for them to finish - for (int i = 0; i < count; i++) { - components[i].join(10000); - } - - // Get master component - SlowComponent masterComponent = lookup(SlowComponent.class); - - // Verify them - for (int i = 0; i < count; i++) { - assertSame( - i + ":" + components[i].getComponent() + " == " + masterComponent, - masterComponent, - components[i].getComponent()); - } - } - - class ComponentLookupThread extends Thread { - final PlexusContainer container; - - private SlowComponent component; - - public ComponentLookupThread(PlexusContainer container) { - /* - * NOTE: A high priority seems to increase the likelihood of exhibiting missing synchronization. - */ - setPriority(MAX_PRIORITY); - this.container = container; - } - - public void run() { - try { - // DefaultPlexusContainer.setLookupRealm( lookupRealm ); - SlowComponent tmpComponent = container.lookup(SlowComponent.class); - - synchronized (this) { - this.component = tmpComponent; - } - } catch (Exception e) { - container.getLookupRealm().display(); - e.printStackTrace(); - } - } - - public SlowComponent getComponent() { - synchronized (this) { - return component; - } - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/DefaultComponentRegistryTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/DefaultComponentRegistryTest.java deleted file mode 100644 index 5821ba8ee..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/DefaultComponentRegistryTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.codehaus.plexus.component.registry; - -import junit.framework.TestCase; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; - -public class DefaultComponentRegistryTest extends TestCase { - - public void testConcurrentDisposeAndLookup() throws Exception { - final PlexusContainer plexus = new DefaultPlexusContainer(); - - ComponentDescriptor descriptor = new ComponentDescriptor( - TestSynchronizedComponent.class, plexus.getContainerRealm()); - descriptor.setRole(TestSynchronizedComponent.class.getCanonicalName()); - descriptor.setImplementation(TestSynchronizedComponent.class.getCanonicalName()); - plexus.addComponentDescriptor(descriptor); - - TestSynchronizedComponent component = plexus.lookup(TestSynchronizedComponent.class); - - class LookupThread extends Thread { - private TestSynchronizedComponent component; - - @Override - public synchronized void run() { - try { - this.component = plexus.lookup(TestSynchronizedComponent.class); - } catch (ComponentLookupException e) { - // expected - } - } - - public synchronized TestSynchronizedComponent getComponent() { - return component; - } - } - - LookupThread lookupThread = new LookupThread(); - - component.setLookupThread(lookupThread); - - plexus.dispose(); - - assertNull(lookupThread.getComponent()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/TestSynchronizedComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/TestSynchronizedComponent.java deleted file mode 100644 index 84e90e731..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/registry/TestSynchronizedComponent.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.component.registry; - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException; - -public class TestSynchronizedComponent implements Startable { - - private Thread lookupThread; - - public synchronized void start() throws StartingException {} - - public synchronized void stop() throws StoppingException { - lookupThread.start(); - try { - lookupThread.join(); - } catch (InterruptedException e) { - throw new StoppingException("Can't stop lookupThread", e); - } - } - - public synchronized void setLookupThread(Thread lookupThread) { - this.lookupThread = lookupThread; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentDescriptorTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentDescriptorTest.java deleted file mode 100644 index 8e06ea351..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentDescriptorTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import junit.framework.TestCase; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.io.PlexusTools; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ComponentDescriptorTest extends TestCase { - public void testSimpleComponentResolution() throws Exception { - String cc1 = "" + " java.lang.String" - + " c1" - + " role-hint" - + " component-profile" - + " " - + " " - + " c2" - + " " - + " " - + " c3" - + " " - + " " - + ""; - - ClassWorld classWorld = new ClassWorld("test", Thread.currentThread().getContextClassLoader()); - ClassRealm realm = classWorld.getRealm("test"); - - ComponentDescriptor c1 = PlexusTools.buildComponentDescriptor(cc1, realm); - - assertEquals("c1", c1.getRole()); - - assertEquals("role-hint", c1.getRoleHint()); - - assertEquals("component-profile", c1.getComponentProfile()); - - List requirements = c1.getRequirements(); - - assertEquals(2, requirements.size()); - - boolean containsC2 = false; - - boolean containsC3 = false; - - for (ComponentRequirement requirement : requirements) { - if (requirement.getRole().equals("c2")) { - containsC2 = true; - } else if (requirement.getRole().equals("c3")) { - containsC3 = true; - } - } - - assertTrue(containsC2); - - assertTrue(containsC3); - } - - public void testShouldNotBeEqualWhenRolesAreSameButHintsAreDifferent() { - ComponentDescriptor desc = new ComponentDescriptor(); - desc.setRole("one"); - desc.setRoleHint("one"); - - ComponentDescriptor desc2 = new ComponentDescriptor(); - desc2.setRole("one"); - desc2.setRoleHint("two"); - - assertFalse(desc.equals(desc2)); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentRequirementTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentRequirementTest.java deleted file mode 100644 index 95a10a8f3..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentRequirementTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * @author Michal Maczka - */ -public class ComponentRequirementTest extends TestCase { - public void testComponentRequirement() { - ComponentRequirement requirement = new ComponentRequirement(); - requirement.setFieldName("field"); - requirement.setRole("role"); - - assertEquals("field", requirement.getFieldName()); - assertEquals("role", requirement.getRole()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentSetTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentSetTest.java deleted file mode 100644 index 9ac15cb30..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/ComponentSetTest.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; - -import junit.framework.TestCase; -import org.codehaus.plexus.classworlds.ClassWorld; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.repository.io.PlexusTools; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ComponentSetTest extends TestCase { - public void testSimpleComponentResolution() throws Exception { - String xml = "" + " " - + " " - + " java.lang.String" - + " c1" - + " role-hint" - + " component-profile" - + " " - + " " - + " c2" - + " " - + " " - + " c3" - + " " - + " " - + " " - + " " - + " " - + " " - + " plexus" - + " wedgy" - + " 1.0" - + " " - + " " - + ""; - - ClassWorld classWorld = new ClassWorld("test", Thread.currentThread().getContextClassLoader()); - ClassRealm realm = classWorld.getRealm("test"); - - ComponentSetDescriptor cs = PlexusTools.buildComponentSet(PlexusTools.buildConfiguration(xml), realm); - - ComponentDescriptor c1 = cs.getComponents().get(0); - - assertEquals("c1", c1.getRole()); - - assertEquals("role-hint", c1.getRoleHint()); - - assertEquals("component-profile", c1.getComponentProfile()); - - List requirements = c1.getRequirements(); - - assertEquals(2, requirements.size()); - - boolean containsC2 = false; - - boolean containsC3 = false; - - for (ComponentRequirement requirement : requirements) { - if (requirement.getRole().equals("c2")) { - containsC2 = true; - } else if (requirement.getRole().equals("c3")) { - containsC3 = true; - } - } - - assertTrue(containsC2); - - assertTrue(containsC3); - - ComponentDependency d1 = cs.getDependencies().get(0); - - assertEquals("plexus", d1.getGroupId()); - - assertEquals("wedgy", d1.getArtifactId()); - - assertEquals("1.0", d1.getVersion()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/DefaultComponentRepositoryTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/DefaultComponentRepositoryTest.java deleted file mode 100644 index 15ccc0548..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/repository/DefaultComponentRepositoryTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.component.repository; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultComponentRepositoryTest extends TestCase { - private static String configuration = "" + ""; - - public void testDefaultComponentRepository() {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationResourceExceptionTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationResourceExceptionTest.java deleted file mode 100644 index 40ff32a65..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationResourceExceptionTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * - * - * @author Jason van Zyl - * - */ -public class ConfigurationResourceExceptionTest extends TestCase { - public void testException() { - PlexusConfigurationResourceException e = new PlexusConfigurationResourceException("bad doggy!"); - - assertEquals("bad doggy!", e.getMessage()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationTestHelper.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationTestHelper.java deleted file mode 100644 index 574ebdf3f..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/ConfigurationTestHelper.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.StringReader; - -import junit.framework.TestCase; -import org.codehaus.plexus.component.repository.io.PlexusTools; - -/** - * @author Jason van Zyl - */ -public abstract class ConfigurationTestHelper extends TestCase { - public static PlexusConfiguration getTestConfiguration() throws Exception { - return PlexusTools.buildConfiguration( - "", new StringReader(ConfigurationTestHelper.getXmlConfiguration())); - } - - public static String getXmlConfiguration() { - return "" + "" - + "" - + "string" - + "0" - + "not-a-number" - + "true" - + "false" - + "not-a-boolean" - + ""; - } - - public static void testConfiguration(PlexusConfiguration c) throws Exception { - // Exercise all value/attribute retrieval methods. - - // Values - - // TODO: uncomment once maven can test the latest plexus-utils - // assertNull( c.getChild( "singleton" ).getValue( null ) ); - - // String - - assertEquals("string", c.getValue("string")); - - assertEquals("string", c.getChild("string").getValue()); - - assertEquals("string", c.getChild("ne-string").getValue("string")); - - assertNull(c.getChild("not-existing").getValue(null)); - - assertEquals("''", "'" + c.getChild("empty-element").getValue() + "'"); - - assertEquals("", c.getChild("empty-element").getValue(null)); - - // Attributes - - assertEquals("string", c.getChild("string").getAttribute("string")); - - assertEquals("attribute", c.getChild("singleton").getAttribute("attribute")); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/DefaultPlexusConfigurationTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/DefaultPlexusConfigurationTest.java deleted file mode 100644 index 6db0494d3..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/DefaultPlexusConfigurationTest.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.codehaus.plexus.configuration; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * @author Ran Tene - */ -public final class DefaultPlexusConfigurationTest extends TestCase { - private DefaultPlexusConfiguration configuration; - - public void setUp() { - configuration = new DefaultPlexusConfiguration("a"); - } - - public void testWithHelper() throws Exception { - PlexusConfiguration c = ConfigurationTestHelper.getTestConfiguration(); - - ConfigurationTestHelper.testConfiguration(c); - } - - public void testGetValue() throws Exception { - String orgValue = "Original String"; - configuration.setValue(orgValue); - assertEquals(orgValue, configuration.getValue()); - } - - public void testGetAttribute() throws Exception { - String key = "key"; - String value = "original value"; - String defaultStr = "default"; - configuration.setAttribute(key, value); - assertEquals(value, configuration.getAttribute(key, defaultStr)); - assertEquals(defaultStr, configuration.getAttribute("newKey", defaultStr)); - } - - public void testGetChild() throws Exception { - DefaultPlexusConfiguration child = (DefaultPlexusConfiguration) configuration.getChild("child"); - - assertNotNull(child); - - child.setValue("child value"); - - assertEquals(1, configuration.getChildCount()); - - child = (DefaultPlexusConfiguration) configuration.getChild("child"); - - assertNotNull(child); - - assertEquals("child value", child.getValue()); - - assertEquals(1, configuration.getChildCount()); - } - - public void testToString() throws Exception { - // TODO: this currently works since getTestConfiguration() invokes PlexusTools.buildConfiguration() - // and it returns XmlPlexusConfiguration actually. - PlexusConfiguration c = ConfigurationTestHelper.getTestConfiguration(); - - assertEquals( - "string\n", - c.getChild("string").toString()); - - // TODO: uncomment once maven can test the latest plexus-utils - assertEquals( - "\n", - c.getChild("singleton").toString()); - } - - public void testProgrammaticConfigurationCreation() throws Exception { - String viewRoot = "/path/to/viewRoot"; - - PlexusConfiguration c = new DefaultPlexusConfiguration("configuration").addChild("viewRoot", viewRoot); - - assertEquals(viewRoot, c.getChild("viewRoot").getValue()); - } - - public void testChildOrdering() throws Exception { - PlexusConfiguration child0 = new DefaultPlexusConfiguration("child"); - PlexusConfiguration child1 = new DefaultPlexusConfiguration("child"); - PlexusConfiguration child2 = new DefaultPlexusConfiguration("special-child"); - PlexusConfiguration child3 = new DefaultPlexusConfiguration("child"); - PlexusConfiguration child4 = new DefaultPlexusConfiguration("child"); - - configuration.addChild(child0); - configuration.addChild(child1); - configuration.addChild(child2); - configuration.addChild(child3); - configuration.addChild(child4); - - assertEquals(5, configuration.getChildCount()); - assertSame(child0, configuration.getChild(0)); - assertSame(child1, configuration.getChild(1)); - assertSame(child2, configuration.getChild(2)); - assertSame(child3, configuration.getChild(3)); - assertSame(child4, configuration.getChild(4)); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReaderTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReaderTest.java deleted file mode 100644 index 2d9d02432..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReaderTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.StringReader; - -import junit.framework.TestCase; -import org.codehaus.plexus.configuration.ConfigurationTestHelper; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public class XmlPlexusConfigurationReaderTest extends TestCase { - public void testRead() throws Exception { - StringReader sr = new StringReader(ConfigurationTestHelper.getXmlConfiguration()); - - XmlPlexusConfigurationReader reader = new XmlPlexusConfigurationReader(); - - PlexusConfiguration c = reader.read(sr); - - ConfigurationTestHelper.testConfiguration(c); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriterTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriterTest.java deleted file mode 100644 index 191b0ad61..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriterTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.codehaus.plexus.configuration.io; - -import java.io.StringReader; -import java.io.StringWriter; - -import junit.framework.TestCase; -import org.codehaus.plexus.configuration.ConfigurationTestHelper; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.xml.Xpp3DomBuilder; - -public class XmlPlexusConfigurationWriterTest extends TestCase { - - public void testWrite() throws Exception { - PlexusConfiguration c = ConfigurationTestHelper.getTestConfiguration(); - - XmlPlexusConfigurationWriter cw = new XmlPlexusConfigurationWriter(); - - StringWriter writer = new StringWriter(); - - cw.write(writer, c); - - Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(writer.toString())); - - XmlPlexusConfiguration c1 = new XmlPlexusConfiguration(dom); - - ConfigurationTestHelper.testConfiguration(c1); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ADummyConfigurationSource.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ADummyConfigurationSource.java deleted file mode 100644 index 6a287b4c5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ADummyConfigurationSource.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public class ADummyConfigurationSource implements ConfigurationSource { - - public PlexusConfiguration getConfiguration(ComponentDescriptor componentDescriptor) { - return null; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/AnotherDummyConfigurationSource.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/AnotherDummyConfigurationSource.java deleted file mode 100644 index 1d726be04..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/AnotherDummyConfigurationSource.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -public class AnotherDummyConfigurationSource implements ConfigurationSource { - - private ConfigurationSource configurationSource; - - public PlexusConfiguration getConfiguration(ComponentDescriptor componentDescriptor) { - return null; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/DefaultConfigurationSourceTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/DefaultConfigurationSourceTest.java deleted file mode 100644 index 24432f9dd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/DefaultConfigurationSourceTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.PlexusTestCase; - -public class DefaultConfigurationSourceTest extends PlexusTestCase { - - public void testBasic() throws Exception { - // we have no plexus.xml, so the container should use the "default" source, - // which is ContainerConfigurationSource - - ConfigurationSource cs = ((MutablePlexusContainer) getContainer()).getConfigurationSource(); - - assertNotNull(cs); - - assertEquals(ContainerConfigurationSource.class.getName(), cs.getClass().getName()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.java deleted file mode 100644 index 292624c49..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.PlexusTestCase; - -public class ExtendingConfigurationSourceTest extends PlexusTestCase { - public void testBasic() throws Exception { - // we have plexus.xml with two configSources, so the container should use the "chained" case, - // which is ChainedConfigurationSource with 3 elem in list: the plexusDefaultConfig source, - // and the two user provided, in this order: ADummyConfigurationSource, AnotherDummyConfigurationSource - - ConfigurationSource cs = ((MutablePlexusContainer) getContainer()).getConfigurationSource(); - - assertNotNull(cs); - - assertEquals(ChainedConfigurationSource.class.getName(), cs.getClass().getName()); - - ChainedConfigurationSource ccs = (ChainedConfigurationSource) cs; - - // we have 3 config sources overall - assertEquals(3, ccs.getConfigurationSources().size()); - - // and the last in the source list is container source - assertEquals( - ContainerConfigurationSource.class.getName(), - ccs.getConfigurationSources().get(2).getClass().getName()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.java deleted file mode 100644 index 1b20009dc..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.codehaus.plexus.configuration.source; - -import org.codehaus.plexus.MutablePlexusContainer; -import org.codehaus.plexus.PlexusTestCase; - -public class OverridingConfigurationSourceTest extends PlexusTestCase { - public void testBasic() throws Exception { - // we have plexus.xml with configSource that overrides the Plexus default one, so the container - // should use it instead of the "default" one - - ConfigurationSource cs = ((MutablePlexusContainer) getContainer()).getConfigurationSource(); - - assertNotNull(cs); - - assertEquals(ADummyConfigurationSource.class.getName(), cs.getClass().getName()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfigurationTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfigurationTest.java deleted file mode 100644 index 18b5ab795..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfigurationTest.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.codehaus.plexus.configuration.xml; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; -import org.codehaus.plexus.configuration.ConfigurationTestHelper; -import org.codehaus.plexus.configuration.PlexusConfiguration; - -/** - * @author Ran Tene - */ -public final class XmlPlexusConfigurationTest extends TestCase { - private XmlPlexusConfiguration configuration; - - public void setUp() { - configuration = new XmlPlexusConfiguration("a"); - } - - public void testWithHelper() throws Exception { - PlexusConfiguration c = ConfigurationTestHelper.getTestConfiguration(); - - ConfigurationTestHelper.testConfiguration(c); - } - - public void testGetValue() throws Exception { - String orgValue = "Original String"; - configuration.setValue(orgValue); - assertEquals(orgValue, configuration.getValue()); - } - - public void testGetAttribute() throws Exception { - String key = "key"; - String value = "original value"; - String defaultStr = "default"; - configuration.setAttribute(key, value); - assertEquals(value, configuration.getAttribute(key, defaultStr)); - assertEquals(defaultStr, configuration.getAttribute("newKey", defaultStr)); - } - - public void testGetChild() throws Exception { - PlexusConfiguration child = (XmlPlexusConfiguration) configuration.getChild("child"); - - assertNotNull(child); - - child.setValue("child value"); - - assertEquals(1, configuration.getChildCount()); - - child = (XmlPlexusConfiguration) configuration.getChild("child"); - - assertNotNull(child); - - assertEquals("child value", child.getValue()); - - assertEquals(1, configuration.getChildCount()); - } - - public void testToString() throws Exception { - PlexusConfiguration c = ConfigurationTestHelper.getTestConfiguration(); - - assertEquals( - "string\n", - c.getChild("string").toString()); - - // TODO: uncomment once maven can test the latest plexus-utils - // assertEquals( "\n", c.getChild( "singleton" ).toString() ); - } - - public void testProgrammaticConfigurationCreation() throws Exception { - String viewRoot = "/path/to/viewRoot"; - - PlexusConfiguration c = new XmlPlexusConfiguration("configuration").addChild("viewRoot", viewRoot); - - assertEquals(viewRoot, c.getChild("viewRoot").getValue()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java deleted file mode 100644 index a404dd108..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/context/ContextMapAdapterTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.codehaus.plexus.context; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.StringReader; -import java.io.StringWriter; - -import junit.framework.TestCase; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.InterpolationFilterReader; - -/** - * Generated by JUnitDoclet, a tool provided by ObjectFab GmbH under LGPL. - * Please see www.junitdoclet.org, www.gnu.org and www.objectfab.de for - * informations about the tool, the licence and the authors. - */ -public class ContextMapAdapterTest extends TestCase { - public ContextMapAdapterTest(String name) { - super(name); - } - - public void testInterpolation() throws Exception { - DefaultContext context = new DefaultContext(); - - context.put("name", "jason"); - - context.put("occupation", "exotic dancer"); - - ContextMapAdapter adapter = new ContextMapAdapter(context); - - assertEquals("jason", (String) adapter.get("name")); - - assertEquals("exotic dancer", (String) adapter.get("occupation")); - - assertNull(adapter.get("foo")); - } - - public void testInterpolationWithContext() throws Exception { - DefaultContext context = new DefaultContext(); - context.put("name", "jason"); - context.put("noun", "asshole"); - - String foo = "${name} is an ${noun}. ${not.interpolated}"; - - InterpolationFilterReader reader = - new InterpolationFilterReader(new StringReader(foo), new ContextMapAdapter(context)); - - StringWriter writer = new StringWriter(); - IOUtil.copy(reader, writer); - - String bar = writer.toString(); - assertEquals("jason is an asshole. ${not.interpolated}", bar); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/context/DefaultContextTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/context/DefaultContextTest.java deleted file mode 100644 index bd55956f2..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/context/DefaultContextTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.codehaus.plexus.context; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.HashMap; -import java.util.Map; - -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - -/** - * TestCase for Context. - * - * @author Berin Loritsch - * @author Leo Sutic - */ -public class DefaultContextTest extends TestCase { - - public DefaultContextTest(String name) { - super(name); - } - - public void testContextCreationWithMap() throws Exception { - Map map = new HashMap(); - - map.put("name", "jason"); - - DefaultContext context = new DefaultContext(map); - - assertEquals("jason", (String) context.get("name")); - - assertEquals(map, context.getContextData()); - - // Test removal - context.put("name", null); - - // There is no data and no parent containerContext. - try { - context.get("name"); - } catch (ContextException e) { - // do nothing - } - } - - public void testAddContext() throws Exception { - DefaultContext context = new DefaultContext(); - context.put("key1", "value1"); - assertTrue("value1".equals(context.get("key1"))); - context.put("key1", ""); - assertTrue("".equals(context.get("key1"))); - - context.put("key1", "value1"); - context.makeReadOnly(); - - try { - context.put("key1", ""); - throw new AssertionFailedError("You are not allowed to change a value after it has been made read only"); - } catch (IllegalStateException ise) { - assertTrue("Value is null", "value1".equals(context.get("key1"))); - } - } - - public void testHiddenItems() throws ContextException { - // initalize - DefaultContext context = new DefaultContext(); - context.put("test", "test"); - - // verify inital state - assertTrue("test".equals(context.get("test"))); - - // hide value and verify - context.hide("test"); - try { - context.get("test"); - fail("The item \"test\" was hidden in the child containerContext, but could still be retrieved via get()."); - } catch (ContextException ce) { - assertTrue(true); - } - - // reset to inital state and verify - context.put("test", "test"); - assertTrue("test".equals(context.get("test"))); - - // mark context read-only and verify that item can not be hidden - context.makeReadOnly(); - try { - context.hide("test"); - fail("hide() did not throw an exception, even though the containerContext is supposed to be read-only."); - } catch (IllegalStateException ise) { - assertTrue(true); - } - - // verify state did not change in failed hide() invocation - assertTrue("test".equals(context.get("test"))); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusTestService.java b/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/PlexusTestService.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/TestServiceImpl.java b/plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy/TestServiceImpl.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/AbstractLoggerManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/AbstractLoggerManagerTest.java deleted file mode 100644 index 21ab211b5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/AbstractLoggerManagerTest.java +++ /dev/null @@ -1,213 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusTestCase; - -/** - * Abtract base class for testing implementations of the {@link LoggerManager} - * and {@link Logger} interfaces. - * - * @author Mark H. Wilkinson - * @author Trygve Laugstøl - * @version $Revision$ - */ -public abstract class AbstractLoggerManagerTest extends PlexusTestCase { - protected abstract LoggerManager createLoggerManager() throws Exception; - - public void testSetThreshold() throws Exception { - LoggerManager manager; - Logger logger1, logger2; - - manager = createLoggerManager(); - - manager.setThreshold(Logger.LEVEL_FATAL); - logger1 = manager.getLoggerForComponent("role1", "roleHint1"); - assertEquals(Logger.LEVEL_FATAL, logger1.getThreshold()); - - manager.setThreshold(Logger.LEVEL_DEBUG); - logger2 = manager.getLoggerForComponent("role2", "roleHint2"); - assertEquals(Logger.LEVEL_FATAL, logger1.getThreshold()); - assertEquals(Logger.LEVEL_DEBUG, logger2.getThreshold()); - } - - /** - * There is only one logger instance pr component even if looked up more that once. - * @throws Exception in case of an error. - */ - public void testActiveLoggerCount() throws Exception { - LoggerManager manager; - Logger b, c1_1, c1_2, c2; - - manager = getManager(Logger.LEVEL_FATAL); - assertEquals(0, manager.getActiveLoggerCount()); - - b = manager.getLoggerForComponent("b"); - assertNotNull(b); - assertEquals(1, manager.getActiveLoggerCount()); - - c1_1 = manager.getLoggerForComponent("c", "1"); - c1_2 = manager.getLoggerForComponent("c", "1"); - assertNotNull(c1_1); - assertNotNull(c1_2); - assertSame(c1_1, c1_2); - assertEquals(2, manager.getActiveLoggerCount()); - - c2 = manager.getLoggerForComponent("c", "2"); - assertNotNull(c2); - assertEquals(3, manager.getActiveLoggerCount()); - - manager.returnComponentLogger("c", "1"); - assertEquals(2, manager.getActiveLoggerCount()); - - manager.returnComponentLogger("c", "2"); - manager.returnComponentLogger("c", "2"); - manager.returnComponentLogger("c", "1"); - assertEquals(1, manager.getActiveLoggerCount()); - - manager.returnComponentLogger("b"); - assertEquals(0, manager.getActiveLoggerCount()); - } - - public void testDebugLevelConfiguration() throws Exception { - LoggerManager manager = getManager(Logger.LEVEL_DEBUG); - - Logger logger = extractLogger(manager); - - checkDebugLevel(logger); - - logger = extractLogger(manager); - - checkDebugLevel(logger); - } - - public void testInfoLevelConfiguration() throws Exception { - LoggerManager manager = getManager(Logger.LEVEL_INFO); - - Logger logger = extractLogger(manager); - - checkInfoLevel(logger); - - logger = extractLogger(manager); - - checkInfoLevel(logger); - } - - public void testWarnLevelConfiguration() throws Exception { - LoggerManager manager = getManager(Logger.LEVEL_WARN); - - Logger logger = extractLogger(manager); - - checkWarnLevel(logger); - - logger = extractLogger(manager); - - checkWarnLevel(logger); - } - - public void testErrorLevelConfiguration() throws Exception { - LoggerManager manager = getManager(Logger.LEVEL_ERROR); - - Logger logger = extractLogger(manager); - - checkErrorLevel(logger); - - logger = extractLogger(manager); - - checkErrorLevel(logger); - } - - public void testFatalLevelConfiguration() throws Exception { - LoggerManager manager = getManager(Logger.LEVEL_FATAL); - - Logger logger = extractLogger(manager); - - checkFatalLevel(logger); - - logger = extractLogger(manager); - - checkFatalLevel(logger); - } - - private LoggerManager getManager(int threshold) throws Exception { - LoggerManager manager = createLoggerManager(); - - manager.setThreshold(threshold); - - assertNotNull(manager); - - return manager; - } - /* - private Logger extractRootLogger( LoggerManager manager ) - { - Logger logger = manager.getRootLogger(); - - assertNotNull( logger ); - - return logger; - } - */ - private Logger extractLogger(LoggerManager manager) { - Logger logger = manager.getLoggerForComponent("foo"); - - assertNotNull(logger); - assertEquals("foo", logger.getName()); - - return logger; - } - - private void checkDebugLevel(Logger logger) { - assertTrue("debug enabled", logger.isDebugEnabled()); - assertTrue("info enabled", logger.isInfoEnabled()); - assertTrue("warn enabled", logger.isWarnEnabled()); - assertTrue("error enabled", logger.isErrorEnabled()); - assertTrue("fatal enabled", logger.isFatalErrorEnabled()); - } - - private void checkInfoLevel(Logger logger) { - assertFalse("debug disabled", logger.isDebugEnabled()); - assertTrue("info enabled", logger.isInfoEnabled()); - assertTrue("warn enabled", logger.isWarnEnabled()); - assertTrue("error enabled", logger.isErrorEnabled()); - assertTrue("fatal enabled", logger.isFatalErrorEnabled()); - } - - private void checkWarnLevel(Logger logger) { - assertFalse("debug disabled", logger.isDebugEnabled()); - assertFalse("info disabled", logger.isInfoEnabled()); - assertTrue("warn enabled", logger.isWarnEnabled()); - assertTrue("error enabled", logger.isErrorEnabled()); - assertTrue("fatal enabled", logger.isFatalErrorEnabled()); - } - - private void checkErrorLevel(Logger logger) { - assertFalse("debug disabled", logger.isDebugEnabled()); - assertFalse("info disabled", logger.isInfoEnabled()); - assertFalse("warn disabled", logger.isWarnEnabled()); - assertTrue("error enabled", logger.isErrorEnabled()); - assertTrue("fatal enabled", logger.isFatalErrorEnabled()); - } - - private void checkFatalLevel(Logger logger) { - assertFalse("debug disabled", logger.isDebugEnabled()); - assertFalse("info disabled", logger.isInfoEnabled()); - assertFalse("warn disabled", logger.isWarnEnabled()); - assertFalse("error disabled", logger.isErrorEnabled()); - assertTrue("fatal enabled", logger.isFatalErrorEnabled()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/CustomLoggerManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/CustomLoggerManagerTest.java deleted file mode 100644 index 96b93048b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/CustomLoggerManagerTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusTestCase; - -// TODO: this test will get nuked, this needs to be done programmatically - -/** - * @author Trygve Laugstøl - */ -public class CustomLoggerManagerTest extends PlexusTestCase { - public void testBasic() throws Exception { - LoggerManager manager = lookup(LoggerManager.class); - - assertNotNull(manager); - - assertEquals(MockLoggerManager.class.getName(), manager.getClass().getName()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/LogEnabledTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/LogEnabledTest.java deleted file mode 100644 index 26e0cbc25..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/LogEnabledTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import junit.framework.TestCase; - -/** - * - * @author peter at realityforge.org Peter Donald - */ -public class LogEnabledTest extends TestCase { - public void testGetLogger() throws Exception { - MockLogEnabled logEnabled = new MockLogEnabled(); - MockLogger logger = new MockLogger("base"); - logEnabled.enableLogging(logger); - assertEquals("logger", logger, logEnabled.getLogger()); - } - - public void testSetupLoggerOnLogEnabled() throws Exception { - MockLogEnabled logEnabled = new MockLogEnabled(); - MockLogEnabled childLogEnabled = new MockLogEnabled(); - MockLogger logger = new MockLogger("base"); - logEnabled.enableLogging(logger); - logEnabled.setupLogger(childLogEnabled); - assertEquals("logEnabled.logger", logger, logEnabled.getLogger()); - assertEquals("childLogEnabled.logger", logger, childLogEnabled.getLogger()); - } - - public void testSetupLoggerOnNonLogEnabled() throws Exception { - MockLogEnabled logEnabled = new MockLogEnabled(); - MockLogger logger = new MockLogger("base"); - logEnabled.enableLogging(logger); - logEnabled.setupLogger(new Object()); - } - - public void testSetupLoggerWithNameOnLogEnabled() throws Exception { - MockLogEnabled logEnabled = new MockLogEnabled(); - MockLogEnabled childLogEnabled = new MockLogEnabled(); - MockLogger logger = new MockLogger("base"); - logEnabled.enableLogging(logger); - logEnabled.setupLogger(childLogEnabled, "child"); - assertEquals("logEnabled.logger", logger, logEnabled.getLogger()); - assertEquals("childLogEnabled.logger.name", "base.child", ((MockLogger) childLogEnabled.getLogger()).getName()); - } - - public void testSetupLoggerWithNullName() throws Exception { - MockLogEnabled logEnabled = new MockLogEnabled(); - MockLogEnabled childLogEnabled = new MockLogEnabled(); - MockLogger logger = new MockLogger("base"); - logEnabled.enableLogging(logger); - try { - logEnabled.setupLogger(childLogEnabled, (String) null); - } catch (IllegalStateException npe) { - return; - } - fail("Expected to fail setting up child logger with null name"); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogEnabled.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogEnabled.java deleted file mode 100644 index ddc136f04..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogEnabled.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author Peter Donald - * @version $Revision$ $Date$ - */ -class MockLogEnabled extends AbstractLogEnabled {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogger.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogger.java deleted file mode 100644 index a403046be..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLogger.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * @author Peter Donald - * @version $Revision$ $Date$ - */ -class MockLogger implements Logger { - private final String m_name; - - MockLogger(String name) { - m_name = name; - } - - public String getName() { - return m_name; - } - - public Logger getChildLogger(final String name) { - return new MockLogger(getName() + "." + name); - } - - public void debug(String message) {} - - public void debug(String message, Throwable throwable) {} - - public boolean isDebugEnabled() { - return false; - } - - public void info(String message) {} - - public void info(String message, Throwable throwable) {} - - public boolean isInfoEnabled() { - return false; - } - - public void warn(String message) {} - - public void warn(String message, Throwable throwable) {} - - public boolean isWarnEnabled() { - return false; - } - - public boolean isFatalErrorEnabled() { - return false; - } - - public void fatalError(String message) {} - - public void fatalError(String message, Throwable throwable) {} - - public void error(String message) {} - - public void error(String message, Throwable throwable) {} - - public boolean isErrorEnabled() { - return false; - } - - public int getThreshold() { - return 0; - } - - public void setThreshold(int threshold) {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLoggerManager.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLoggerManager.java deleted file mode 100644 index 5b7c4b52b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/MockLoggerManager.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.codehaus.plexus.logging; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @author Trygve Laugstøl - */ -public class MockLoggerManager implements LoggerManager { - public void setThreshold(int threshold) {} - - public void setThresholds(int threshold) {} - - public int getThreshold() { - return 0; - } - - public void setThreshold(String role, int threshold) {} - - public void setThreshold(String role, String roleHint, int threshold) {} - - public int getThreshold(String role) { - return 0; - } - - public int getThreshold(String role, String roleHint) { - return 0; - } - - public Logger getLoggerForComponent(String role) { - return new MockLogger(role.getClass().getName()); - } - - public Logger getLoggerForComponent(String role, String roleHint) { - return new MockLogger(role.getClass().getName() + ":" + roleHint); - } - - public void returnComponentLogger(String role) {} - - public void returnComponentLogger(String role, String hint) {} - - public int getActiveLoggerCount() { - return 0; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.java deleted file mode 100644 index 86376c3f1..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.codehaus.plexus.logging.console; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.logging.AbstractLoggerManagerTest; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; - -/** - * Test for {@link org.codehaus.plexus.logging.console.ConsoleLoggerManager} and - * {@link org.codehaus.plexus.logging.console.ConsoleLogger}. - * - * @author Mark H. Wilkinson - * @version $Revision$ - */ -public final class ConsoleLoggerManagerTest extends AbstractLoggerManagerTest { - protected LoggerManager createLoggerManager() throws Exception { - return lookup(LoggerManager.class); - } - - public void testSetAllThresholds() throws Exception { - LoggerManager manager = createLoggerManager(); - manager.setThreshold(Logger.LEVEL_ERROR); - - Logger logger = manager.getLoggerForComponent("test"); - assertEquals(logger.getThreshold(), Logger.LEVEL_ERROR); - - manager.setThresholds(Logger.LEVEL_DEBUG); - assertEquals(logger.getThreshold(), Logger.LEVEL_DEBUG); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java deleted file mode 100644 index 74b87ddf4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.codehaus.plexus.logging.console; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -import junit.framework.TestCase; -import org.codehaus.plexus.util.StringUtils; - -/** - * @author Jason van Zyl - * - */ -public class ConsoleLoggerTest extends TestCase { - public void testConsoleLogger() { - ConsoleLogger logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG, "test"); - - assertTrue(logger.isDebugEnabled()); - - assertTrue(logger.isInfoEnabled()); - - assertTrue(logger.isWarnEnabled()); - - assertTrue(logger.isErrorEnabled()); - - assertTrue(logger.isFatalErrorEnabled()); - - // Save the original print stream. - PrintStream original = System.out; - - Throwable t = new Throwable("throwable"); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - - PrintStream consoleStream = new PrintStream(os); - - System.setOut(consoleStream); - - logger.debug("debug"); - - assertEquals("[DEBUG] debug", getMessage(consoleStream, os)); - - logger.debug("debug", t); - - assertEquals("[DEBUG] debug", getMessage(consoleStream, os)); - - os = new ByteArrayOutputStream(); - - consoleStream = new PrintStream(os); - - System.setOut(consoleStream); - - logger.info("info"); - - assertEquals("[INFO] info", getMessage(consoleStream, os)); - - logger.info("info", t); - - assertEquals("[INFO] info", getMessage(consoleStream, os)); - - os = new ByteArrayOutputStream(); - - consoleStream = new PrintStream(os); - - System.setOut(consoleStream); - - logger.warn("warn"); - - assertEquals("[WARNING] warn", getMessage(consoleStream, os)); - - logger.warn("warn", t); - - assertEquals("[WARNING] warn", getMessage(consoleStream, os)); - - os = new ByteArrayOutputStream(); - - consoleStream = new PrintStream(os); - - System.setOut(consoleStream); - - logger.error("error"); - - assertEquals("[ERROR] error", getMessage(consoleStream, os)); - - logger.error("error", t); - - assertEquals("[ERROR] error", getMessage(consoleStream, os)); - - os = new ByteArrayOutputStream(); - - consoleStream = new PrintStream(os); - - System.setOut(consoleStream); - - logger.fatalError("error"); - - assertEquals("[FATAL ERROR] error", getMessage(consoleStream, os)); - - logger.fatalError("error", t); - - assertEquals("[FATAL ERROR] error", getMessage(consoleStream, os)); - - // Set the original print stream. - System.setOut(original); - } - - private String getMessage(PrintStream consoleStream, ByteArrayOutputStream os) { - consoleStream.flush(); - - consoleStream.close(); - - return StringUtils.chopNewline(os.toString()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/AbstractStartableComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/AbstractStartableComponent.java deleted file mode 100644 index 3d858d0f9..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/AbstractStartableComponent.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.codehaus.plexus.test; - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException; - -import static junit.framework.Assert.assertTrue; - -public class AbstractStartableComponent implements StartableComponent, Startable { - public int startOrder; - - public int stopOrder; - - public AbstractStartableComponent component1; - - public AbstractStartableComponent component2; - - public void start() throws StartingException { - startOrder = startGenerator.getAndIncrement(); - } - - public void stop() throws StoppingException { - stopOrder = stopGenerator.getAndIncrement(); - } - - public void assertStartOrderCorrect() { - if (component1 != null) { - assertTrue("This component started before injected component1", startOrder > component1.startOrder); - } - if (component2 != null) { - assertTrue("This component started before injected component2", startOrder > component2.startOrder); - } - - // assert children are correct - if (component1 != null) { - component1.assertStartOrderCorrect(); - } - if (component2 != null) { - component2.assertStartOrderCorrect(); - } - } - - public void assertStopOrderCorrect() { - if (component1 != null) { - assertTrue("This component stopped after injected component1", stopOrder < component1.stopOrder); - } - if (component2 != null) { - assertTrue("This component stopped after injected component2", stopOrder < component2.stopOrder); - } - - // assert children are correct - if (component1 != null) { - component1.assertStopOrderCorrect(); - } - if (component2 != null) { - component2.assertStopOrderCorrect(); - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Action.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/Action.java deleted file mode 100644 index 1c6c73817..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Action.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Action {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/AddUserAction.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/AddUserAction.java deleted file mode 100644 index 3eed8190d..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/AddUserAction.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class AddUserAction implements Action {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/CircularComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/CircularComponent.java deleted file mode 100644 index a831f7ba4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/CircularComponent.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.codehaus.plexus.test; - -public interface CircularComponent { - static String ROLE = CircularComponent.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Component.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/Component.java deleted file mode 100644 index 09583297d..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Component.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.test.map.Activity; - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Component { - static String ROLE = Component.class.getName(); - - String getHost(); - - int getPort(); - - Activity getActivity(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentA.java deleted file mode 100644 index 6ef1ba1bd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentA.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ComponentA { - static String ROLE = ComponentA.class.getName(); - - ComponentB getComponentB(); - - ComponentC getComponentC(); - - String getHost(); - - int getPort(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentB.java deleted file mode 100644 index b7aae6b82..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentB.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ComponentB { - static String ROLE = ComponentB.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentC.java deleted file mode 100644 index 9001e0ce4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentC.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ComponentC { - static String ROLE = ComponentC.class.getName(); - - ComponentD getComponentD(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentD.java deleted file mode 100644 index fc3f29cf5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentD.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ComponentD { - static String ROLE = ComponentD.class.getName(); - - String getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentManager.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentManager.java deleted file mode 100644 index 2f48ee51c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -public interface ComponentManager { - - List getList(); - - Map getMap(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentWithRoleDefault.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentWithRoleDefault.java deleted file mode 100644 index 304339835..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ComponentWithRoleDefault.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class ComponentWithRoleDefault {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ConcreteThing.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ConcreteThing.java deleted file mode 100644 index 705f138a8..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ConcreteThing.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class ConcreteThing implements Thing {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/CountInstancesComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/CountInstancesComponent.java deleted file mode 100644 index 7f2d4566e..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/CountInstancesComponent.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Component counts number of created instances of it. - * - * @author ptab at newitech.com Piotr Tabor - */ -public class CountInstancesComponent { - public static String ROLE = CountInstancesComponent.class.getName(); - - private static int instances = 0; - - public CountInstancesComponent() { - instances++; - } - - public static void reset() { - instances = 0; - } - - public static int getInstancesCount() { - return instances; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultCircularComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultCircularComponent.java deleted file mode 100644 index 35a59a57b..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultCircularComponent.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.codehaus.plexus.test; - -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException; - -public class DefaultCircularComponent implements CircularComponent, Startable { - private PlexusContainer container; - private String lookup; - private CircularComponent requirement; - - public void start() throws StartingException { - try { - if (lookup != null) { - container.lookup(CircularComponent.class, lookup); - } - } catch (Exception e) { - throw new StartingException("failed", e); - } - } - - public void stop() throws StoppingException {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponent.java deleted file mode 100644 index 80fb8d918..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.test.map.Activity; - -public class DefaultComponent implements Component { - private String host; - - private int port; - - private Activity activity; - - public Activity getActivity() { - return activity; - } - - public String getHost() { - return host; - } - - public int getPort() { - return port; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentA.java deleted file mode 100644 index 63d3ad612..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentA.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @component.role org.codehaus.plexus.test.ComponentA - * @component.requirement org.codehaus.plexus.test.ComponentB - * @component.requirement org.codehaus.plexus.test.ComponentC - * @component.version 1.0 - */ -public class DefaultComponentA implements ComponentA { - private ComponentB componentB; - - private ComponentC componentC; - - /** @default localhost */ - private String host; - - /** @default 10000 */ - private int port; - - public ComponentB getComponentB() { - return componentB; - } - - public ComponentC getComponentC() { - return componentC; - } - - public String getHost() { - return host; - } - - public int getPort() { - return port; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentB.java deleted file mode 100644 index a10c4c5cf..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentB.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * 2.0 - */ -public class DefaultComponentB implements ComponentB {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentC.java deleted file mode 100644 index c8d65a4b0..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentC.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DefaultComponentC implements ComponentC { - private ComponentD componentD; - - public ComponentD getComponentD() { - return componentD; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentD.java deleted file mode 100644 index 30faeb0b4..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentD.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DefaultComponentD implements ComponentD { - private String name; - - public String getName() { - return name; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentManager.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentManager.java deleted file mode 100644 index 17b5d5128..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentManager.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -public class DefaultComponentManager implements ComponentManager { - - private List list; - - private Map map; - - public List getList() { - return list; - } - - public Map getMap() { - return map; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentWithOptionalRequirement.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentWithOptionalRequirement.java deleted file mode 100644 index 6a963e85e..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultComponentWithOptionalRequirement.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DefaultComponentWithOptionalRequirement extends DefaultComponent { - - public Object optionalComponent; -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartService.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartService.java deleted file mode 100644 index 4aae834ee..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartService.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultLoadOnStartService implements LoadOnStartService, Startable { - public static boolean isStarted = false; - - public void start() { - isStarted = true; - } - - public void stop() {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartServiceWithRoleHint.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartServiceWithRoleHint.java deleted file mode 100644 index 0d9190207..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultLoadOnStartServiceWithRoleHint.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultLoadOnStartServiceWithRoleHint implements LoadOnStartService {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceB.java deleted file mode 100644 index 9d5b9951c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceB.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; - -/** - * A simple native plexus component. - */ -public class DefaultServiceB extends AbstractLogEnabled - implements ServiceB, Contextualizable, Initializable, Startable { - public boolean enableLogging; - public boolean contextualize; - public boolean initialize; - public boolean start; - public boolean stop; - - public void enableLogging(Logger logger) { - enableLogging = true; - } - - public void contextualize(Context context) throws ContextException { - contextualize = true; - } - - public void initialize() { - initialize = true; - } - - public void start() { - start = true; - } - - public void stop() { - stop = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceC.java deleted file mode 100644 index 3f55367bd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceC.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; - -public class DefaultServiceC implements ServiceC, Startable { - public boolean started = false; - public boolean stopped = false; - - public void start() { - started = true; - } - - public void stop() { - stopped = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceD.java deleted file mode 100644 index 9cb719259..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceD.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DefaultServiceD implements ServiceD {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceE.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceE.java deleted file mode 100644 index 1d46952cf..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceE.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; - -/** - * A simple native plexus component implementing the manual configuration phase. - */ -public class DefaultServiceE extends AbstractLogEnabled - implements ServiceE, Contextualizable, Initializable, Startable { - public boolean enableLogging; - public boolean configured; - public boolean contextualize; - public boolean initialize; - public boolean start; - public boolean stop; - public boolean serviced; - - public void enableLogging(Logger logger) { - enableLogging = true; - } - - public void contextualize(Context context) throws ContextException { - contextualize = true; - } - - public void initialize() { - initialize = true; - } - - public void start() { - start = true; - } - - public void stop() { - stop = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceH.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceH.java deleted file mode 100644 index 8c2015ffb..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultServiceH.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.test.lifecycle.phase.Eeny; -import org.codehaus.plexus.test.lifecycle.phase.Meeny; -import org.codehaus.plexus.test.lifecycle.phase.Miny; -import org.codehaus.plexus.test.lifecycle.phase.Mo; - -/** This component implements the custom lifecycle defined by the phases - * - * Eeny - * Meeny - * Miny - * Mo - * - */ -public class DefaultServiceH extends AbstractLogEnabled implements ServiceH, Eeny, Meeny, Miny, Mo { - public boolean eeny; - public boolean meeny; - public boolean miny; - public boolean mo; - - // ---------------------------------------------------------------------- - // Lifecycle Management - // ---------------------------------------------------------------------- - - public void eeny() { - eeny = true; - } - - public void meeny() { - meeny = true; - } - - public void miny() { - miny = true; - } - - public void mo() { - mo = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentA.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentA.java deleted file mode 100644 index 988ca4b13..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentA.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.codehaus.plexus.test; - -public class DefaultStartableComponentA extends AbstractStartableComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentB.java deleted file mode 100644 index e34bf6851..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentB.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.codehaus.plexus.test; - -public class DefaultStartableComponentB extends AbstractStartableComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentC.java deleted file mode 100644 index 9645bbb56..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentC.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.codehaus.plexus.test; - -public class DefaultStartableComponentC extends AbstractStartableComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentD.java deleted file mode 100644 index 517bd8497..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentD.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.codehaus.plexus.test; - -public class DefaultStartableComponentD extends AbstractStartableComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentE.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentE.java deleted file mode 100644 index d7d15ab19..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultStartableComponentE.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.codehaus.plexus.test; - -public class DefaultStartableComponentE extends AbstractStartableComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultThingUser.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultThingUser.java deleted file mode 100644 index 19a3ebe65..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/DefaultThingUser.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class DefaultThingUser implements ThingUser { - - public Thing thing; -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LiveComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/LiveComponent.java deleted file mode 100644 index bebf57bbb..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LiveComponent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public class LiveComponent {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartService.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartService.java deleted file mode 100644 index e7d9929fc..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartService.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface LoadOnStartService { - String ROLE = LoadOnStartService.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartServiceWithRoleHint.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartServiceWithRoleHint.java deleted file mode 100644 index 219aa0db8..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/LoadOnStartServiceWithRoleHint.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface LoadOnStartServiceWithRoleHint { - String ROLE = LoadOnStartServiceWithRoleHint.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/PlexusContainerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/PlexusContainerTest.java deleted file mode 100644 index 43898dc4d..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/PlexusContainerTest.java +++ /dev/null @@ -1,792 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicBoolean; - -import junit.framework.TestCase; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.DefaultContainerConfiguration; -import org.codehaus.plexus.DefaultPlexusContainer; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.discovery.DiscoveredComponent; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.lifecycle.BasicLifecycleHandler; -import org.codehaus.plexus.lifecycle.LifecycleHandler; -import org.codehaus.plexus.test.lifecycle.phase.EenyPhase; -import org.codehaus.plexus.test.lifecycle.phase.MeenyPhase; -import org.codehaus.plexus.test.lifecycle.phase.MinyPhase; -import org.codehaus.plexus.test.lifecycle.phase.MoPhase; -import org.codehaus.plexus.test.list.Pipeline; -import org.codehaus.plexus.test.list.Valve; -import org.codehaus.plexus.test.list.ValveFour; -import org.codehaus.plexus.test.list.ValveOne; -import org.codehaus.plexus.test.list.ValveThree; -import org.codehaus.plexus.test.list.ValveTwo; -import org.codehaus.plexus.test.map.Activity; -import org.codehaus.plexus.test.map.ActivityManager; - -public class PlexusContainerTest extends TestCase { - private String basedir; - - private ClassLoader classLoader; - - private String configuration; - - private DefaultPlexusContainer container; - - public PlexusContainerTest(String name) { - super(name); - } - - public void setUp() throws Exception { - basedir = System.getProperty("basedir"); - - classLoader = getClass().getClassLoader(); - - configuration = "/" + getClass().getName().replace('.', '/') + ".xml"; - - assertNotNull(classLoader); - - // ---------------------------------------------------------------------------- - // Context - // ---------------------------------------------------------------------------- - - Map context = new HashMap(); - - context.put("basedir", basedir); - - context.put("plexus.home", basedir + "/target/plexus-home"); - - LifecycleHandler arbitrary = new BasicLifecycleHandler("arbitrary"); - arbitrary.addBeginSegment(new EenyPhase()); - arbitrary.addBeginSegment(new MeenyPhase()); - arbitrary.addBeginSegment(new MinyPhase()); - arbitrary.addBeginSegment(new MoPhase()); - - ContainerConfiguration containerConfiguration = new DefaultContainerConfiguration() - .setName("test") - .setContext(context) - .setContainerConfiguration(configuration) - .addLifecycleHandler(arbitrary); - - container = new DefaultPlexusContainer(containerConfiguration); - } - - public void tearDown() throws Exception { - container.dispose(); - - container = null; - } - - public void testDefaultPlexusContainerSetup() throws Exception { - assertEquals("bar", System.getProperty("foo")); - } - - // ---------------------------------------------------------------------- - // Test the native plexus lifecycle. Note that the configuration for - // this TestCase supplies its own lifecycle, so this test verifies that - // the native lifecycle is available after configuration merging. - // ---------------------------------------------------------------------- - - public void testNativeLifecyclePassage() throws Exception { - DefaultServiceB serviceB = (DefaultServiceB) container.lookup(ServiceB.class); - - // Make sure the component is alive. - assertNotNull(serviceB); - - // Make sure the component went through all the lifecycle phases - assertEquals(true, serviceB.enableLogging); - - assertEquals(true, serviceB.contextualize); - - assertEquals(true, serviceB.initialize); - - assertEquals(true, serviceB.start); - - assertEquals(false, serviceB.stop); - - container.release(serviceB); - - assertEquals(true, serviceB.stop); - } - - public void testConfigurableLifecyclePassage() throws Exception { - DefaultServiceE serviceE = (DefaultServiceE) container.lookup(ServiceE.class); - - // Make sure the component is alive. - assertNotNull(serviceE); - - // Make sure the component went through all the lifecycle phases - assertEquals(true, serviceE.enableLogging); - - assertEquals(true, serviceE.contextualize); - - assertEquals(true, serviceE.initialize); - - assertEquals(true, serviceE.start); - - assertEquals(false, serviceE.stop); - - container.release(serviceE); - - assertEquals(true, serviceE.stop); - } - - /* - * Check that we can get references to a single component with a role - * hint. - */ - public void testSingleComponentLookupWithRoleHint() throws Exception { - // Retrieve an instance of component c. - DefaultServiceC serviceC1 = (DefaultServiceC) container.lookup(ServiceC.class, "first-instance"); - - // Make sure the component is alive. - assertNotNull(serviceC1); - - assertTrue(serviceC1.started); - - assertFalse(serviceC1.stopped); - - // Retrieve a second reference to the same component. - DefaultServiceC serviceC2 = (DefaultServiceC) container.lookup(ServiceC.class, "first-instance"); - - // Make sure component is alive. - assertNotNull(serviceC2); - - assertTrue(serviceC2.started); - - assertFalse(serviceC2.stopped); - - // Let's make sure it gave us back the same component. - assertSame(serviceC1, serviceC2); - - container.release(serviceC1); - - // The component should still be alive. - assertTrue(serviceC2.started); - - assertTrue(serviceC2.stopped); - - container.release(serviceC2); - - // The component should now have been stopped. - assertTrue(serviceC2.started); - - assertTrue(serviceC2.stopped); - } - - /* - * Check that distinct components with the same implementation are managed correctly. - */ - public void testMultipleSingletonComponentInstances() throws Exception { - // Retrieve an instance of component c. - DefaultServiceC serviceC1 = (DefaultServiceC) container.lookup(ServiceC.class, "first-instance"); - - // Make sure the component is alive. - assertNotNull(serviceC1); - - assertTrue(serviceC1.started); - - assertFalse(serviceC1.stopped); - - // Retrieve an instance of component c, with a different role hint. - // This should give us a different component instance. - DefaultServiceC serviceC2 = (DefaultServiceC) container.lookup(ServiceC.class, "second-instance"); - - // Make sure component is alive. - assertNotNull(serviceC2); - - assertTrue(serviceC2.started); - - assertFalse(serviceC2.stopped); - - // The components should be distinct. - assertNotSame(serviceC1, serviceC2); - - container.release(serviceC1); - - // The first component should now have been stopped, the second - // one should still be alive. - assertTrue(serviceC1.started); - - assertTrue(serviceC1.stopped); - - assertTrue(serviceC2.started); - - assertFalse(serviceC2.stopped); - - container.release(serviceC2); - - // The second component should now have been stopped. - assertTrue(serviceC2.started); - - assertTrue(serviceC2.stopped); - } - - // ---------------------------------------------------------------------- - // Test using an arbitrary component lifecycle handler - // ---------------------------------------------------------------------- - - public void testArbitraryLifecyclePassageUsingFourArbitraryPhases() throws Exception { - // Retrieve an manager of component H. - DefaultServiceH serviceH = (DefaultServiceH) container.lookup(ServiceH.class); - - // Make sure the component is alive. - assertNotNull(serviceH); - - // Make sure the component went through all the lifecycle phases - assertEquals(true, serviceH.eeny); - - assertEquals(true, serviceH.meeny); - - assertEquals(true, serviceH.miny); - - assertEquals(true, serviceH.mo); - - container.release(serviceH); - } - - public void testLookupAll() throws Exception { - Map components = container.lookupMap(ServiceC.class); - - assertNotNull(components); - - assertEquals(2, components.size()); - - ServiceC component = components.get("first-instance"); - - assertNotNull(component); - - component = components.get("second-instance"); - - assertNotNull(component); - - container.releaseAll(components); - } - - public void testAutomatedComponentConfigurationUsingXStreamPoweredComponentConfigurator() throws Exception { - Component component = container.lookup(Component.class); - - assertNotNull(component); - - assertNotNull(component.getActivity()); - - assertEquals("localhost", component.getHost()); - - assertEquals(10000, component.getPort()); - } - - public void testAutomatedComponentComposition() throws Exception { - ComponentA componentA = container.lookup(ComponentA.class); - - assertNotNull(componentA); - - assertEquals("localhost", componentA.getHost()); - - assertEquals(10000, componentA.getPort()); - - ComponentB componentB = componentA.getComponentB(); - - assertNotNull(componentB); - - ComponentC componentC = componentA.getComponentC(); - - assertNotNull(componentC); - - ComponentD componentD = componentC.getComponentD(); - - assertNotNull(componentD); - - assertEquals("jason", componentD.getName()); - } - - public void testComponentCompositionWhereTargetFieldIsAMap() throws Exception { - ActivityManager am = container.lookup(ActivityManager.class); - - Activity one = am.getActivity("one"); - - assertNotNull(one); - - // repeated retrieval from map should not cause re-lookup even if instantiation strategy is per-lookup - assertSame(one, am.getActivity("one")); - - assertFalse(one.getState()); - - am.execute("one"); - - assertTrue(one.getState()); - - Activity two = am.getActivity("two"); - - assertNotNull(two); - - assertFalse(two.getState()); - - am.execute("two"); - - assertTrue(two.getState()); - } - - public void testComponentCompositionWhereTargetFieldIsAPartialMap() throws Exception { - ActivityManager am = container.lookup(ActivityManager.class, "slim"); - - assertEquals(1, am.getActivityCount()); - - Activity one = am.getActivity("one"); - - assertNotNull(one); - - assertFalse(one.getState()); - - am.execute("one"); - - assertTrue(one.getState()); - } - - public void testComponentCompositionWhereTargetFieldIsAList() throws Exception { - Pipeline pipeline = container.lookup(Pipeline.class); - - List valves = pipeline.getValves(); - - for (Object valve : valves) { - // repeated retrieval from list should not cause re-lookup even if instantiation strategy is per-lookup - assertSame(valve, valve); - } - - assertFalse(((Valve) valves.get(0)).getState()); - - assertFalse(((Valve) valves.get(1)).getState()); - - pipeline.execute(); - - assertTrue(((Valve) valves.get(0)).getState()); - - assertTrue(((Valve) valves.get(1)).getState()); - } - - public void testComponentCompositionWhereTargetFieldIsAPartialList() throws Exception { - Pipeline pipeline = container.lookup(Pipeline.class, "slim"); - - List valves = pipeline.getValves(); - - assertEquals(valves.size(), 1); - - assertFalse(((Valve) valves.get(0)).getState()); - - pipeline.execute(); - - assertTrue(((Valve) valves.get(0)).getState()); - } - - public void testComponentCompositionWhereTargetFieldAMapThatMustRetainTheOrderOfComponentsGivenASetOfRoleHints() - throws Exception { - Pipeline pipeline = container.lookup(Pipeline.class, "chubby"); - - Map valveMap = pipeline.getValveMap(); - - List valves = new ArrayList(valveMap.values()); - - assertEquals("Expecting three valves.", 4, valves.size()); - - assertTrue("Expecting valve one.", valves.get(0) instanceof ValveOne); - - assertTrue("Expecting valve two.", valves.get(1) instanceof ValveTwo); - - assertTrue("Expecting valve three.", valves.get(2) instanceof ValveThree); - - assertTrue("Expecting valve four.", valves.get(3) instanceof ValveFour); - } - - public void testLookupOfComponentThatShouldBeDiscovered() throws Exception { - DiscoveredComponent discoveredComponent = container.lookup(DiscoveredComponent.class); - - assertNotNull(discoveredComponent); - } - - public void testStartableComponentSnake() throws Exception { - StartableComponent ca = container.lookup(StartableComponent.class, "A-snake"); - - assertNotNull(ca); - - ca.assertStartOrderCorrect(); - - container.dispose(); - - ca.assertStopOrderCorrect(); - } - - public void testStartableComponentTree() throws Exception { - StartableComponent ca = container.lookup(StartableComponent.class, "A-tree"); - - assertNotNull(ca); - - ca.assertStartOrderCorrect(); - - container.dispose(); - - ca.assertStopOrderCorrect(); - } - - public void testLookupCircularity() throws Exception { - try { - container.lookup(CircularComponent.class, "A"); - fail("Expected ComponentLookupException due to circularity"); - } catch (ComponentLookupException e) { - // todo actually test nested exception is as expected when - } - } - - public void testAddComponent() throws Exception { - LiveComponent live = new LiveComponent(); - - container.addComponent(live, LiveComponent.class.getName()); - - LiveComponent c = container.lookup(LiveComponent.class); - - assertSame(live, c); - } - - public void testComponentOverride() throws Exception { - assertNotNull(container.lookup(Component.class)); - - Component live = new Component() { - public Activity getActivity() { - return null; - } - - public String getHost() { - return null; - } - - public int getPort() { - return 0; - } - }; - - container.addComponent(live, Component.class, null); - - assertSame(live, container.lookup(Component.class)); - } - - public void testUpdateOfActiveComponentCollectionUponChangeOfThreadContextClassLoader() throws Exception { - ComponentManager manager = container.lookup(ComponentManager.class); - - Map map = manager.getMap(); - assertNotNull(map); - assertEquals(0, map.size()); - - List list = manager.getList(); - assertNotNull(list); - assertEquals(0, list.size()); - - /* - * Below we're creating two realms which basically contain the same components, only their bytecode/version - * differs. When we switch the thread's context class loader, the active component collections in the component - * manager must accurately reflect the components from the current realm (and not from a previous realm). - */ - - ClassRealm realmA = container.createChildRealm("realm-a"); - realmA.addURL(new File("src/test/test-components/component-a-1.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmA); - - ClassRealm realmB = container.createChildRealm("realm-b"); - realmB.addURL(new File("src/test/test-components/component-a-2.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmB); - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - - try { - Thread.currentThread().setContextClassLoader(realmA); - - map = manager.getMap(); - assertNotNull(map); - assertEquals(1, map.size()); - assertSame(realmA, map.values().iterator().next().getClass().getClassLoader()); - - list = manager.getList(); - assertNotNull(list); - assertEquals(1, list.size()); - assertSame(realmA, list.iterator().next().getClass().getClassLoader()); - - Thread.currentThread().setContextClassLoader(realmB); - - map = manager.getMap(); - assertNotNull(map); - assertEquals(1, map.size()); - assertSame(realmB, map.values().iterator().next().getClass().getClassLoader()); - - list = manager.getList(); - assertNotNull(list); - assertEquals(1, list.size()); - assertSame(realmB, list.iterator().next().getClass().getClassLoader()); - } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - public void testUpdateOfActiveComponentCollectionUponChangeOfThreadContextClassLoaderFromParentToChildRealm() - throws Exception { - ComponentManager manager = container.lookup(ComponentManager.class); - - Map map = manager.getMap(); - assertNotNull(map); - assertEquals(0, map.size()); - - List list = manager.getList(); - assertNotNull(list); - assertEquals(0, list.size()); - - /* - * Below we're creating two realms which basically contain the same components, only their bytecode/version - * differs. The realms form a parent-child relationship where the child imports the component role from the - * parent. When we first load from the parent and then switch the thread's context class loader to the child, - * the active component collections in the component manager must accurately reflect the components from the - * current realm (and not from a previous realm). - */ - - ClassRealm realmA = container.createChildRealm("realm-a"); - realmA.addURL(new File("src/test/test-components/component-a-1.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmA); - - ClassRealm realmB = realmA.createChildRealm("realm-b"); - realmB.importFrom(realmA, "org.codehaus.plexus.components.A"); - realmB.importFromParent("nothing"); - realmB.addURL(new File("src/test/test-components/component-a-2.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmB); - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - - try { - Thread.currentThread().setContextClassLoader(realmA); - - map = manager.getMap(); - assertNotNull(map); - assertEquals(1, map.size()); - assertSame(realmA, map.values().iterator().next().getClass().getClassLoader()); - - list = manager.getList(); - assertNotNull(list); - assertEquals(1, list.size()); - assertSame(realmA, list.iterator().next().getClass().getClassLoader()); - - Thread.currentThread().setContextClassLoader(realmB); - - map = manager.getMap(); - assertNotNull(map); - assertEquals(1, map.size()); - assertSame(realmB, map.values().iterator().next().getClass().getClassLoader()); - - list = manager.getList(); - assertNotNull(list); - assertEquals(1, list.size()); - assertSame(realmB, list.iterator().next().getClass().getClassLoader()); - } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - public void testComponentLookupFromParentRealmOfImportedRealms() throws Exception { - ComponentManager manager = container.lookup(ComponentManager.class); - - Map map = manager.getMap(); - assertNotNull(map); - assertEquals(0, map.size()); - - List list = manager.getList(); - assertNotNull(list); - assertEquals(0, list.size()); - - URL componentUrl = new File("src/test/test-components/component-a-1.0-SNAPSHOT.jar") - .toURI() - .toURL(); - - ClassRealm realmP = container.createChildRealm("parent-of-imported-realm"); - realmP.addURL(componentUrl); - container.discoverComponents(realmP); - - ClassRealm realmI = realmP.createChildRealm("imported-realm"); - - ClassRealm realmL = container.createChildRealm("lookup-realm"); - realmL.importFrom(realmI, "org.something"); - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - - try { - Thread.currentThread().setContextClassLoader(realmL); - - map = manager.getMap(); - assertNotNull(map); - assertEquals(1, map.size()); - assertSame(realmP, map.values().iterator().next().getClass().getClassLoader()); - - list = manager.getList(); - assertNotNull(list); - assertEquals(1, list.size()); - assertSame(realmP, list.iterator().next().getClass().getClassLoader()); - } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - public void testOptionalComponentRequirement() throws Exception { - DefaultComponentWithOptionalRequirement ca = - (DefaultComponentWithOptionalRequirement) container.lookup(Component.class, "with-optional"); - - assertNotNull(ca); - - assertNotNull(ca.getActivity()); - - assertNull(ca.optionalComponent); - } - - public void testLookupOfComponentThatHasARequirementWithoutRoleHintAndTheOneAndOnlyImplHasNoDefaultHint() - throws Exception { - DefaultThingUser component = (DefaultThingUser) container.lookup(ThingUser.class); - - assertNotNull(component.thing); - } - - public void testSingleLookupWithAndWithoutRoleHint() throws Exception { - ComponentWithRoleDefault withRoleHint = container.lookup(ComponentWithRoleDefault.class, "default"); - - ComponentWithRoleDefault withoutRoleHint = container.lookup(ComponentWithRoleDefault.class); - - assertSame(withRoleHint, withoutRoleHint); - } - - public void testLookupUponChangeOfThreadContextClassLoaderFromParentToChildRealm() throws Exception { - /* - * Below we're creating two realms which basically contain the same components, only their bytecode/version - * differs. The realms form a parent-child relationship where the child imports the component role from the - * parent. When we first lookup from the parent and then switch the thread's context class loader to the child, - * the second lookup must accurately reflect the components from the current realm (and not from a previous - * realm). - */ - - ClassRealm realmA = container.createChildRealm("realm-a"); - realmA.addURL(new File("src/test/test-components/component-a-1.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmA); - - ClassRealm realmB = realmA.createChildRealm("realm-b"); - realmB.importFrom(realmA, "org.codehaus.plexus.components.A"); - realmB.importFromParent("nothing"); - realmB.addURL(new File("src/test/test-components/component-a-2.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realmB); - - Class role = realmA.loadClass("org.codehaus.plexus.components.A"); - - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); - - try { - Thread.currentThread().setContextClassLoader(realmA); - - Object comp1 = container.lookup(role, "default"); - - Thread.currentThread().setContextClassLoader(realmB); - - Object comp2 = container.lookup(role, "default"); - - assertNotNull(comp1); - assertNotNull(comp2); - assertNotSame(comp1, comp2); - assertSame(realmA, comp1.getClass().getClassLoader()); - assertSame(realmB, comp2.getClass().getClassLoader()); - } finally { - Thread.currentThread().setContextClassLoader(oldClassLoader); - } - } - - public void testSafeConcurrentAccessToActiveComponentCollection() throws Exception { - ComponentManager manager = container.lookup(ComponentManager.class); - - final Map map = manager.getMap(); - assertNotNull(map); - assertEquals(0, map.size()); - - final List list = manager.getList(); - assertNotNull(list); - assertEquals(0, list.size()); - - final AtomicBoolean go = new AtomicBoolean(false); - - final List exceptions = new CopyOnWriteArrayList(); - Thread[] threads = new Thread[64]; - final CountDownLatch latch = new CountDownLatch(threads.length); - for (int i = 0; i < threads.length; i++) { - threads[i] = new Thread() { - @Override - public void run() { - try { - ClassRealm realm = container.createChildRealm( - "realm-" + UUID.randomUUID().toString()); - realm.addURL(new File("src/test/test-components/component-a-1.0-SNAPSHOT.jar") - .toURI() - .toURL()); - container.discoverComponents(realm); - Thread.currentThread().setContextClassLoader(realm); - - while (!go.get()) { - // just wait - } - - for (int j = 0; j < 1000; j++) { - // this just must not die with some exception - for (Object value : map.values()) { - value.toString(); - } - for (Object value : list) { - value.toString(); - } - } - } catch (Exception e) { - e.printStackTrace(); - exceptions.add(e); - } finally { - latch.countDown(); - } - } - }; - threads[i].start(); - } - go.set(true); - latch.await(); - - assertTrue(exceptions.toString(), exceptions.isEmpty()); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceB.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceB.java deleted file mode 100644 index 848dd0ea3..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceB.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ServiceB { - static String ROLE = ServiceB.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceC.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceC.java deleted file mode 100644 index b9c4540da..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceC.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ServiceC { - static String ROLE = ServiceC.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceD.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceD.java deleted file mode 100644 index d705ba588..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceD.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ServiceD { - static String ROLE = ServiceD.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceE.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceE.java deleted file mode 100644 index a1f40a767..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceE.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ServiceE { - static String ROLE = ServiceE.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceH.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceH.java deleted file mode 100644 index 5be82241a..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ServiceH.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ServiceH { - static String ROLE = ServiceH.class.getName(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/SimpleLifecycleHandler.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/SimpleLifecycleHandler.java deleted file mode 100644 index 4ad0f9261..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/SimpleLifecycleHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.lifecycle.AbstractLifecycleHandler; - -/** - * - * - * @author Jason van Zyl - * - */ -public class SimpleLifecycleHandler extends AbstractLifecycleHandler { - public String getId() { - return "simple"; - } - - public void initialize() {} -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/StartableComponent.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/StartableComponent.java deleted file mode 100644 index ab1b52ddc..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/StartableComponent.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.codehaus.plexus.test; - -import java.util.concurrent.atomic.AtomicInteger; - -public interface StartableComponent { - static String ROLE = StartableComponent.class.getName(); - - AtomicInteger startGenerator = new AtomicInteger(1); - - AtomicInteger stopGenerator = new AtomicInteger(1); - - void assertStartOrderCorrect(); - - void assertStopOrderCorrect(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Thing.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/Thing.java deleted file mode 100644 index 99669f4d8..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/Thing.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface Thing {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ThingUser.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/ThingUser.java deleted file mode 100644 index 857131440..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/ThingUser.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.codehaus.plexus.test; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -public interface ThingUser {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Eeny.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Eeny.java deleted file mode 100644 index cc3e87d70..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Eeny.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Eeny { - void eeny(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/EenyPhase.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/EenyPhase.java deleted file mode 100644 index 0ea4cdb8c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/EenyPhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class EenyPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Eeny) { - ((Eeny) object).eeny(); - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Meeny.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Meeny.java deleted file mode 100644 index 323ddc2d5..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Meeny.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Meeny { - void meeny(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MeenyPhase.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MeenyPhase.java deleted file mode 100644 index 2999ce218..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MeenyPhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class MeenyPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Meeny) { - ((Meeny) object).meeny(); - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Miny.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Miny.java deleted file mode 100644 index 4ee8f0870..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Miny.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Miny { - void miny(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MinyPhase.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MinyPhase.java deleted file mode 100644 index 473946752..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MinyPhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class MinyPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Miny) { - ((Miny) object).miny(); - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Mo.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Mo.java deleted file mode 100644 index 15c6873a6..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/Mo.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Mo { - void mo(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MoPhase.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MoPhase.java deleted file mode 100644 index 14a9e2267..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/lifecycle/phase/MoPhase.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.codehaus.plexus.test.lifecycle.phase; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.component.manager.ComponentManager; -import org.codehaus.plexus.lifecycle.phase.AbstractPhase; - -public class MoPhase extends AbstractPhase { - public void execute(Object object, ComponentManager manager, ClassRealm lookupRealm) { - if (object instanceof Mo) { - ((Mo) object).mo(); - } - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/AbstractValve.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/AbstractValve.java deleted file mode 100644 index 1db108596..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/AbstractValve.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public abstract class AbstractValve implements Valve { - private boolean state; - - public boolean getState() { - return state; - } - - public void execute() { - state = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/DefaultPipeline.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/DefaultPipeline.java deleted file mode 100644 index d1072ab18..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/DefaultPipeline.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultPipeline implements Pipeline { - private List valves; - - private Map valveMap; - - public void execute() { - for (Object valve : valves) { - ((Valve) valve).execute(); - } - } - - public List getValves() { - return valves; - } - - public Map getValveMap() { - return valveMap; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Pipeline.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Pipeline.java deleted file mode 100644 index fd2133cbe..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Pipeline.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.List; -import java.util.Map; - -/** - * @author Jason van Zyl - * - */ -public interface Pipeline { - static String ROLE = Pipeline.class.getName(); - - void execute(); - - List getValves(); - - Map getValveMap(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Valve.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Valve.java deleted file mode 100644 index ba8b35991..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/Valve.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Valve { - static String ROLE = Valve.class.getName(); - - void execute(); - - boolean getState(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveFour.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveFour.java deleted file mode 100644 index 668afa491..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveFour.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ValveFour extends AbstractValve {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveOne.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveOne.java deleted file mode 100644 index 9c0f8cc91..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveOne.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ValveOne extends AbstractValve {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveThree.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveThree.java deleted file mode 100644 index 960d4e618..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveThree.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ValveThree extends AbstractValve {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveTwo.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveTwo.java deleted file mode 100644 index 9fbf5c3af..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/list/ValveTwo.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.list; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ValveTwo extends AbstractValve {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/AbstractActivity.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/AbstractActivity.java deleted file mode 100644 index 17ecd172c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/AbstractActivity.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public abstract class AbstractActivity implements Activity { - private boolean state; - - public boolean getState() { - return state; - } - - public void execute() { - state = true; - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/Activity.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/Activity.java deleted file mode 100644 index 4345b5ba2..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/Activity.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface Activity { - static String ROLE = Activity.class.getName(); - - void execute(); - - boolean getState(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityManager.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityManager.java deleted file mode 100644 index 05cb9e07c..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityManager.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public interface ActivityManager { - static String ROLE = ActivityManager.class.getName(); - - void execute(String id); - - Activity getActivity(String id); - - int getActivityCount(); -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityOne.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityOne.java deleted file mode 100644 index da94af30e..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityOne.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ActivityOne extends AbstractActivity {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityTwo.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityTwo.java deleted file mode 100644 index 3628b8e09..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/ActivityTwo.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - * - * @author Jason van Zyl - * - */ -public class ActivityTwo extends AbstractActivity {} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/DefaultActivityManager.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/DefaultActivityManager.java deleted file mode 100644 index 6aaf4f8bb..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/DefaultActivityManager.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; - -/** - * - * - * @author Jason van Zyl - * - */ -public class DefaultActivityManager implements ActivityManager { - private Map activities; - - public void execute(String id) { - getActivity(id).execute(); - } - - public Activity getActivity(String id) { - return (Activity) activities.get(id); - } - - public int getActivityCount() { - return activities.size(); - } -} diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/NoComponentsMapTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/NoComponentsMapTest.java deleted file mode 100644 index e2c461ecd..000000000 --- a/plexus-container-default/src/test/java/org/codehaus/plexus/test/map/NoComponentsMapTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.codehaus.plexus.test.map; - -/* - * Copyright 2001-2006 Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.PlexusTestCase; - -/** - * @author Trygve Laugstøl - */ -public class NoComponentsMapTest extends PlexusTestCase { - public void testNoComponents() throws Exception { - ActivityManager manager; - - manager = lookup(ActivityManager.class); - - assertEquals(0, manager.getActivityCount()); - } -} diff --git a/plexus-container-default/src/test/resources/META-INF/plexus/components.xml b/plexus-container-default/src/test/resources/META-INF/plexus/components.xml deleted file mode 100644 index 4f91ea4da..000000000 --- a/plexus-container-default/src/test/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.codehaus.plexus.component.discovery.DiscoveredComponent - org.codehaus.plexus.component.discovery.DefaultDiscoveredComponent - - - org.codehaus.plexus.component.factory.ComponentFactory - testFactory2 - org.codehaus.plexus.component.factory.TestComponentFactory2 - - - - - plexus - monkey - 1.0 - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/META-INF/plexus/plexus.xml b/plexus-container-default/src/test/resources/META-INF/plexus/plexus.xml deleted file mode 100644 index 86d846d59..000000000 --- a/plexus-container-default/src/test/resources/META-INF/plexus/plexus.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - org.codehaus.plexus.component.factory.ComponentFactory - testFactory1 - org.codehaus.plexus.component.factory.TestComponentFactory1 - - - org.codehaus.plexus.test.CountInstancesComponent - org.codehaus.plexus.test.CountInstancesComponent - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/application/components.xml b/plexus-container-default/src/test/resources/application/components.xml deleted file mode 100644 index 7922158db..000000000 --- a/plexus-container-default/src/test/resources/application/components.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - server - - - - - - - - - two - - - - - - - - - three - - - - - - - - - - - - - four - - - - one - two - three - - - - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/application/configuration-mapping.xml b/plexus-container-default/src/test/resources/application/configuration-mapping.xml deleted file mode 100644 index f3d2b084d..000000000 --- a/plexus-container-default/src/test/resources/application/configuration-mapping.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 8080 - localhost - - Santa Claus - santa@northpole.com - - - - email - Email - - - irc - Irc - - - - - - one - one - one - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/application/sentinel.xml b/plexus-container-default/src/test/resources/application/sentinel.xml deleted file mode 100644 index a21e4996d..000000000 --- a/plexus-container-default/src/test/resources/application/sentinel.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 8080 - localhost - - Santa Claus - santa@northpole.com - - - - email - Email - - - irc - Irc - - - - - - one - one - one - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/inline-configuration.properties b/plexus-container-default/src/test/resources/inline-configuration.properties deleted file mode 100644 index 4f4b311bd..000000000 --- a/plexus-container-default/src/test/resources/inline-configuration.properties +++ /dev/null @@ -1,2 +0,0 @@ -first-name=andrew -last-name=williams \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/inline-configuration.xml b/plexus-container-default/src/test/resources/inline-configuration.xml deleted file mode 100644 index e622040b9..000000000 --- a/plexus-container-default/src/test/resources/inline-configuration.xml +++ /dev/null @@ -1,4 +0,0 @@ - - jason - van zyl - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/jar-repository/a.jar b/plexus-container-default/src/test/resources/jar-repository/a.jar deleted file mode 100644 index 60afd9060d32fe70267aa2802a7a8408930af203..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 990 zcmWIWW@h1H00D<4Yke>SN^k;cU)K;vT~9wZ{Q#gc5e5z*v_(@Uf~?Hf(a+P(H8@1i z*X^_KnbSVrx_TFRy>+$DojJcb$l!|cgQrDjoP`Q?Jbcc1gfet7s``HI5v|xcr#nd4 zJ1Dqhu9l;e&ljG@ygen8dCrKKGYS_$O8YtNHAS+in69>*Lr+M94<_gXpUhenkGJWm~tJ*pD=+PdrU z-w89aCh%0;cmlby|OXi(EvagxhBs1?++KMx>`M;D6 zJ^lyYonEM=bct)J#H-5{GkvyF5}q*yO(-Ps;}O4z3wFJS{1vuD4{B0 zl~}2rqOy)$ZNuKQ+h(E4%KaN%uFmA*n9ixYW`T`$&9s?<-`iqL|Mwlbb3l#7PviNQ z{?1meFwU3DjZ)u=gCgh2DXC{}j0_Baff$i`eg^#01BN#o@BmqfdId%K1*t_PnW@Fz zAsQN|^gVR7PWtFRV*_(wGWN*2n=D;LXYgl4S)#DPWMV10{O~0AmRq%>V!Z diff --git a/plexus-container-default/src/test/resources/jar-repository/b.jar b/plexus-container-default/src/test/resources/jar-repository/b.jar deleted file mode 100644 index 6b9353951eae88118e86b8b8e503c6fd5371faae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmWIWW@h1H00D<4Yke>SN^k;cU)K;vT~9wZ{Q#gc5e5z*v_(@Uf~?Hf(a+P(H8@1i z*X^_KnbSVrx_TFRy>+$DojJcb$l!|cgQrDjoP`Q?Jbcc1gfet7s``HI5v|xcr#nd4 zJ1Dqhu9l;e&ljG@ygen8dCrKKG@OuV-?yl|C#%ADe*!c#lXqz7qF z{x34OYN1w>^wA`lqFs|#DYX1uo}oE^>50^dotbMxC$jg{KegsfFT2}zR(8GkS>ozjwoiWd zICa()3)g1(lXKWkINYq76T3{BgdCBe^aKM-8r6YJxHhEJg={gl2#1&eviJm$35tGH8<9N$N&qmh br11ri2~Q3I-mGjODHb4n0Hp0eiHQLKo_X=@ diff --git a/plexus-container-default/src/test/resources/jar-repository/c.jar b/plexus-container-default/src/test/resources/jar-repository/c.jar deleted file mode 100644 index e54f08e7aede1d1e784788e2cff20f99e72ad617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmWIWW@h1H00D<4Yke>SN^k;cU)K;vT~9wZ{Q#gc5e5z*v_(@Uf~?Hf(a+P(H8@1i z*X^_KnbSVrx_TFRy>+$DojJcb$l!|cgQrDjoP`Q?Jbcc1gfet7s``HI5v|xcr#nd4 zJ1Dqhu9l;e&ljG@ygen8dCrKKGGHSuZ&!vA9^b?=0WJ0D;!?7vxuk>}ix0 zd+T&VV76KqFLzRXw0X=*vz6DXBRzF&8rp@54JV&DWBEDNX#MxcoCn;mJIdxt%Sy`~ zoVD6#Dz{Uu!5zUKgZti1;wydDtt!^(UfU5|Ruwp}qePu+>DT)vrxx!LIHSRNNb=y# zC!rHhEWKo{{l)*0R*ZzfPb=Y;b!ANY0u$%?}hMM{g-v%FyYV1?A{CX(Hn4>FfxfSVPp4H4VO!3>IR7+BJ%4rIc$A;o=wH^O3U(E%|5Wbp|g6BIe9HX?fh6g@Dor11ri W36HD*Z&o&t6bleO0Md6DK|BD1iMrbW diff --git a/plexus-container-default/src/test/resources/jar-repository/d.jar b/plexus-container-default/src/test/resources/jar-repository/d.jar deleted file mode 100644 index 31a5cabef55b62ba332663d080d458cabb448dae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 718 zcmWIWW@h1H00D<4Yke>SN^k;cU)K;vT~9wZ{Q#gc5e5z*v_(@Uf~?Hf(a+P(H8@1i z*X^_KnbSVrx_TFRy>+$DojJcb$l!|cgQrDjoP`Q?Jbcc1gfet7s``HI5v|xcr#nd4 zJ1Dqhu9l;e&ljG@ygen8dCrKKGF*A zi+Q>#N+4=+q05EoM;(Rk1UxM&wmrV-PPfJ56alf$6H0-rZvA)OYqgU5AP4`!EVm8i zN4NSsiMncB{B-#vHJKL%Kg!iO;^wl}8wp - - - org.codehaus.plexus.test.LoadOnStartService - - - - - - org.codehaus.plexus.test.LoadOnStartService - org.codehaus.plexus.test.DefaultLoadOnStartService - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/autowire/AutowireCompositionTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/autowire/AutowireCompositionTest.xml deleted file mode 100644 index f449a1092..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/autowire/AutowireCompositionTest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - org.codehaus.plexus.component.composition.autowire.One - org.codehaus.plexus.component.composition.autowire.DefaultOne - - - org.codehaus.plexus.component.composition.autowire.Two - org.codehaus.plexus.component.composition.autowire.DefaultTwo - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/components.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/components.xml deleted file mode 100644 index 81eb73245..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/components.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - org.codehaus.plexus.component.composition.ComponentA - org.codehaus.plexus.component.composition.DefaultComponentA - field - - - org.codehaus.plexus.component.composition.ComponentB - - - - localhost - 10000 - - - - org.codehaus.plexus.component.composition.ComponentB - org.codehaus.plexus.component.composition.DefaultComponentB - setter - - - org.codehaus.plexus.component.composition.ComponentC - - - - - org.codehaus.plexus.component.composition.ComponentC - org.codehaus.plexus.component.composition.DefaultComponentC - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/setter/SetterCompositionTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/setter/SetterCompositionTest.xml deleted file mode 100644 index 845550080..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/composition/setter/SetterCompositionTest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - org.codehaus.plexus.component.composition.setter.Component - org.codehaus.plexus.component.composition.setter.ChildComponent - setter - - - org.codehaus.plexus.component.composition.ComponentA - - - org.codehaus.plexus.component.composition.ComponentB - - - - - org.codehaus.plexus.component.composition.ComponentA - org.codehaus.plexus.component.composition.DefaultComponentA - - - org.codehaus.plexus.component.composition.ComponentB - org.codehaus.plexus.component.composition.DefaultComponentB - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.xml deleted file mode 100644 index 9a43da407..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/factory/nonjava/NonJavaComponentFactoryTest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - org.codehaus.plexus.component.factory.ComponentFactory - nonjava - org.codehaus.plexus.component.factory.nonjava.NonJavaComponentFactory - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.xml deleted file mode 100644 index 5bcc96bbf..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/ClassicSingletonComponentManagerTest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - org.codehaus.plexus.component.manager.Component - org.codehaus.plexus.component.manager.DefaultComponent - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.xml deleted file mode 100644 index ad5b63349..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - org.codehaus.plexus.component.manager.SlowComponent - org.codehaus.plexus.component.manager.SlowComponent - - 300 - - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/components.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/components.xml deleted file mode 100644 index be273bddb..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/components.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - org.codehaus.plexus.test.ComponentA - one - org.codehaus.plexus.test.DefaultComponentA - - - org.codehaus.plexus.test.ComponentA - two - org.codehaus.plexus.test.DefaultComponentA - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/avalon.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/avalon.xml deleted file mode 100644 index 45617cbb9..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/avalon.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - ${foo.home}/jars - ${my.home}/resources - - - user-conf-dir - - - logging-implementation - - INFO - - - - - org.codehaus.plexus.personality.avalon.AvalonComponentRepository - - - - - - frankie - - - - - - custom - - - custom - - - - - - - avalon - - - avalon - Avalon Lifecycle Handler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.plexus.ServiceA - org.codehaus.plexus.DefaultServiceA - - - - - - - org.codehaus.plexus.ServiceB - org.codehaus.plexus.DefaultServiceB - - - - - - org.codehaus.plexus.ServiceC - first-instance - org.codehaus.plexus.DefaultServiceC - - - - - org.codehaus.plexus.ServiceC - second-instance - org.codehaus.plexus.DefaultServiceC - - - - - - org.codehaus.plexus.ServiceE - org.codehaus.plexus.DefaultServiceE - per-lookup - - - - - - org.codehaus.plexus.ServiceG - org.codehaus.plexus.DefaultServiceG - singleton - - - - - - - org.codehaus.plexus.ServiceH - org.codehaus.plexus.DefaultServiceH - arbitrary - - - - org.codehaus.plexus.LoadOnStartService - org.codehaus.plexus.DefaultLoadOnStartService - - - - - org.codehaus.plexus.LoadOnStartServiceWithRoleHint - role-hint - org.codehaus.plexus.DefaultLoadOnStartServiceWithRoleHint - - - - - org.codehaus.plexus.ConfigureService - org.codehaus.plexus.DefaultConfigureService - singleton - - - 1 - 2 - - - - - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.xml deleted file mode 100644 index 08d7257f7..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/ExtendingConfigurationSourceTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - org.codehaus.plexus.configuration.source.ConfigurationSource - - dummy - - org.codehaus.plexus.configuration.source.ADummyConfigurationSource - - - - - org.codehaus.plexus.configuration.source.ConfigurationSource - - anotherDummy - - org.codehaus.plexus.configuration.source.AnotherDummyConfigurationSource - - - - org.codehaus.plexus.configuration.source.ConfigurationSource - dummy - - - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.xml deleted file mode 100644 index a785aa438..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/configuration/source/OverridingConfigurationSourceTest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - org.codehaus.plexus.configuration.source.ConfigurationSource - default - org.codehaus.plexus.configuration.source.ADummyConfigurationSource - - - \ No newline at end of file diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/embed/EmbedderTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/embed/EmbedderTest.xml deleted file mode 100644 index 34caf6b71..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/embed/EmbedderTest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - ${basedir}/test-input - - - - - org.codehaus.plexus.embed.MockComponent - default - org.codehaus.plexus.embed.MockComponent - - - org.codehaus.plexus.embed.MockComponent - foo - org.codehaus.plexus.embed.MockComponent - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusOne.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusOne.xml deleted file mode 100644 index cb80be530..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusOne.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - org.codehaus.plexus.logging.console.ConsoleLoggerManager - - ERROR - - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - default - org.codehaus.plexus.hierarchy.TestServiceImpl - - three blind mice - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - hinted - org.codehaus.plexus.hierarchy.TestServiceImpl - - plexus one overriding hinted service - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - local - org.codehaus.plexus.hierarchy.TestServiceImpl - - plexus one local service - - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusTwo.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusTwo.xml deleted file mode 100644 index 96b0c117a..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/ChildPlexusTwo.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - org.codehaus.plexus.logging.console.ConsoleLoggerManager - - ERROR - - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - default - org.codehaus.plexus.hierarchy.TestServiceImpl - - see how they run - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - local - org.codehaus.plexus.hierarchy.TestServiceImpl - - plexus two local service - - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.xml deleted file mode 100644 index 31a351915..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - org.codehaus.plexus.logging.console.ConsoleLoggerManager - - ERROR - - - - - - org.codehaus.plexus.PlexusContainerManager - default - org.codehaus.plexus.SimplePlexusContainerManager - - org/codehaus/plexus/hierarchy/ChildPlexusOne.xml - - - plexus-name - ChildPlexusOne - - - - - - - org.codehaus.plexus.PlexusContainerManager - two - org.codehaus.plexus.SimplePlexusContainerManager - - org/codehaus/plexus/hierarchy/ChildPlexusTwo.xml - - - plexus-name - ChildPlexusTwo - - - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - default - org.codehaus.plexus.hierarchy.TestServiceImpl - - cheesy default service - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - hinted - org.codehaus.plexus.hierarchy.TestServiceImpl - - hinted default service - - - - - org.codehaus.plexus.hierarchy.PlexusTestService - global - org.codehaus.plexus.hierarchy.TestServiceImpl - - globally visible service - - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/CustomLoggerManagerTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/CustomLoggerManagerTest.xml deleted file mode 100644 index 69cb2ac6a..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/CustomLoggerManagerTest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.MockLoggerManager - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.xml deleted file mode 100644 index 9787f865f..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/logging/console/ConsoleLoggerManagerTest.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.console.ConsoleLoggerManager - basic - - per-lookup - - - fatal - - - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/test/PlexusContainerTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/test/PlexusContainerTest.xml deleted file mode 100644 index ba3252572..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/test/PlexusContainerTest.xml +++ /dev/null @@ -1,464 +0,0 @@ - - - - - ${basedir}/src/test-input/configurations-directory - - - - - - - - - - - - - - - - org.codehaus.plexus.test.ServiceB - org.codehaus.plexus.test.DefaultServiceB - - - - org.codehaus.plexus.test.ServiceC - first-instance - org.codehaus.plexus.test.DefaultServiceC - - - - org.codehaus.plexus.test.ServiceC - second-instance - org.codehaus.plexus.test.DefaultServiceC - - - - org.codehaus.plexus.test.ServiceD - org.codehaus.plexus.test.DefaultServiceD - - - - org.codehaus.plexus.test.ServiceE - org.codehaus.plexus.test.DefaultServiceE - plexus-configurable - - - - - - org.codehaus.plexus.test.ServiceH - - org.codehaus.plexus.test.DefaultServiceH - arbitrary - - - - org.codehaus.plexus.test.LoadOnStartService - org.codehaus.plexus.test.DefaultLoadOnStartService - - - - - org.codehaus.plexus.test.LoadOnStartServiceWithRoleHint - role-hint - org.codehaus.plexus.test.DefaultLoadOnStartServiceWithRoleHint - - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.console.ConsoleLoggerManager - basic - - fatal - - - - - - - org.codehaus.plexus.test.Component - org.codehaus.plexus.test.DefaultComponent - - - org.codehaus.plexus.test.map.Activity - one - - - - localhost - 10000 - - - - org.codehaus.plexus.test.Component - org.codehaus.plexus.test.DefaultComponentWithOptionalRequirement - with-optional - - - org.codehaus.plexus.test.map.Activity - one - activity - - - org.codehaus.plexus.test.NonAvailableComponent - missing - optionalComponent - true - - - - - org.codehaus.plexus.test.ComponentA - org.codehaus.plexus.test.DefaultComponentA - - - org.codehaus.plexus.test.ComponentB - - - org.codehaus.plexus.test.ComponentC - - - - localhost - 10000 - - - - org.codehaus.plexus.test.ComponentB - org.codehaus.plexus.test.DefaultComponentB - - - org.codehaus.plexus.test.ComponentC - org.codehaus.plexus.test.DefaultComponentC - - - org.codehaus.plexus.test.ComponentD - - - - - org.codehaus.plexus.test.ComponentD - org.codehaus.plexus.test.DefaultComponentD - - jason - - - - - - org.codehaus.plexus.test.map.ActivityManager - org.codehaus.plexus.test.map.DefaultActivityManager - - - org.codehaus.plexus.test.map.Activity - activities - - - - - org.codehaus.plexus.test.map.ActivityManager - slim - org.codehaus.plexus.test.map.DefaultActivityManager - - - org.codehaus.plexus.test.map.Activity - activities - - one - - - - - - org.codehaus.plexus.test.map.Activity - one - org.codehaus.plexus.test.map.ActivityOne - per-lookup - - - org.codehaus.plexus.test.map.Activity - two - org.codehaus.plexus.test.map.ActivityTwo - - - - - org.codehaus.plexus.test.list.Pipeline - default - org.codehaus.plexus.test.list.DefaultPipeline - - - org.codehaus.plexus.test.list.Valve - valves - - - - - org.codehaus.plexus.test.list.Pipeline - slim - org.codehaus.plexus.test.list.DefaultPipeline - - - org.codehaus.plexus.test.list.Valve - valves - - one - - - - - - org.codehaus.plexus.test.list.Pipeline - chubby - org.codehaus.plexus.test.list.DefaultPipeline - - - org.codehaus.plexus.test.list.Valve - valveMap - - one - two - three - four - - - - - - - - org.codehaus.plexus.test.list.Valve - four - org.codehaus.plexus.test.list.ValveFour - - - org.codehaus.plexus.test.list.Valve - three - org.codehaus.plexus.test.list.ValveThree - - - org.codehaus.plexus.test.list.Valve - two - org.codehaus.plexus.test.list.ValveTwo - - - org.codehaus.plexus.test.list.Valve - one - org.codehaus.plexus.test.list.ValveOne - per-lookup - - - - org.codehaus.plexus.test.ComponentManager - org.codehaus.plexus.test.DefaultComponentManager - - - org.codehaus.plexus.components.A - list - - - org.codehaus.plexus.components.A - map - - - - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.console.ConsoleLoggerManager - basic - - fatal - - - - - org.codehaus.plexus.test.Component - ComponentMissingRequirements - org.codehaus.plexus.test.DefaultComponent - - - NonExistingComponent - - - - - - - org.codehaus.plexus.test.StartableComponent - A-snake - org.codehaus.plexus.test.DefaultStartableComponentA - - - org.codehaus.plexus.test.StartableComponent - B-snake - component1 - - - - - - org.codehaus.plexus.test.StartableComponent - B-snake - org.codehaus.plexus.test.DefaultStartableComponentB - - - org.codehaus.plexus.test.StartableComponent - C-snake - component1 - - - - - - org.codehaus.plexus.test.StartableComponent - C-snake - org.codehaus.plexus.test.DefaultStartableComponentC - - - org.codehaus.plexus.test.StartableComponent - D-snake - component1 - - - - - - org.codehaus.plexus.test.StartableComponent - D-snake - org.codehaus.plexus.test.DefaultStartableComponentD - - - org.codehaus.plexus.test.StartableComponent - E-snake - component1 - - - - - - org.codehaus.plexus.test.StartableComponent - E-snake - org.codehaus.plexus.test.DefaultStartableComponentE - - - - - org.codehaus.plexus.test.StartableComponent - A-tree - org.codehaus.plexus.test.DefaultStartableComponentA - - - org.codehaus.plexus.test.StartableComponent - B-tree - component1 - - - org.codehaus.plexus.test.StartableComponent - C-tree - component2 - - - - - - org.codehaus.plexus.test.StartableComponent - B-tree - org.codehaus.plexus.test.DefaultStartableComponentB - - - org.codehaus.plexus.test.StartableComponent - D-tree - component1 - - - org.codehaus.plexus.test.StartableComponent - E-tree - component2 - - - - - - org.codehaus.plexus.test.StartableComponent - C-tree - org.codehaus.plexus.test.DefaultStartableComponentC - - - - org.codehaus.plexus.test.StartableComponent - D-tree - org.codehaus.plexus.test.DefaultStartableComponentD - - - - org.codehaus.plexus.test.StartableComponent - E-tree - org.codehaus.plexus.test.DefaultStartableComponentE - - - - - org.codehaus.plexus.test.CircularComponent - A - org.codehaus.plexus.test.DefaultCircularComponent - - - org.codehaus.plexus.test.CircularComponent - B - requirement - - - - - - org.codehaus.plexus.test.CircularComponent - B - org.codehaus.plexus.test.DefaultCircularComponent - - - org.codehaus.plexus.PlexusContainer - container - - - - A - - - - - org.codehaus.plexus.test.Thing - - concrete - org.codehaus.plexus.test.ConcreteThing - - - - org.codehaus.plexus.test.ThingUser - org.codehaus.plexus.test.DefaultThingUser - - - org.codehaus.plexus.test.Thing - - thing - - - - - - org.codehaus.plexus.test.ComponentWithRoleDefault - org.codehaus.plexus.test.ComponentWithRoleDefault - default - - - - diff --git a/plexus-container-default/src/test/resources/org/codehaus/plexus/test/map/NoComponentsMapTest.xml b/plexus-container-default/src/test/resources/org/codehaus/plexus/test/map/NoComponentsMapTest.xml deleted file mode 100644 index 4252753bd..000000000 --- a/plexus-container-default/src/test/resources/org/codehaus/plexus/test/map/NoComponentsMapTest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - org.codehaus.plexus.logging.console.ConsoleLoggerManager - - INFO - - - - - - org.codehaus.plexus.test.map.ActivityManager - org.codehaus.plexus.test.map.DefaultActivityManager - - - org.codehaus.plexus.test.map.Activity - activities - - - - - - - diff --git a/plexus-container-default/src/test/resources/test.txt b/plexus-container-default/src/test/resources/test.txt deleted file mode 100644 index 793aa682b..000000000 --- a/plexus-container-default/src/test/resources/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is a test \ No newline at end of file diff --git a/plexus-container-default/src/test/test-component-builds/component-a/pom.xml b/plexus-container-default/src/test/test-component-builds/component-a/pom.xml deleted file mode 100644 index 872b4819a..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-a/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - component-a - 1.0-SNAPSHOT - component-a - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.3 - - - - descriptor - - - - - - - diff --git a/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/A.java b/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/A.java deleted file mode 100644 index 0a18129f6..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/A.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.components; - -public interface A -{ - public void hello(); -} diff --git a/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/DefaultA.java b/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/DefaultA.java deleted file mode 100644 index 3b6f6a280..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-a/src/main/java/org/codehaus/plexus/components/DefaultA.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.components; - -/** - * @plexus.component - */ -public class DefaultA - implements A -{ - public void hello() - { - System.out.println( "Hello World!" ); - } -} diff --git a/plexus-container-default/src/test/test-component-builds/component-b/pom.xml b/plexus-container-default/src/test/test-component-builds/component-b/pom.xml deleted file mode 100644 index 60cadc1cb..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-b/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - component-b - 1.0-SNAPSHOT - component-b - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.3 - - - - descriptor - - - - - - - diff --git a/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/B.java b/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/B.java deleted file mode 100644 index ec834d866..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/B.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.components; - -public interface B -{ - public void hello(); -} diff --git a/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/DefaultB.java b/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/DefaultB.java deleted file mode 100644 index eb8bc1724..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-b/src/main/java/org/codehaus/plexus/components/DefaultB.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.components; - -/** - * @plexus.component - */ -public class DefaultB - implements B -{ - public void hello() - { - System.out.println( "Hello World!" ); - } -} diff --git a/plexus-container-default/src/test/test-component-builds/component-c/pom.xml b/plexus-container-default/src/test/test-component-builds/component-c/pom.xml deleted file mode 100644 index 6334944b1..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-c/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - component-c - 1.0-SNAPSHOT - component-c - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.3 - - - - descriptor - - - - - - - diff --git a/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/C.java b/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/C.java deleted file mode 100644 index c5f9f14b0..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/C.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.components; - -public interface C -{ - public void hello(); -} diff --git a/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/DefaultC.java b/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/DefaultC.java deleted file mode 100644 index 486fd01c4..000000000 --- a/plexus-container-default/src/test/test-component-builds/component-c/src/main/java/org/codehaus/plexus/components/DefaultC.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.codehaus.plexus.components; - -/** - * @plexus.component - */ -public class DefaultC - implements C -{ - public void hello() - { - System.out.println( "Hello World!" ); - } -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin0/pom.xml b/plexus-container-default/src/test/test-component-builds/plugin0/pom.xml deleted file mode 100644 index df96cd8f9..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin0/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - plugin0 - 1.0-SNAPSHOT - - - org.codehaus.plexus.components - component-a - 1.0-SNAPSHOT - - - org.codehaus.plexus.components - component-b - 1.0-SNAPSHOT - - - org.codehaus.plexus - plexus-archiver - 4.8.0 - - - org.codehaus.plexus - plexus-container-default - 1.0-beta-2-SNAPSHOT - - - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.3 - - - - descriptor - - - - - - - diff --git a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/AltPlugin0.java b/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/AltPlugin0.java deleted file mode 100644 index 58c5d2e27..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/AltPlugin0.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.codehaus.plexus.plugins; - -import org.codehaus.plexus.components.A; -import org.codehaus.plexus.components.B; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.archiver.manager.ArchiverManager; - -/** - * @plexus.component role-hint="alt" - */ -public class AltPlugin0 - implements Plugin0, Contextualizable -{ - /** @plexus.requirement */ - private A a; - - /** @plexus.requirement */ - private B b; - - /** @plexus.requirement */ - private ArchiverManager archiverManager; - - public void hello() - { - System.out.println( "Hello World!" ); - } - - // ---------------------------------------------------------------------------- - // Lifecycle - // ---------------------------------------------------------------------------- - - public void contextualize( Context context ) - throws ContextException - { - PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); - - try - { - archiverManager = (ArchiverManager) container.lookup( ArchiverManager.ROLE ); - } - catch ( ComponentLookupException e ) - { - throw new ContextException( "Error retrieving ArchiverManager instance: " + e.getMessage(), e ); - } - } -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin0.java b/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin0.java deleted file mode 100644 index 56dbbe477..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin0.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.codehaus.plexus.plugins; - -import org.codehaus.plexus.components.A; -import org.codehaus.plexus.components.B; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.archiver.manager.ArchiverManager; - -/** - * @plexus.component - */ -public class DefaultPlugin0 - implements Plugin0, Contextualizable -{ - /** @plexus.requirement */ - private A a; - - /** @plexus.requirement */ - private B b; - - /** @plexus.requirement */ - private ArchiverManager archiverManager; - - public void hello() - { - System.out.println( "Hello World!" ); - } - - // ---------------------------------------------------------------------------- - // Lifecycle - // ---------------------------------------------------------------------------- - - public void contextualize( Context context ) - throws ContextException - { - PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); - - try - { - archiverManager = (ArchiverManager) container.lookup( ArchiverManager.ROLE ); - } - catch ( ComponentLookupException e ) - { - throw new ContextException( "Error retrieving ArchiverManager instance: " + e.getMessage(), e ); - } - } -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/Plugin0.java b/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/Plugin0.java deleted file mode 100644 index 5f85c667d..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin0/src/main/java/org/codehaus/plexus/plugins/Plugin0.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.plugins; - -public interface Plugin0 -{ - public void hello(); -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin1/pom.xml b/plexus-container-default/src/test/test-component-builds/plugin1/pom.xml deleted file mode 100644 index e9b947e49..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin1/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - plugin1 - 1.0-SNAPSHOT - - - org.codehaus.plexus.components - component-a - 1.0-SNAPSHOT - - - org.codehaus.plexus.components - component-c - 1.0-SNAPSHOT - - - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.3 - - - - descriptor - - - - - - - diff --git a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/AltPlugin1.java b/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/AltPlugin1.java deleted file mode 100644 index 2b9714f99..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/AltPlugin1.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.plugins; - -import org.codehaus.plexus.components.A; -import org.codehaus.plexus.components.C; - -/** - * @plexus.component role-hint="alt" - */ -public class AltPlugin1 - implements Plugin1 -{ - /** @plexus.requirement */ - private A a; - - /** @plexus.requirement */ - private C c; - - public void hello() - { - System.out.println( "Hello World!" ); - } -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin1.java b/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin1.java deleted file mode 100644 index 1a93b8693..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/DefaultPlugin1.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.codehaus.plexus.plugins; - -import org.codehaus.plexus.components.A; -import org.codehaus.plexus.components.C; - -/** - * @plexus.component - */ -public class DefaultPlugin1 - implements Plugin1 -{ - /** @plexus.requirement */ - private A a; - - /** @plexus.requirement */ - private C c; - - public void hello() - { - System.out.println( "Hello World!" ); - } -} diff --git a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/Plugin1.java b/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/Plugin1.java deleted file mode 100644 index c8063cb0a..000000000 --- a/plexus-container-default/src/test/test-component-builds/plugin1/src/main/java/org/codehaus/plexus/plugins/Plugin1.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.plexus.plugins; - -public interface Plugin1 -{ - public void hello(); -} diff --git a/plexus-container-default/src/test/test-component-builds/pom.xml b/plexus-container-default/src/test/test-component-builds/pom.xml deleted file mode 100644 index 0cb527882..000000000 --- a/plexus-container-default/src/test/test-component-builds/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - org.codehaus.plexus.components - component-parent - 1.0-SNAPSHOT - pom - - component-a - component-b - component-c - plugin0 - plugin1 - - diff --git a/plexus-container-default/src/test/test-components/component-a-1.0-SNAPSHOT.jar b/plexus-container-default/src/test/test-components/component-a-1.0-SNAPSHOT.jar deleted file mode 100644 index b2eb7428616bef83496626d18c236e0c32f9a777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3329 zcmWIWW@h1H0D-I=12ZrKN^k;cU)K;vT~9wZ{Q#&k4u(vivKaws7US(&e+ zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3Tf$kfit(5aRJ3q@krPsy3^ zb6FMJN4B&*F?(VdU@l_-yA0?UI1m7`;2tQ*Nv$X?hWi6kH49L6eo;Ce6}(Ut$@wX% z8Hsoe0|g4mFt}2J*30A2k({4fke`>DSAuXmBo5pf^Bqcon%Ec_803I7x=#@r^(u06 zTKfaJ8WaRv{#(0>d*~}TUT{6KP3VfK>5Ct^ovDAnY~6EnZep0m7CG4+S6n@6FK>Gk z_Na5~gqc$s*s6HAgDnnfZ9lQ6aqh9lsm%|rM}ExkHlG$|lvz^$PB3lfOczD@_|Dl1 zs}}rS${81|cQ$^l_LB8lr{d*dQ3G-C%XsBY^+1Pq0I?bnV+$XIqxBv2l5-M^i$!~^ z`3@NfxTJsH*x02U;KXR>JZp=H$CqPkgp?lleiBY!{D47*E79LDziau=fA{2{SR}1o zXd2eCDfNBpg!la6hn^{Yez2piLT$yXD>sh{l^K~FJ2^Mnx_{aCKV1c%-l!JLa0?dP zcGBct+p#(Mvb#M6IV6KtbbQyiO%h@J*ocl=TlXBOJgS#iq*t9rC&)Vk8qkognyx3=+lwqay=BA$IZyTwb z&YF3gF;DqJ6_{){^&c_qUt*VGnDX1n>uAEZP?24aZgdxS#W&4m-2YJQlZHgZ#tmJj zY_C#nuV2WxMw`NVxTf#ullO!Ab7duOMdd_JRvp_xd~d!IT)<74a|f+o=&d?CcJuXVB(|5+=BdEP}-Csg2?{Q;S%qgVym-eoXm^9 zw9a>z&TdnlnY%Ou4))vED{RZ!q_;cN^25g;AMc%iUj1Q%&QbHlx3atEtai7*8kHxg z<#E)I$eZMBet@?`QfefY13zmpX zt?5)=%oenH<|Hr2nVYZigop$c9NT*6MbqYVkCmJCowi2CDKZ|+P}#m=m-*(V#Dc0? zt9kSI^Chk-Kb|9!vue@g8*9&Noql{G+KqYJVWagzpZljfNbOj-d=JC12Sz`&6WTTQ zs)t@@JG6LBfeG{Ub?3fMUNe*Zp<@2^0$a};atET^w5!w4T3fs%(^ zKD$5X_bH2KXhx+4bzge2SoBW&?e)2@5>4vG`;#Sf6+7CanRFk|+F{e0p_#u>+w4No zD&FXG3#Grx7|1{BddKkxUS&bb#Y5HClxl%-+6u%T6vu5rQGP*cQAuWMad4UcS#Mo0 z9Z%mtk5wTbe099fJ`Up3^bP&sbtc%r1cUX)7ieH)VDMZET2q@|F}}e2 zt(b@7+Xw!KUizo>bwBuQJge_@-TR!s=UERO-D}z>Jl8S=o&33z^=IYEO4Xw=ovx}g zGdoYJI!rAHyz8O|^dcjZ2s7@61<;>BAi(ezl$sIw6QK=zLj$B31eP?a14($cMrw8- zOu($-K@9>309kwx$b_2!ub&al1~qhG>OnN9fdBy@-S2@+NOJ+V4p4&u0zf(hf%zAu z&co+aPy+&?)dpQF5zYlQC=e#(;V=PSuLG=s5YzI~hhY>Iv9>U<-24)ZT`UYmxlExVn*#oV85aErz h2t-&{!cK{|K-M7&!~kzrHjv5uKsW^$72zBp9smae7Eu5I diff --git a/plexus-container-default/src/test/test-components/component-a-2.0-SNAPSHOT.jar b/plexus-container-default/src/test/test-components/component-a-2.0-SNAPSHOT.jar deleted file mode 100644 index b2eb7428616bef83496626d18c236e0c32f9a777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3329 zcmWIWW@h1H0D-I=12ZrKN^k;cU)K;vT~9wZ{Q#&k4u(vivKaws7US(&e+ zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3Tf$kfit(5aRJ3q@krPsy3^ zb6FMJN4B&*F?(VdU@l_-yA0?UI1m7`;2tQ*Nv$X?hWi6kH49L6eo;Ce6}(Ut$@wX% z8Hsoe0|g4mFt}2J*30A2k({4fke`>DSAuXmBo5pf^Bqcon%Ec_803I7x=#@r^(u06 zTKfaJ8WaRv{#(0>d*~}TUT{6KP3VfK>5Ct^ovDAnY~6EnZep0m7CG4+S6n@6FK>Gk z_Na5~gqc$s*s6HAgDnnfZ9lQ6aqh9lsm%|rM}ExkHlG$|lvz^$PB3lfOczD@_|Dl1 zs}}rS${81|cQ$^l_LB8lr{d*dQ3G-C%XsBY^+1Pq0I?bnV+$XIqxBv2l5-M^i$!~^ z`3@NfxTJsH*x02U;KXR>JZp=H$CqPkgp?lleiBY!{D47*E79LDziau=fA{2{SR}1o zXd2eCDfNBpg!la6hn^{Yez2piLT$yXD>sh{l^K~FJ2^Mnx_{aCKV1c%-l!JLa0?dP zcGBct+p#(Mvb#M6IV6KtbbQyiO%h@J*ocl=TlXBOJgS#iq*t9rC&)Vk8qkognyx3=+lwqay=BA$IZyTwb z&YF3gF;DqJ6_{){^&c_qUt*VGnDX1n>uAEZP?24aZgdxS#W&4m-2YJQlZHgZ#tmJj zY_C#nuV2WxMw`NVxTf#ullO!Ab7duOMdd_JRvp_xd~d!IT)<74a|f+o=&d?CcJuXVB(|5+=BdEP}-Csg2?{Q;S%qgVym-eoXm^9 zw9a>z&TdnlnY%Ou4))vED{RZ!q_;cN^25g;AMc%iUj1Q%&QbHlx3atEtai7*8kHxg z<#E)I$eZMBet@?`QfefY13zmpX zt?5)=%oenH<|Hr2nVYZigop$c9NT*6MbqYVkCmJCowi2CDKZ|+P}#m=m-*(V#Dc0? zt9kSI^Chk-Kb|9!vue@g8*9&Noql{G+KqYJVWagzpZljfNbOj-d=JC12Sz`&6WTTQ zs)t@@JG6LBfeG{Ub?3fMUNe*Zp<@2^0$a};atET^w5!w4T3fs%(^ zKD$5X_bH2KXhx+4bzge2SoBW&?e)2@5>4vG`;#Sf6+7CanRFk|+F{e0p_#u>+w4No zD&FXG3#Grx7|1{BddKkxUS&bb#Y5HClxl%-+6u%T6vu5rQGP*cQAuWMad4UcS#Mo0 z9Z%mtk5wTbe099fJ`Up3^bP&sbtc%r1cUX)7ieH)VDMZET2q@|F}}e2 zt(b@7+Xw!KUizo>bwBuQJge_@-TR!s=UERO-D}z>Jl8S=o&33z^=IYEO4Xw=ovx}g zGdoYJI!rAHyz8O|^dcjZ2s7@61<;>BAi(ezl$sIw6QK=zLj$B31eP?a14($cMrw8- zOu($-K@9>309kwx$b_2!ub&al1~qhG>OnN9fdBy@-S2@+NOJ+V4p4&u0zf(hf%zAu z&co+aPy+&?)dpQF5zYlQC=e#(;V=PSuLG=s5YzI~hhY>Iv9>U<-24)ZT`UYmxlExVn*#oV85aErz h2t-&{!cK{|K-M7&!~kzrHjv5uKsW^$72zBp9smae7Eu5I diff --git a/plexus-container-default/src/test/test-components/component-b-1.0-SNAPSHOT.jar b/plexus-container-default/src/test/test-components/component-b-1.0-SNAPSHOT.jar deleted file mode 100644 index e588c94706a051ca2b06bedf0c6cf8908e598383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3329 zcmWIWW@h1H0D-I=12ZrKN^k;cU)K;vT~9wZ{Q#&k4u(vivKaws7US(&e+ zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3Tf$kfit(5aRJ3q@krPsy3^ zb6FMJN4B&*F?(VdU@l_-yA0?UI1m7`;2tQ*Nv$X?hWi6kH49L6eo;Ce6}(Ut$@wX% z8Hsoe0|g4mFt}2J*30A2k({4fke`>DSAuXmBo5ZG+?iYk)WpWfz#s>t(S3^0s8^Aj z)7tOI*Py_|@_yeTehzsBxgL4Nh^Z_Zj6OB{LYo$e`=8C(J$r3HhOJe>%I*ojmgOE@ zdqg-}(O8p__ltzsvVx}2yor^}*1gA1vmIQ&`O(E`c{*!TF1`47NBK;Vai^2rJ|T0* z5Xax%!h4p*%-SCn?hzk4WxpLfZXhnM)~S@P2fDNah}D1?TL2+kt?#6loRe5wEZSqu zcgR4%CH?cp#xCUmC&qowU0Xyvz8qU4r1ZG=lW_Xt2MjV?iT;N9UCV#|yC?s|B5CbH z)3BCJsqb4Syyp);^i1jVgB^7hYAaq{xp`Em%*f=}$+^+i{mZ`p=_>g2MzvsuTd?4^ zlP34tj?KxJ-R&vJAsMuynLm3q7=P?%?3yOq<)EzYN|yhwlPBrIOn zAfLKtE!V6WFP_cY`FvinTKTiDZ-268<}A)rYA<3GJ@Yis)UcnGxtnbokB;$^Z+i}0 z{>}5!ZS&y?mLcIyiN`)N6-xb#6^#3^PG#8}jp?WP`1kJkuVTFGeXqo_+3G(|#uA5jOlJHkb#A+dZ^`ZN;%8l#%xiz({ARhAg= zX{w&OSq_UP%wmim7)|iJk(*eSnunCd(aStNOvS)dst3!)dXQ`klCS^gkaIO9wrX|JgU25q@11}C`-8;D4tck&*Plp+pZ^z`z0*xY zUG(t;52y1yT}qC>?~1KW;BdaLc)iza{fk}e68Gj5`X}yih`)XIpv)Q12}Mgem!Dyu zm+rSFRQn!>SBcgS*=KvAJHiA)Rwq~RBrZ;}H&QFmOPW@@$w~5U;A)1&6VEhFa+>l< zx35Ra2Dmwz;9yC~DNW54PJn{}P1gFBvm65Ex;e0KS* z4Nqlu1)gX8thnw)-vOk!1y!bu8oxPffpOXj#2ysKZ9!3fL26M+W@>S8ng3aDT`wI^ z-$0L5As>8oyw5%k;?wjE{or*b*uVscwi%giHQEwTz{?kCU}RwMTnk!Ln_e-#!27M3 zhvVA^{)b-rr}T9{_-s6@?{(e#oWJK;4;|fW+9y2MG6bFcxs&y0<;qIcqcNSXsxvb? zPpUdhEeO1;q6aMb8JR?waW^c0{saO6hPR;9jL4q|ZP*(cAjKfCq){D6!m~9}vjbrQ zW)%-=5I_LP;)6gY+yr?2jBqw6ZeZ#`G^l|90U+J)flNqq0k;lNg8>3SIs}3F7p2O> z=TuMw0-@CgT`LjJ1vMxTCgkBT0bb;QninviU~gc+j9b#U8fX}L$RP{@6))&!p;!F~ zvtofYDN3k7y@oIk)(}896TL1*n5n=_&`i{t8DTVLF%GIfAOIAJ$APH;?sZsg0t+`x z&7k@Oq4^7@W`eZ~ZnHu43&Ly%Rt$#`FdH7i;MxXe5BB;7X48_!85G$At$h&T4M}R~ hMIgeu5_U?w1+orNAO?7|vVlzI2f``9s0il(@c>SH4IKag diff --git a/plexus-container-default/src/test/test-components/component-c-1.0-SNAPSHOT.jar b/plexus-container-default/src/test/test-components/component-c-1.0-SNAPSHOT.jar deleted file mode 100644 index c2d1996b7b607c2281bc687706fca6496b109e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3328 zcmWIWW@h1H0D-I=12ZrKN^k;cU)K;vT~9wZ{Q#&k4u(vivKaws7US(&e+ zpQoE^aEP9-+h^Z1r+vJ2^)B*y>uQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3Tf$kfit(5aRJ3q@krPsy3^ zb6FMJN4B&*F?(VdU@pV-fB>?~3UX2_N{iwCz*NlwRGnXxjzU!rxtkPc=#i=4y}y( z%%(h01Skyoq{FTYSrXJ|f4j@(oVr=1qaJ0U&UUE)iaj|HRHQylv z0hjd88ymZn1DqJ`T$XGR@%VCVjgZpg-cQ2miytt^a3%U1=65as`R|_m6N{v^3r)jX zHl@CAo$#JN{LnL{&kuIgRj93ab>-$!p)w+p(;L--8E(OX+fJI? zYdbb4Uv{^rActhoijMCZmz*T6n}0E*dLi^@onH(vyd9Ys7<37H!6h{XY8U z(|(5>L~ND&opiet_Q`J$^4a1oE@3Y5cu}A*&$@Oar;}TpPhEMD{?bWUyskk$bUZ5LPu8ueQWBlG{gH~W z|4s3Q;xD%Gv3}3o{7K)W*|5u6a>Dv|HQiTSzR&LE%Q|u4{{(>pJc@7qt}Z#JmeMlw zuKI@GDK_4wvnNDGgskOfr+{CifJUlsE4^uHPmFmHAu^uFA0r?nt64PQUlFfn}tD6jWBL{;f zu)JO1)pE5KnC|MifoYE-a|`lwLB+wFSbaSfF(?+&zHEW z{CJK?&Z&A9b^7s%XgB6cGYklpYfvm>)nT8Vj1xg-v`Rx9j-={2| zp&6AH)P3p6V$nP8x7X*sN;Ih#?@yM{RqSYwX3~8;Ylls1hGzakZLmA1*c#Q=q7H8GpDyap=X)6$WP#m`fMfnA(MJ1W3#ldC%XT5d3bUb|nJywN$ z@YV4?`#6YC(>L^k*O_1g6Cm1VWVY34OGp7PU!Z}Jfx&YvXhm&$#rOj6w_+ZSZy)#{ zdg-6i*ZttL@vOerb?M*q+ z@NSA8(2I;rBFwnk6+nLifdIo>P-;fxPlPt??F^7&5LnWv4kY2(8mZNRFaa}1g4zQR z0J8WXkO?;dUOnS>HmH370U+J)flNqi0k;lNdjSGKIs}3F7p2O>=TuPp0io3fT`LjJ z1+^y-CgkBT0bb;QS{E>%U~gZ*j9b#U8fX}L$RP{@6))&!p;!F~vtocXDN3kdv|eBh z0dzCb>tckN^2`LyM6H<-Mq?%#Q2hY`ph!FhOa*YS!)g;)xM6Ar)h7tepD{HPtX*)M z4XR%dX4|u3IE;YV@E8NvHZXgz*EcYmmNZVM$R23zg9vZzMIgeuVs=Wr1+orNAO?7| RvVlzI2f``9s0iZ#@c`;J7JL8z diff --git a/plexus-container-default/src/test/test-components/plexus-archiver-1.0-alpha-8.jar b/plexus-container-default/src/test/test-components/plexus-archiver-1.0-alpha-8.jar deleted file mode 100644 index 445287775699ead02b248041a070251e797c3933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150172 zcmbrm1C(w}k}h1fU3JQ~ZQHhO>y&NVHc#2MZTpmQ%DC0jJ+r3!zkh!->%MF6+_`o} zVn<{|Fm6rkrfdcs3FV;Vs!3 z_WZt4{yUkBfUJb5h>|j`jOe}0o4ecDP6bji^T39=qIQ~1?5&l&ZX5Sq6e_?>-|JxVX7}y$^{aYFSB@dnd?Fjyo z0WQuK*8eXIaQnC2|K;faJNqI2Ls11w(?2@^0RULh0RV8n#rI!U<{z43WM^Y_qEsV||&XAQwoFFtYPRG3};>oQsY$g_cOtZISY7eG|03>I8X85RiDX}_x z(`ZnV(>Mz;zaWg4W?@HI&p^IdBI)Btfp4Ni={Ss^_~ZiDS%AOlz`tKyz{H{b63-Ei zNf5d-Jko7es#mde?mjIx3w1TEKp zOMb4&E1|Cl9p-pW_vge=4)J?757t$iN}O>tN&JQIoUS+7^B$s#NTP%J+HGuN7=xG0&fZMh9;5v@KvUEiIj>K z#9}}I_>UU7Eeg2T_^;7UBtPPx;vK6)HfCVsk@G7NrB)6`)Eq+`ChJh0z z?pX`~zw+u7;%Ia*a&08}9!c!?!QT`Pwrq$<6h%v$cAs-N-A#3N^>h~CX{k>%Xf)Ov z8?6mP5xC_6nZQAQ6gwvC!q{QzT7nQGuBZ~gSZt_N>aT^RdC<;(2Xl6-nHdTbs_Q;$=|9hkFv zHh`b&(X2nyk3gqiv^Dr*&^&lc?nVsKK>?P%tG&*h0%W#61e4}&M1I4OLrEZgLu>f! z$J!yDu~OOyaznt8^NZgT_ z;qS6eR^E`^;78!eseL;Y5m& z2Ng`^8SRrUNz$6hsYdA(Ont)9P0Oc1dL&MvwGy$eqs+iIOAyJ)rG6~&6abjbfeNdRj)xos2{XwBxJnGc%5q z6Mq$tMUb?fwe7oyOLh%MFxxR#5!UL<3~)j%PSTp_V|4D;sce@55r2rBW?!?@oQ-f1 zyycjHcX`RdH4&iE9|!kHV}{JL{p8(1mEdevxk}!&RC!H2lO9psXq1&atLF9)kM_*w zLJdi04U}R$VPq4eIdWQ=*NS+j>zZ-WLJWz2nCjf*3+j+e&2QX+Y?L+$?#)xkIzSEn!IE0iKY}B}~fZ5P2pR z@04N%^5{!(i1m_rRX*g!72IxTpj;1l5ynSSpYaiRrt;)9st~p<3m=6i$D5u-zqS)h zu9OkZoGt0uQ^gs8IKBUEkm9KDYj{7L1U9roHmTeW)w7B5fFk32!m*-8kK$~@x-uzP!XW0 zPoSu5@@SQlxSqEska7jdljJLkx4lH8ZUJ(PdG2)P|4uX&6svl z$tk__qLWEVKHDTL1jXf*d0psI9x#KrNS~)pGL26~zenn8RX#HLWzy!=IU|M1J26t- zDVV1^uARwzIqwXyNok?_^VvFi#l1X!Wqh1-tz~=S$1`^F&h?&beuu)Tt>TMzpIc7W z3GlBcFALhZnYyq-siUyaLS4>mm-LHA1+u5I&bBC{&LOc#kIL~b+^c*0%>hWdr+e_O ztiz;ni)1EU%LC}H#)OuMLpVIWL3AmnaOPAfyHt;7M?AegwTkzA#@)}lSk@aAN?+ll zN|n#D(AwL(rgsK98zj@(L>e7k&fHpbTUSY^z;V1M#iVnucgSu9Q(L4mxp4v8#~Ye? z-|>N#*XM;!DOJ~raJ%~(v!bu6SiX^#x95AWP-eFZuT=4KTlk%Wy`MatVy<2S8FZ3P zxuMrjH^73wU6Xqb3#r^|>l$Ry@RVN&=yXh=J`5~y!gmPkZzSZvE}R_o=lz9 zcMI6kDjMo0v^G*Sdat&HPqb9I6v{P)zNJ%6HA!-SInu;YexRw+LNyJFUEPW z4^!u!&kX-P@%p;Jl>!78x;m|~vp!hwF%VRxmEAp%H|qRD_n`K-7=*3OBYoJBWj)7?~8i)(Vp9S)OLCg z@+sYZDpK?s*!9Vx-ksVTOi99K3ygFH>A)}9roMGM{_K1{@w{J$(9&0n5b0_QL3a3X zBg46vZKT)velMKvw`6hRo;arzw(51zJg{k9= zIu&x=yk?%!ZeR*oQABl{B^wl%COei(Sa-W?;}oR026M}mPBTxzQ>hWXPszcZ-&E~3 z{iKHtCuAjSbH`hvr<--hXsdpkY;!NQG5YVXh_;TPP&U-XU7Xg{CTK zoak)c6lDCEy&F||+|a!TP!kp9rtcEI8wxrZX3IKvKa#Clx%Din9-E)ks8>jJH25>yFZ1s zV@op=J$(sLkvpuH8^i#BtlDVeS2NDsa%7sq=yCXHaq|e%p+;c7$h*y&=4i$O!utjl zC#pMDz`V^ymM~&}$%Lafy?BVnRJ(4RbD+}An9`LbMo87o0$1UfHl9usuqzUd?Zkpy z8uO-#Rt^L^AswZn6)DI}aXaS%>gWej#e_t{E>HGuTu!Awm!8B#?44FP<<^Ei)eFR{ z%Wy5jpY4nPDym z)4^DLLvmK{s21Ila`Y_GBV|qusTPV3<(BU-c%`>1&j4AJ7*a!W;@|@U9blI8&l*(= zx<0Z8wNm%6p7IBFclVUOQU`YTZp^PZT`(@3iE+KYYK4ec%g;aGy_0?OZsA|Vu)flA zS584WzIdw)9+;x_^2nG!!?Vi!OXw^bD5wtmgD5!t@Ja2Xhxt(7`I!>+1|cJeo!kfR z=pV%b&xGkKN=f)e{^adZC6ol-Y&w&o4zlEtkS9F1)qO#iBz}cL@gL~j)iS?Qd&?f^ zEl^?g1TDx{Sfhn>93BPC;wYSv>%FOC0Rn*g4b;Fq%7{ zrT*rvV08CLzFIi7@eDm{{F3@KwbV$FCQT4HgssDAd=!DLW+9|!19j5i#E>f@SeNFu zgi@!3g6^IR5lgd>eEL)Qo-tf|f33`0c6N1{Bo}1S905*q z23xA=DH-$}!tA^FEcb4f{8ezPHjFtL4mp z(1JV^grf{kh9>2ZJ!D6+rnVb>Q~WN@P)V zlR-WI)gt=y6dKDr{%XRr8nBf-9p*Ytx%AGLnYRdEdmCP_V5dJ7MHQvQBH=(TA#Mlh z0`95gLBATMV>H+?B(Ee1LQZq~D&x2EP%%X@gzf`UR~3bAI13ZhoHKF2aB_d$fwEF| zNm+!L$~f~-<+HNLLXsnUgJQmN3}Rd4GD?P`NG-h#P0@-aa-iBX!drmDhoEsfXOR@R zGiSR0c@KrcFTo5XgB_#z-f73R^!jn!R>gy#lpV~)nzvTmI*#k_16RUrCZ;4_sQUSC zXFFJGQnqO%Q_>bO=tWDFiIBp1-FXTEVKNrnLdr$rjoHH^mg68boP--5K0Km8lcMv~ z?1E*e016thR7Q+lwHVm8F6BYktX%^osOQT>T=K%qPlc^>4OhmS{FCU(19)R-IaB#` zPtN`k=8BgXYL0+frh1Rw^-1>(5)pZ{#?VPjmC@rgqJ))NvOPQ;D)^ zOyofkmz((LzC2y*KLy;zQ1P@+a!fB$(F);m)V0(ewhAbH;UM7^YS^f+!4fS~sVOuE zv*m+|_obK9k}GKnO^&PcjHE%Z3{fmL+=#aT$M-dZA(0487teH{X#*5nOuUE z5Tb+<)(A0EdG8HGc49EX(#4R~yxw^226Psq&*;T%@GnY3vwHlg?c#aJ8y}yriKHbF8 zGmOk82;0?yaNK{GYP|h+$v$ams?iBeVkj{V&KX7HqLdDtyfwU~pK}8OazP4i;-4I^jD(;|-Io!HMRuwQ58H-CdtbcV>1lc&ARn z^@#7UT7?-!9xjJ6M`alDfUNw5+knjgx55&5!eIHU^A0R$mB>!DAx3|_d8ci;%96=< zEY6V9&M3as!Y)gG@J@!MDKm9>^Udx`lrQIrJzjt4)SDeOD3|Q!qTF6?S^lzQ19?u} zO`1{adkFz`uQDSIB_iX&tfHM%=&2^!??7$RStLZdad?uO6ohcHAUthy=wGnf*{P;c zOSV5ZJr$#d>bpl>M%3nt;psdSZTrx)oziXD!znk-E2yE`G)T@J6}kJo-6$O{Md`w; z(OR+)?Tp-Zn&`|#Q=(NC0Q5l7o}9)jBMf!f|71JT^24|F1=C0yBKq^&AkXa>{BZ-) zeeF24E$kV2?Ou5mjkkU%ON{>Xfrh8`KNZSrO2rj^L+GAY4nUlf_#-sL$L~t?E(U%R#z$W3-6U76@&Le6ZOP=utddy`lp<7T?j{9bmsuiW zIt(z>S4N(Q91A}%8n_gHU{G(5kGZAfP}=*q8h|Ej$J+WR!KqdiO3nr z*wZu;AC$wtGzn17jJP6R>>7fz#zs#G>G{JldZQYlzhVJjGofuK?-qb~Yj~IWd&E)R zA?g8ws9}W#lIBIXP6|>N*3JR)$CBPwi5LQlw}Rx>ZO^I)4KMZHCW!2IPQbN(4V6_XU{3m%%J3e40>>{K2&u=q#P*99I&7b5VecDQBf1b?i>+ z3G_SBZT{7dbIwU|sZC`n(AiolJ^0t2#@%xh&!Hv2G=F+{>yQ?oc%L8JE>8YgHlSOc zb(pFC?^bVSr?eQle5abbn;aoM6s(3UX4Ot~EVxaY?pHs$U7R9hn8DcN!JTLbac7=E zUtq7_$jpHCcjUt3Mu>=J1gx|o*xG=gS<&pRfDAX>>ZT|RbpGsa6o#8NVRl5%K3L;F z;V9n#xnD>?0)-whtRC1`W(&DNKk+NN5-aLXU_5b46hpEFUeQE#f9FR(*tl1Nr_B^z z^EXl2XG!m{?840nzvlD;=7x5|>w3xmp|k>D%wj=}qE_k~WfsHaF-wbx8Z_5d9`><+ z5lTCR+WkP>-SpFt;$uDKl=%(1A-2vyR&pH}%P-dysGMroHQVN-L=FhIMz`H zwsK)%4l21STq`jF)qXo2yy(B`%SaFOM$wB!j#HrYglDm4vkTe!#21w~8My9T zgnm|Az#;0Jidb^Z;He}VneP*TM5zw|EAPZK$OjLl4ujb!z<4rOxhPU=urgzS)B{qY zM?~8R15-SDY+(4S>kO%rF?v|pG)&ZMLu)N_W zC}i`Kj-g4^mC3;yF#S)2@b)#h>OBn1)6ggu6|u;@GtjOJD)`To8lMq08KtF)-81L* zT{S-)LytO!?mn*XbBEr_nufY!RikDl`I}vqCp6y>TwvxY$53caKqLjsngkO#Le8u) zVHU6!8vxye3XAZH_zm1Rr-WfmaZ5mJ1UC7x*c4!AO3t`LP4C8-Bjt)oxMSDbf(tqW zn(cp(v}MyC!@VNZmYly>3jtUmz?)%S-TWMYaa+&Wl<=+FG%#ajG&B|wjhY-SBbe$D z@C}04P_TK2@nx5uvY)NNT-IU%7OzW!0VQtdC)_8; zj7S_!fiV%03<-3#X@VF;iBzAvw+5}(4NXKraw7a>`WO=QVml6M3nut#H_)ujlU|$E z-MN9tW|F>6t(^wcYz>V$$Hcr?JC6lElQAfa46I zD>QmBgt{wsCe^crCV_ZHM+_GRhPH`8pWivX2J2Qr$p1W>?InHh(rCQnW^F>8kc@i~A13SM4~cRgEqh>d+#b;G<8 z(f68Zwp;3}dDf?wvaEE^E8YxoK$INn%DCSGJ)BpLnJ0}i{#my71j~`9}49=fV_PgT8fGZ;L%{n z;pleB=GQkGi1bhV1IiR*qGLEENk7^|18h`aXWa)DZ1W-t3st`pA2Bk>|ywMNuM;< z8=?mv+&mxL0;xEVnq!0YvDgIwJ^`W5+?>PGGnG%MuIZWC>lc8J#M~yT6sfXQ9r1Qs zWon%Z(=qX_2gFBwK&i{Sl;Tpw*B?J&c|6WyFMzWIOY`HF<;n0`S3=S3pCt-4I0wI8MF`6a9JEZMLG2fDjRhk)ov zDMiHV~7@_Ror<6JyCFaNrk``2pkun|^T-19I&)KNN*23+Pr;hyy#vzvO zP?R%CT0N^+Y7hudwXi*t*?O_|5@PFVK4=S}NI4gn+g^f6*(MAe2Oby zo0K&{(t{R=m-=3EK^|><>Yv6I7ppaiyFsm#GRRu8)wKK;I*RkwuuVqz z7K)*Y7*a+S0aXfOL?ad&8G;k@(X{-?c_@++{*L%r!@LApAp`!0*q;cWFuNU02XpSk zBV+LGcE{ZvUTz*w(VrhXJw8Ejo8j>D7$W6Ah{&PqgR)TW{xD03jCRIVAZUrp3@8;G z7R3wb2Nf<%Q6yM@_u?3%) zcnb_X&9|Z!qjb}q!w0?72cw&KQv|0fxr+=`V)+#9vB1_^xeMi&nlEp8rx>AWZ*Wx4 za(T?F)8D0J^XaQhLIx*6j5Y|i+p=W^ob@@<10+Jn_?_T8~-P zt25K(BoK0~5^2A5OcsK>rK$iEdY5|I>PIAK!?C7oGG;4JSc##s)C*CKk%|;@^(~22 zh*pYn^C;ti>p(S2fxsVR;W+x9vInOL@y-B4wM^)zXhViY$lo>gGozfK5f<*E9VZ!J zcWmXg^cbK!*1bN3$!w?06*j`iXo=hykWUCg%xPGfD^-^H^Kqh6EE}it$uCB{GDbcH zECY(mQA;QatE;MsDiv7wB_V7cvglzY=Hk$GSEl&{a%blE*0z_I4)qlWyk4RsTdiUv zIv6V)i{f{JP`?yV90kPzmF_r)h<6V6mT!&Tg|R=BN4lPiV&wJ~F8oaUAK7CZG&6(; zv^b~tvtn}hPOyCP4{Wd(Z>2g5?N4M>R7YxWtZ?-D5}^**3eJK`g$ z8dSU57pBl;Tr)JVQ{}gpZhqig@8QQP3ww4exHYJ3OigEK5NT<15GlV@huKD`z3mNe zWcmODf)bks?gTOQLBL4q%wjH}1w7NT)B!7m-xYrs zw19u-9J4rMYXOamnZfPrVB-eC8Sv#ALGK{ongG_?EB<)lgSnWl0Ni=7vhfw)kaJP) zt*!q6I2)sx+eTt$HKg43A(>}Xtb_P%45BTk@0rj;%psI>R^I!N>Vb4f{ctkuN|V1) zc;%aZe`{dfQ^ZA!SWxED#CotrKc#k1Ge88tbHaWI!U z=Y-gGOH4DnR4$%SP!n@AD5V&)U*CI?7(}EvP_-Olbz1zVJKf|#@34);>;ef4i5(aI z9P`GPFgJIIH7ooX3(gz%0OL*6iw8HPu4009(1C9TKu^7}l?nF>@P!?Q(mte;n30aW zmXK_MWV3)?Vl*%U&o%Ru;KF?tOGtR}=hB2>ZR5zuw4hXu*e@a<;%U)! zL-HsO2)&_|&JTj-59cBpQ;8RE?866wPhlmUuyk)OL)BnYl~o(cQ&t8vVwGr5I6o>z zp_=>?#t>7mW@@9#5%vC&8L&dQ zxoab;9@FbyJdJ+7daAE}7~fH)o+uIRey8Uj+r47%Z1$knyLhdBz6o!1jx{33{mJgP zi4re6{iRD;<>aA!3j@qgzW?l_b1IRnA--W0;Lrd7bboo8{CCidh^@1u$3FlwDqBv- zDkxuDtW&lv8-fe)pirXbO%j&{w@C{YTkj;HTLS zGI?K)BjH7?Csr{%oQL@&c}{HCO9+Vc8Gl~$oaDsr@I1M>e!adu@y$l1+OPC7Z!ggo z?nU@N#W9I{FZJHHE=S;Y&J4KV@|uHP`KhtNctJ=FRE2c&PNBPa4GPAGlHkyS-#I6#f2J{rFDJ1)1Lco}Pp0t`H<)iVDvC_d6qR_LwFWOV zvgI7}#G{$x-ERJ}Yx|5+sager7tC{E=HXyvR(X&$KQ5nX`3BTogI+PsSK4Gb*Wu=B#E@Oi$v2qw4)A z5}cIE@wlGdBv2&GfUNa^EGYcaX8cl10%YE;MA<%v>HtW9FCgoZ&DxIRCZVVJ`cX6| zmkD?fTYymtV(T6|iBu}oHva9DGTdWR+&cd0)~OJv$;Q+1eU#Ytl?=#+u;z=6Uedev zAEL|mBV7?(E#A^59!Uu~W9XIIg&X*!m`b`L$Cta0oK^&+93>$U;hCcl!g#5IyR$J8 z%Sxh!k6!x3#bhj-jP+3qq%lUpp%bM0?1qH?1c}>>z@!Nnvp3=4a<}RHcM=s8R(DU! zY8QegKHDikr2f&G3bfDVW#KapnW1#jo@xpPhH_q3Ft0)3beKA32u`+ml-^WwQk>${gI&V|{(_lbs7~}sD7r=zgq{+*g$+6gXEDFcXF0tMv@(x=3gUcv zcY4!5B|AktFbm?E*_*~%zbap)TWG~Iz=~CjGJ1&Tmc{EsJ}qd4>=g8!l^hzT*Hvi? zMN!OGt({vaQjKcXsK&4hdkjZW@uJ9B>n8d9(YSOuXi)5>L&5+YXo=*{ROGv;QR{|l zb?Sv?$82x=Q9SKYkbmD6GHvr`S`CZ6#W6D;mFvxTvmO>cK|D$q-vm= zrns(BBKZQ;XRHZ3#qbBQ&fdun?S)vai-ZAFI?0MkO-; z4~?p*g|*4|{f$cgyJd}*?}7qifRTM@{DhU|4TRDKAIZc<0qN_Ts(u{TiCxESBIC^r zgx?hk=K#ggh6$qE5xXNf{A}IMgJi;>KV>{6ptmV5R}7}dv4e6z)8^`KHbHgmqjHem zE{O<*8MSDQX{Nwjf<5I1{AVY# z^6IzE|IG{8Z_FOY|C}G+yby6WGO>5Iu(SP#yHV(q?dM1EhAv);KoPjv6|sY|gdau@ z8N`s0#-c;GlG0C?qzMhhPJh;EaG08gU4e>7t z@rI^>wgJ1>9A-Rca+d8h<2|t*Jm|$SmK+wi7Bj)9I1G*@n&ZM@z-Spu)VJrxj2u}r zre2iqVPNhYJedolD!(r}QTgZD_&&b3`C$){sE?Ch}S64mO`60HX2XIsfF=s$}kRm;=*`db{0-=g_z zB-#HJFdHpDAqymcPz7d;iidz~^bSnl?*%|+wA&aCPW0qzol20X!^kDY>XQM^*Bi?? zJsKiRJ0E(bTv}05+TG2^J2#9G2yy~R3$bEHYG$>4w0%~*HX4ZhSTYLPGSFzBK0j1R z-A1{zE{OwX=ON1i#D+ry(WOysf)i{Kz`JKU_DfZUsbEG{tTo2=fs@ch? zm{=Q5>@0$nRK&Tm4h#uZ7*hapm3``4czz+R56H z+juonDc;1tUIHQ0hy!7OnqBTFEUNC7Uq}2$Cl(%tYJ2IvU{Lw2M5`XLD+ZdU8YkYU z_7IHi&~V+>EAZMx^}IwW4^dmUoCs!0yX1tq`*P}|{DV>ib2};8S$ti^&4_^6Lzclg zr;PC(Fw^3QooGGxO!8bd&`Z_sb0s)ftyu_b3U~#+c2?A5Bfq2di#tee{!1+qOs0~! zvE;0khoXNKOA66Vee?*g>+HTc(?#6yp7254JbRWowk#H;xghqq;Iw8Xj}*>R@I0mOSRL;E zmlYKAUO-`*an3T320X?a+wMRgp$FoJaHzG>6ZGoH726{3g}2}b)3FZ%QkhZA70zZ+ zgO(_+e)uD7MBCu6sAR_Vye7%!3WWizOSt6`pN7u-HS!;6U$FnIN#kUXx%J=1jT;OA zfa-rb6aHc6m2Kn}Fyd5Fb=?bGM)>gPPUurS1?ag7w)s}xlgv8uDW`@-k-w(Ckt4^sBuki$;DiGLr2^h z!(h-*xK(bX`<%e&56@!;x==T6yswywc5JI_8BtcAqJV{3U`vbHfMy)OnLAK2675I# z^SH*P7Za>;{AbAK@BFb1|0B-s01;5BA`9kBmWcz?T~9HXLd`PMw$}`kdy&43i@tmBJIRrV3924uf07IlAA>|^BzXfrm z@YlW)kc3o)RP&5;EKud>qa?FTMsBLv$KrrNE+V^d*^GN6wUzkEb$2cNNvv#9YOl6_ z7FL>1c-ckHi#&7&}{R3+d#hW+5bOX>inx$PmZ7Z_Ub6XGyE2) zh$tW~`E%I;icc6wM$8NZw)hvJoE9TVDbmn)nl<9u&j7qhx6`wE3aqXUzOvUJR~E0g zFOML^{+RqkoBjnB$1mDgtnf99FE=dj2a`@$a!P z4~jkWX5a4U?As8r{*@v6dkmkT=659DzwEgyYbhCN45=zhs#(iF{B$o)`=`8nT+;*62z&vRn!*7Nb0@bPi7 z0Us1UV2J%ODls~OC|HB+Egxj69u^M*g^_Ge5EAJyXfM%8M`jPIMxq@_6n^fo*(+nf zMQYmuGHOFGY}87WPrgShq}`xu9okWIM6XS*G5xDRL#nf4S$l}}84IVPQ00%x6?rmS zyN>)7bpmyBXAP6E-D$~HG(*rrx<`n3JOIXHs&gV=MYVD(Q>7}*{6iA849l^K82U9o z=50m$g#4<@=`FvQKS}p+Q-&Bh&gMgwOGsa~0niSlf%NBXI7{?Kj%|8P5F}w)$5Doj zR!nK;L}E(eEeT(_2vjkqHp_|i_ajA$;EBeGt~XPsMPe>@d$}Dm}>oATHyfn-WNAGWS5Qbut%s zaYs37q-NhVkj*zf zp6EQYXs(!c+FmBQ^<6W{+EGz2ctC@Y8d6RZa^{DF*%(x)0-LLVqKU4@u}fJyP?RxZ z@@<_fFa~7XH>zcAYIc#Im3RP!OG3a>E#zAkrxLiuD;SrYqGoEYz|?Oz`N6P3J@|Lw z&IH&*6e(!-*oZ~qK#l{rWcKqTGKi|9Bc5{V{f`pOF)=Mc-^&mx;@{I;#63jKvkPth z&od#MeK)9#O;tD0V~USVgn=#>l}0_S2@+~JTl<<~GorF5jxl{=ZONq3@_hM-wL}yZ?+~Q`Y&L^76FM zfEb~WhlwEGb`-6W2bBG32nz#K;5YkyDnwo%y}+8ytTMuP*ubf%#`d%kE0>Enq`|Ek&#&p9zni6jwBy`$ zu3{z1a?D4_#N(yle*7`2sYTXhK5dG(*wCx#s`fd@CYcFnOD#L%Ko32PbR-wSE(HUq zt3;_DZ*jt^xy7nIE*%C;}H<3r2_dKOCN2jt4SLx|+gNszp zi9&2Db(w0yUYkhE_qPA>;t!2+;gP0*B4od$YO((8kuuc$Q7f@?USM4v^Ao9^n)gWc zY^5u!^g=RS8w(h;&+iDWr@KcSu@t7(U?a@{3-%~P|M;ykNMhDaB#Q>A0qiUBC=ZG& zOZ8qJ|FbX4)DQ#gd3!ye40RNY)%+tI4~*l?YK|FM#a&Bn&& zhjT6WX&XPl^FHyop)aAgVl{JnBu<8Y=!$pC78}ycP`URwiT1#E;HtG$p`&5uKXz%v z)jfsMOxZBE-rJ!0u(`4aUz)H?sG$zZQ8RXVa%6YZv8TzuLr~fVOrO4wky`))(DxK> zG^~9cHbz9 zCmi`5gojdgkGY9FjE z<@(y5dyoo*>BghfJ0^#EKh2B{4M?+SXq z&#&43R~l*S1-p5f0e}>5!|Mu*@Y|;pmY-7*1{882fEVHi zl9Uz<;uptf1_d3`MOY5Nfi7E>M-h?ljX;G)yMTHWQK(NH`si+(ar)&s{brJLy~X7= z{*`$G-LYb0-{<0{^MmvHampdvNgLfsW?ZsV?V+}UBA2_sQ8t+4NBw7}}3#ivj6N6fM5!cLE3QP^nore0wSTwJ(-vXmsZcP)hyWdyDo5Enp%^&tm}7pWV=E) zYb{%}7*0$QBXu zf*F0TaUh>eK&?7O9Q{H?pqpAnB=6uwsQv2mSSbWHySbz`d!=!%H{KF&#t?d3y?UaL zLB6TZL0vMB0rfLu+jUFEc2!fzzaJ6p_ek&yRyDJHS3qKx$t|dGPqKHC!cf{a=KLp?cUGTdM zHpces%@T2`ksO&fW#`#AB5Fr^j}wgct_eO6m{~veO5*`7 z*kS|uLJ!H3y>KAh&@n-3%Q0Ybr9$wj$wmh3NWKEP%E{ zf{fwxpcmFK0e7-c`j+G4A&ADvpIHutTX#myS3Uca(MB>|;LzAGX;~9D39}f4mbK=gl zRqT)k;%Q6^k#p3fuHn#e)yw0DbwekPYjG#=r&$}2L0l)YL31bcr-+9eBmX8apTu@1 z&StVb-PjvK%IF&+62$en*H#4c_SpL&g`IuV|s+|j_z#}U>u&0Rb((K4ZP{CR@X zU}2rrkR9l^~%bD~Ng}t=$6|J+U&fon7N` zHiM}nts95o7E`l}%ZIrg|Jvm1{+Wd9K403MP(5-!zot~Y{x4d-h@+@Tie;@j&1c1o1tMU~v>`bz&MQiyef;oUAh*2pFB;nNRI!np^nduLxQ=x3aSvkv~|{r|(+ zIR$ANec!ol+qP}nw(ag|+qS;8ZQHi(>1o^cWGeq8mHe)fT)fw(>eP9w_TJB4Yni0i zntBgzjd(S+HN4%sL+P9QguarCYMGC{gnpCr4pmoe8bI-rg=mRdevYsOxbPpJkc9T@hZ1~?{PJRQdi*#QKu_m`p#^lyMn8F{*ABZ++Ht~rKU!lk7x3M4yA>2253$)4+FInPUyR43EZ`Q$d@baM8lxxH%ZyxXCy4 zyadAP6Iff{WU8N9+;9f!voK4uX4o0grSOsq!L6u!w~1kT_s(E)x?9mp{MK-e*UGq~ z$z+P5x1^H8wz%3(e0zgqW|IGgo1t9P^mXpeFHYlwg5J>@GASIWy3kHws5R(=zz}MgWv+r|ejyTZ2>#-E0uTTMhVb;kA)sI6Inr zNtVsS;JVqH>T~JT3}C`~9)M=D+$+~wvo`dx^*tOIFF!$rk(?)a=hN5!A7kc&k{+`hY$@k8+Nz)DCsX!i<3&ES_)tZbRzePSZ~X6H zq^%D!WT-c%PFZ)tI)1he)aE$8mUzo`w&t5~<|G;s?&T&hFqV5?d(glD>4XzD|D9I; zZY}rD{op(1U(Ae4I5CYRg+}IZ7M}jVi&RAs70Nw zDw&$FdN8DctD{=`*OBOb0iq9Ax8YjJW-FY{+=>#E*Zl8x65p;K567-clOY2{IM+W!**5du=PGqizyrb$m z`cM4x&DTcbN8P({bs8toyN%%@@eJ%Usgh4e?-_ znfqLiU6~!H+Yp0pL`p#K#ad5rso7xJ>M6*qP74fszGU)gK=}TtEh{U=<5?FMLnPWx z)*&myb}I(BpZ({|%Kd1t`n~-+v7A+(jtVw-x%o16>D))&b;=4deP%_;ND~pOGTwEyaK5X_@XA{7d)O zX)1Ifc83#Nn27WoohdJrqJ$(=5yHvHxj6VBTbE!A- zsRFwZ5#(_6CXb4WeB@~>bwiIoquSG+WMTCuau18?|Jr?$w0i3I=p=eR(>bjU`c#OC zgR6NYcTl*|<%Nt@$TZok`9O78%xkPQVVYEcgP=C&*xis+Fq)*kFaYxf`cimA2 z#1Z{wE7wy&zBUI-X!>=*Tvwr8sfAD*v3@?{hiJ#1Pkrru7AxFgKG()7?BO6QP@yoI zam(Q~SobSI3SPu=?3hT85idR%|CQ45R13NctkZ&?+nf|OuePi%t%oabvf{Aza-(%V zRlM*@qZYk);P$EJl!2`um*+9Jp-R13%=oTQ)wUITcnBc%U|RJvgv1`(fuQQ0rY1!i z0zYAC*7e2=;i__Hi#cWxo5-3aBejpM0`6Dfq{F5meU-71DwYgY=QDLk~8J z50?|cEEC5NhW?R~tnem?u!dYkDu+V+{w?{yuzAMPq6gZzd&BcoHU{C`E1??8Hp;{C zgPq+)q@9^4Egg}*2v8k|x0_=yjX4m7e^OvDwRH#p-Co-F?1=Aclrl7Xd>h~Bjs4M^ zR*e8$%b!8G@ATID?{`-)lIF!k;CkAb$b#gLFD)))aG)iGf3)yGginqX8?M~Xw-B1MK8e!V+!#8=!M)Z=l6)Zl4S$=7!! zu;k9Ofk=w4`nNI2CEM`nz|*!R>QNqXqk#DP$%u_#DRTVAKOEkd4moNcdXuboNs@<% z*BsMYC7e8rGI4aBWvd9Y(BD4AEdCVz{@=u;N-rI^r2VL^N0EmnJ;mU1@e4MhLmFmj^bL*jPBUldPsKO7!r^Vk zfFN^Jz+?Hr`o#UWK{C`s><|2+a*BLLs=*9v4EH92CWKOIu9g`G`(_-u^Z`Bg2`5ch z`!SFMQ?;fU+%ij;ODq?q*FkC|r(_SyJe5rISC+OeY|cK z6nLYe&LYF0SjK!Rjr*}K4_FlDr7x;a7Vfin$d~IgeyGj8IOC=D`$fs?H%>3e^v($& z%!JdaL@y?9X&& z#u~9CZ%Z(zPwrTqG!>LjSR@axGVeISxzmi9kecME$DXE{X5x+0chb4>0Z?n6BpDtv z%vEO0a8Mazq$wZ)S#Qfhk{mHlNt(A#@3XUwcUak{-#U<=2240E@ONL zPn2{EhX265n+May;k)o?)-K7p8PyU3T2sTa!H(4-uF7Mhu zvPp=oE+QLYNtDDSNazxJE7sOf8;j?R)~h1xkuO^ywm{C*raRZIp6*#Bx&?P2D%*q_ zwg|5VM&j_@k{bR*NO(Ns{LwKqCQ{Qvx4VrM%Pw?ujyRzS1{z#k!AAHDNoxA%S|eRw z&8V-|@2ub^zxkEAcS#FmrcJehd=E}4>sy=aFD?cW93z97R$pVjzf?iwF(Jxx0_RpC z$}<(t11CI;xmLq>U?&~%N-k%`-NR_CP)$_cS=|-M2$HD68(7!xh2R5ZM`5LNgNq|=@z0l z45I%wOtwa0__zg>EpaTb6)bFiN8Dk^o~FIAxps!Q{)waeU4~#B0O`wYlNp^QlTknG zkrohCkH2i87Lny!E9<)tgvca`os)wepgdEX0JANpGdLi`*Nc-sV2a zHzBlG<1y5T{*vura>@zz$PEZJbK4?vt~4oQ$CVWgvClf=GkZ&(6EW- zF$%|OMvKeY`mq^*uFOkd!d4!CiF3uXgB@Cl>$lkWSkNgrGdwJhzRv`?bvG6-Q?a&q z@JoOn$vVnj1zhAuG`O_PL?6)4j{*e_oB?`&lrUljPNK%{PUL~>r4AQuBaEA~8op>Lbvn0z^uBayBlW^=?8rWHBWdHR6zF}YfqRM7jb|EqM(c0$-W*H{SNe4&H zhEKzKdKcc5kC64aOd(}n80CQ-XX7bnsanE%Wx2px^aH}n9sJ`GjzI3CU%|R_R1fE9 zmGCCrgV7+XGm1xvBFh~ZIGnKBXNQiipiF(jbDrL^DJ`ILP?EZ`S0Z8KtilSoZqZ)2 zm-L9_KDTr&1AOs0paa-f4oaFUR;BIbg5^YZFv`poF7}Q&SUQ6zQ{`?-adTFNr>;yM z5CDi7z7t2J6n~8#kod1k_-Fj&^104Q2z)3tZ!I3Ut{qi4+kY#5E9gvBe?#M&5CCXy zdLxdv&h5&%QYU?PPZ~%=>i`;eeAAgbBcSaM1CkltX`Pg3(v-P_y$Sa!<*cu~H(E1# zfyx`RtJ57_S+D-wE|{#FBS$I}w~Z5@aty-iYN85sdvU+#>@}C!6}qC0UJm}scPZ>> znOvq6XUNT?^LFn0Gw`ccGj?<}-0Z|h=06%#uqJ1`+6)KnEeJDTLCr??xYxCkIQ~9) zN6uvlK3V;^lZwiP$M?_8$DaV3=<3sWjD&Y~Yzu!2l!G}G3U!#wy`G(LL@IFVAXrZ- z@SdWaEZfrs$CXUC%pm^~NuQqmfN2iJyhJH1kj>wWuUIf|*8Z4vPSqaj>4M96X1Bmc zE|}(MhRZUaxQf8NV6nScE?mczM@|Xmaog5enU}7p7yaG|^~St7C107B{0abKar3XM&D1^LW(4D@xnICM`Yl_}IcLOxwUZO*51H3+ot*&oa@W z;h|n>TAcTQ6t;U73_*b03QuL%j%!C!HR*s_ZOW56s3>3Ok`YiN$^W2N;X zu&*;O75*|RB&|+rAyLm$reSmp%jaBEpm|jVRa!Rk!Mw|{Pu^_WZn$Rj<6*wxJ6x2sB*vE zy&+b1WJhVv6IO8PTCFs-GYn#t!Nag_aJE ztUbYmM59WkzR&<|?YcAqnQ3?V&dlUyeahb;kB9?q#+Bx8}p~{Fqkv+j4Sop)r~XnG6rcis7F0e`zxRZ%$$+G`pn-W zHY->=-4RcwEZI@(3vAM=vT3$vh{FAji1_J;RcD3F4#RFHh;gozoi;ub$89Cc?EH=w zz&!qjX|^yUP5Pxs(@yl)g~~_*eGyB$qoTVb=I`lQjmLB2mA9fW5R8x4|D7pT$hu%aQ{j4%p#Gu!)rl$ksRr?F?) z-dI3u8g8C(j6kb@m2D4@3rEmaAm)H4w~yzV;G4My$2e34e*1~6DKy~~h#{nz@b>8(kxLeoREs_oh;ksmy(o+rV;3a6=h3e^-REeG#$=YPoJ5nmc0yONNaVa>2uA#&&-xNzfoA6OP z(Y9#9@@+_%!}&$z$g49X&P{mYP$*U6xiZJ1QE({3<71qtUR7Mb-aJkIxzp(pHHx`8 zdOb8^bbB!atVJ^{2V|vEKp$b6Vq|1cT~Hg`M<1(TD=+Qrb@dWw8`7{~V-{)bD!8iC zr_h46Z)dwVZHekE$nXo!9YkLmMh9ms`m;}(YNw^k2cI3gt*_ii8F1rg5BdfpIyC23 zcg)RdS+myXm%g=U&*paH)bShME4XBukugK7>*ZGxMd?V|x$vb{m#rGXta63Nqs?7= zw1iPd=B>iH05l^qS(Lsla%?KiR!g5barm(kde@NA(rm!ezkmcv8;>Al4*)hHZlB@a$l-cR-oVtFBj zqUW0S&)y1Ki|v&Xieg2xGJ{d=ft5Mgd{xh=0bp zp&zvlHnbc)#ZSHX`ie#TP)Ie9uPF%xX5XP5$wpTPAE|h>nsQL>Ayd~+6dowL0l(Aq z*_6Gm9lE!-WH&Rzw+*foZir9G+Gp+S&)cFLcyA1DT`5EQN<1TN%@|7+Tq&z@e!rDE z94(Skn0PujE;bYmSVg+~n~g}s4n(4Z6G^xT*SJ`9eT|&|lVj)Zx!)y15NIvz?70ao zTr*|a3axqJdymjM=%JW`HW6pkV>08!x_PU)?s|lSw7^aVj)+S!W*g1P?(L;7dOCq0 zN6}IfK2uxeGjOO@Ziu8(RgboMzUnK=Q-K~pTp)2SLZoDiA?lNQThmVAf-xu^aCC|8 zC?H1io;f*D^2dF+m~i$|+!QJ*|HxjgzMKccFFF1Eg&1pXWj81ES9S?lRA zm2NM|9cv7|}5tCEwQoJ+A6BB+zFe=^bv+cXx zwcLFVWjK?vH{;9j5dD>IH*NTJ_wC!RoO11+(bczLA1Hv9U-g@P%~q6dq-<#^a!7Xq z*}Qks0#M7jYZjw0dM=1hPsLI+%7jK2@+Pi^uprk0KQ7XS(|fgg&oz)*jQ8Y^rvlo6 z#TUuti6yyTEM=cSJSZp(ZbgfsxJY*oms-rH{uPfAb!t`l2Kqh%+al2;W;>Xl@B%wp z9T~BHMsv?OGK}jA@B}!Z|Jql1;kZV>UGh8N-(uV?mt6e8y=Ug96(~&~J$>StdL0o& zCWJhvy+{8h>cbH6B~=+|H|cm&h(-GogLfY?f&LfmT_w_5B?`ql(%BjrwnUyT&D|;7 zHS(B6J%?Im zqKmrVaG8Q(?Ea-CUPvqx``EqU9B*dZmC-Dj<5au@z!z7-=5#!%ru7aD7ReK9VTGb_HnmrW}B5Q11C;x@DVW zK-(l3!3ck|w4a?8w}T67_&X~rKi8h;GX0B(-fg=L(7R2eC+^6%O*9_54b#8Um#Vkd z>a*jHkKhpDK5<0S-n)l!F|t3{j#!*dlfudF50F02mcubLQZePsRQn}!MRTaYeV~65 zw4pyXpl{K;UdapJH*sgY=k9RF^8vxQf*g2^&qLBeFbmGJM5k4$=-`CAO|@x{#a|@n zeGQ?;(WaWU?a+Zw4{zW@IF5XtpgidUUDa%2~1BiL`Vk&q*92;9yE|0dElWE2e?)eEyzBEw6Qfe zrvflCDhuNt@|3D-Qg2~%yvd+Dqo*VeQwaOlGn?r9pCE;UthW_^O^qg^FB|M z>=0i{V4`?2$_rZ$`YDWvBYU$gW7OhQ%RzW(dUAe$WtvU!pI5K+9$i**U~}-LhTs!? zUq*AtlIg>57#Y9J`hq_JrUcy_3B3cCcOCe41m)Y6v!)Rd1AMg;OJ!a%DV+2Ud2AdB zF}2AM?Qz=V&ygBl2TIi?WLl%p)g^X!Jf9GZ>l%Yq3ijx|e7dE#f9O9Gb-eHTy0goo z4H|W?3M;GBW;J0=+nqCoe-{8INXnJ6=!)dD<+z=3j%65+C(lzD70XPtWmuKdrkr`y zHB{iIMw_D3Cc#@&)|85CO4Xf_!Oi~3NceLpF_$GeLpi2dt*Z4DI44;vB|pv-I-_sW z^&J8-V5GH{5$>xj3&1idxw$JKWq<&4gf5_#@|CvA_HWR~YQZ<`=9P#uDnn=YR zG3!*8OZ`1W%ZR~xTq?De9@Y8aOm;;(isIF(Ma)U6{0n*3x!NjeJ*xTWnS`W03iim| zDXB-;E{QYh(kx+v+Jjj84~6@5_XvSk_Xg!H+UxZ117WWOPq7>HglWG6axX@dH@^e= zO~$^&&ry$uK(z;8>mVzE^3=TBSJ{0s{Yc`SvQxT`q&~TR3jcxKE5TQCm-5f(%&ln|BGZBBd()RxUr?LJ z@py$FO~24P``PP*p{KKNY08(5_A%!aL%;g)kq3>ge|pGDRs*8OE-W|K zrcg$sb*k_}Et*Hav?@?W75P}@v;wYG8eVmss(q_Wq5^kS$}JzK_NAImpyG}KH(}lB zsWdgbT_WD!x^y60=1G<|RbV*#VBYG`(C4P0|E&0o@2S72J`dN4thXwm#_xm<`@qQs z1Cya`QG00=^MuZt#ANOO4Kt&;WRCH(eqg{w=aem_MsO3&|!V)$f=FT?36Goo7j zy10Ko5`#@z--4h{`$586l(5eF!rfbyu&&dF^;@5?&g;U)Tb8iy{Q|~Y*D#0t?}>Te z1TWEW`mN@2nCFH;ZoL|OfGM>kR{CMjZ}G#2Om=`iHvs{A4$u@gecCI0pFi0?I{15; z-LUb{6xs=2XADIqb#sp=hLyO#JFuqBLv!&voAJ?OPBG1$hqJJt`U9Iw=FH*k(zjYz z{FnV={p`uE6glG5`2|>&8tR#A%B&5ExEgS+ zW|(VcmR!G>UqqISN2PU(rdOq*e0jvG^ixTe^n3-1x58`@=8By+cA39;>S(`f9i*Rp zKqP1j^WlEqW1atBsUPM!wgE1zctbG{W7Nl@4!!B_+KY0V1ZX95=3h&p1uCMBf^l04 zUU@#&z#B6lyIgluW<77+$`(8U*RA4%LgQ2l8#HrN-{-%|cN3-#Jow&C_mfajU=h5n21>ar=T zzaSUm`+NdB_a+goJU~R{Rrs&}hMAxp3s5#*pgcjaJVCfTL6|&2h`hf%?CRm&CgonU z;u6a!>4Bg5L7#?!pR@zt z>U%#Q$WDJV1el+u{P>?DUid7~lE#171Nxu3h5!Ere<-@S{xAOVKf@++;~HW930K7| z<8V+_H#T)PE((cWAi!v2T-{GQGeR>$r^zewE%qVbln*LPbDQa!hljGqAKfEDpg}O} zVDtAR#cR>)0kP1-j;*p&?`<6B_9VsHd1aM$WP>pbol%=)Q{wpzbWh3^2Lp{Yw8|E~ zZ4|B1fbiB0Lwd2VrZH9!s6mQ(?TE}8nmVWukB|v7f3$7CsVO9kfPLnsJB&W(tAR2O zp8TuL=j;51R?XZ0P>RNA|A}({cMnwm_S41xzwbiT)!5Wl+|K-eP@z(lX&F#vG=2{r zce`4Rm|IIs2DJrc;gS|A9kkG*m}pp!b2itaW$R3fk`GS*VA{bj!ad0-PE)7i>Z}3& zS2u)CX#s&hyGcVF(c0mobar$+TJ8-Z4Z(pzm{)HC*%pArx(cOpQV|=|$8aM}UU}(> zbu}u+Lw8Y$^&(`)GNnsTk`Ck~mU|*=Tf=9l%r1=GZ*8LO&>eBCsS2D(14ZZalC>zE zy78jENFN8zL_Y{*uRia@q-{@?-+t}h-qVigmku?TJjq49KgIt}mH{ekVlG)R*o3oq z_JA%eB%eu4D10f^ARyMg9Z8~`Pwfot{1ckXdr#y%L3C*p=lC_xOC*OQ%!ycX}d^s)CL)3rj zg~IFT9gArG2^VGlFS2v~OE2_ajPHMcr)EQ5Ac6LIu6Gfqi83q_9FiP4Cch4nltW=R}u} z2{9{}GUX0h!&$sRo3Un`M?lRrF^?lQa>Z<0uyW-N;z4x6Jz&k4Gbw_c{3Q_{{iY&j z+GBV{ zG^aaIxoOI2bRMI@QggONH(lj(2aj^UXBe}|(3q}ugS+VLN^Vq#(_rPwwzkE}8J1h$ z@~ngJcl67Ri=KWw+87(Q-|^@L(?X2RorlL{awiUffWTz#$iQVVcBBrOw%gf@*z8~q zA2^1qGjb&N_=XRWhpQtA3gW22{8y80&FE!Y*R_$tZJ88+wKLh%hE#X5vbe{^{W~Q$ zZrjd|3<4_XJT;Y^UHdq!wUxXTin-G*Y;?LjC0&hZqf_<4LSZUb*tDE<#9Uo{Z4F&x zZI+goz`gQGNv4H*B6>_QjQy$wz~Z0(&j&# z)PI(F>h}*jP3+{N5pde^3!^KiXc`h#G*dRRBxIi;V1|pEZse`p&ul9+Rk?coW>LaT z(;7=6YT_F5%p!lUs#VYIBTJ*}^Y-Fcoqc5wZ&Nkd#E%2d>;wDy% z#r=#+!qH}mrT1;*+3S_oyGpe(WLwDH!o=0o=4P^GY$_^rSz5z0KQ+}?>GE~XnqHlb zQ>tWk$t0SmX{I8rjij~Z?SGeabtOmJR8goYoOs#tUedI6^p%yBG%-}SB)*NTtY})K zt1;Blma1cHSR&k^wBk)>R#Ar`)*seM#fB?hoIaDxrk<9i@#>zr89__aOvmWLX{3SC zv~87Q zWw!5Yo_fvms;I56r=qVZ!HHQo-j8Lffu^gmX}$eamDR+fVG-cbDNbvxF7DfuAyA$- z@=8x#O-EP0%i&NCeB!CpS<=&&79W#;OvifN;#(*8g5V`>J|cPuJzG^(QAb@_OAdX` zkd7fw;%aT4R*e<#H*6Wx!iz?8^h8MO_!_dQsAlO5`J7TSZDBI1bXY@Wz0bX*I#o@L zH9jn#^!X{Z*FH zoyauiGIDzyJT8vK>{4m@T9{o^;yC@WL(8Jrv*w9+TeKC%W-Xm5z-A{z-gHBWo|?@) z<+RMlK)JPvtlq{(9(@yet64fVNlyi2d%OvzE22}q$E3Qyz5b|DI7Jhgio7!Mqq3-} zw7Ek;Q>ea1e^gVragjua{ST`_LKRgMoF#|0wl=8NjYw6E(QX~bg_kMXKMAp_9PMG) zdgj&=Pu(QUAs$VJLF#m_>~u#Wa(Gc1Wxcs!B$L;EfQ8(LnBTdUY5SQ$R%?ujPM}t2 za{0cjI#*2}kBZgJHVh9{3#Yg^+e$?g)4JVCS{nU6D!C0d8h`-AERS}YCjDeZ%(GnT zd)4xBqp7s+I-%aW{c1O?*~a2nJy&ORJDoE-K_o$HH3vmU*dBXZ@xq|Hq^hi_VQxpl zN7~Qpz0%F4*GDK%A*JzUTI)?`%m(^$P@_L1^jH66%hSg}*9VTkHMFcORa?QB0;f=Y zroBRl)~Ka}%$ykyR;T(i`zX2U^oBp>U!8E!;qTx$S{k zTX`Q$m4qkC4LwsxDhR<-s~QZRt(d9zZa=h zNCS5u=e>&m^qvKTKrFNo3J)+GOWMpH#uD?3Id^!o*r%tVP`)X*Y*3I-sz_J30Zkhq(dBB)MmFVwsI@%Os@y6>%8u@Yn1Mm5(k=YZ`ItUfdt4&{|}0&(;OpXkrm+5oowTHZ6#0XvT6oAt8ZPTAo!*rQRmh z-sp?f+zZ+YgXKyC+2<~WXYZ=|D>Xy$LCW@-TeyS_JeCK4f;qm?U)oQ!vbFG0_tEPeJ5t<#F zoL8=6E@j-fl``GBr8;b)k-7(WBu^ZeY{_(F7<(`u22X zmUR}K09ROp-y*T5ip>-~sz?)f3SN3v;0gzwE9cqD{`MZ22;E2J%B)LegDN&9TRx1s z5Gf8)_I4h(k=TJ(d^t8ySxERY5kV6%wgoahB*dT{mUzp3A}ps$g2PSC0vxBZwd(e- zSqWU!)2Xs_6#gVE!PLNu!~i)WVMpXsjC+c*bUAyHz-jV&Oj* zIS_=CFYY>8lMM>cQkejhaUuhVgd-|eZ^RktC=Xwfa$!@MfyH>n@x^_HQ1?kV$S5Z! zR`PgT8+i*0R9DND>Juh74{HY>0JOqF?lp%bprL!P3(_}U!^cThM#wyzK6pkDKw$&e zXQ=Xv2Rmru!E+6c--Xp+l{2q_R++64R!=;iBRtxy4JS&Lg3gtmO+1=JBZ~^Ao5z>P z3&mq?{Oxt{7q^*%iY!j&sTseODMIar>O(sd+P)zkX`2X~0Dg-PhuEi3He~}Yh^p6! z-#)XL=SAxK)Mv%FWJuZ7e+NE!f8)iJNhaJB&u~ML^_{g{bRoq!Kosu!e4Uub5Sh~A zQIC=$_o;NK(V`xaw=u3JMlM}?nQ{GIx&+WpfmfV^rEh=~Zyb$^${+hnj1i_TWHgkq zjMP8~vlI!hsfvHHEWXH@PkR+`&SRFuo-2XjN})Zc*OV4BA%c+xUW62v^%C|N4Uu@qGEj5Y%-68_JvNn;q-i~U+m=)zDeUY zsq`a7A^><@MQbV2zk|SM06{K7-;?BO49@v5vjI|aNB|F(^MHCGwtQ&T6K5y5eAu3g z&|$oJ4+vvO-;)7v;k#rkc*dBhyXXwK`snjJ$|U&u7(P$cnFx;&5Km3C;ZGB2U!t_Z zh$09949j6k6MA2oxsdsh(!0(Mls+^~<$l|JTqk~CTKA#X1By4{9caPmKZA+~$W?;S ze~m~(F`kI<<3qnoE*VNDHEeX-{3dX-%f+(a?z* zPtaJIyEWbcYDcx$*OCk5g=)5j7u^RkW^PFqcBC}+Pj2j%H7%Cx9?y$t?4DdJ9@ME& z$GRdiMp3}PElgzs*KYanfm&YB-!YG^On7PqxhZW%mVM+0=_h3Xj>LQ&_6r>i5+yi5 zGQJ=A^!E&WYZB$!bb;zql3*%BH{p@%b|U7&w_6g5fPVF&$Z3R}5KBVGmBBI*j;iHq1M46Ss*iuxtlr3BzQ`W0j( z)glDaT_XmeFFN=p`r}*a{E(Ups1I@Ce%ELSQ0T+w*-14ZEIrp$(jH z2w~J**b2qCX`=09^B*`4qj(*tmZG$|^`cx64oU=k;g5UPJYI}O0zI*?`)+)wyCb7_ z1Q-L7uCRi`ByTV=vk1@5>;%6H>wED{u8duhd2Z3kiFUC)bI0x{K(?aPAXX12Zz&h_ zvqsFf7|!OAg-9fUqQs=-0!e+0!RX&YO!%hd-^k7*h!{^2xjTsDpVj2sVqhX6^83HBc zwe};t?lzQZF>)R{X))f#4wwDdYs(P7KREWiMe^r6 z_AOY~Z{-`nB|x@pxuX2ldo~1mv`(^6SkQ-!99YAD+ztbn;rc!m!@o7*vU^e~wvba_ z1Jd6Ay2DNmkhm2VyO0B<*atZ^+)9aqI}+SW)r?b?>n|%ipSI{iVMNx}`Rh>_Ikd#8$nh zxQgi?P4Z+_7|~^dd^Hu=jW+khT|2n;MBWWbH-R;Xhjc=1JJ9Iiv_Sw&7Irw%;gjDY zx#Mw-CLs0Da-F=v4pVck zFDx0W+ZMt%a=Rg7#pz9}QxNqf??y=$#)lvXjg7Blom2-BP@wo>lK*DIuCgqo6_6ae z@RAzFEWqr8^1CO;3S=Bc@+}2ei3YUl98r?xS)ul~UIK{<#=o zzoV@S&foCV!wm6imq<&ylBWn6EHtvFg@Xo$+af;|7;MA$yEPw1eiwQ=h>2{R^fh+HSS7@qgV!^2u zD!5IoANhqDnMpKC7m3S7GE3K_#{MAjNt8ks<@C*}f4JRAq29bF-a z2g%scNM_8a;!6$pk{m^j&1+>MJ*Fc^XDy6na59m)B{@us*SVCTNv-3$o~g)wvLDK# zV?<=w<^(sEjl0smy@bC(6J0wzfG-1g?qNVI=v zx`U8)=zv9d)fYY;R0(M;!m7mzDKJs)!gs90Cs=qG+y^x+YDJO1Idjq`h(|Q0ADfxC zv3V3#ibkBCq;*`fjlLkN)Iw2p4z?~7pbR@KjvtHp?D{XdsW?^*=P!>rc<`I~Q1&i) zu4}C7Jw^|HZ(SBT@F+3qZ-&CEz~H^-?xw&mS*+l`F=0 zjBLOvMD$$?OkrO{bA_RYdN9XpqR|~tOC#W}Be(_a9as?2vPNj+$bb=Z$LI|pOC=j+ zG6qgq0%4Qa67k1i^m}|0j2T`Pyx;96E=mhVw_h|X-kdmk?qpcPhBVlT#VBwxyLOH5 zhGbZ`nbEB% zR7$L+WgL|FWKLOi!%hEfXEH!R9)&&?tb*|$zp+sYL9Ei(i{~Z3jo3|FO~E738*uQp$sYvdS-h?D3vIh{PUrT( zLXPm~9UYcKU4lnu&Ikk%9e+M}?yJ z4XVl~{k7p+LTJ5l%3l^IpR)zls9-m=!tDberVvN~Ae*%tAtxq}LK0`WBQxxN+MviV zE>R^NLJ%}maDIYXsy!sT4PAkVQ*iFcmOL6d=Sbi2kx6z@XhAi#e|sBY#W-Fi9r@bQTTEt2Ic4T0^XH7s_1p(Nc+BS@a=QwV3vXB>n_{Ie{|RJ7C9WSL zIuyh~lY6H3Z$Tk${7IU7td+=d<617b(=;bt&ZG;?Nrnz} zhajw9_f+0~2m-J!(bd zb=6I=mh2EkBCR8VRwEQ;zQt4@)4K&x|jO?vYYPFI?(^$1UA=#+D(L0t;w#N$yI z819kz14*Z}0ZIFW>~X8wHZkXfpL21Kv;o5}faZix#b3||8ZRw})cI-Kqv@4PcCTDt zLyoEXqvr>oPSK#9Qr`z2bjDXI$s5(*=FJz>0oC5qx+_eb>bYdMN~lM`?DD&%7L(np z*bfCXsjn3>Lzj_#61(*{MAn)b8UI$~CCyi3 z9>ZRszc+aUtZr35%OC8YE#Komg!`(M`|3j;M1RLkvAs76KFwQv z!_6CnU06R#TCm}uI0e2M+Icy)zjVqBTNm3-0!tF zwrwZ<#caI0C5>6`tyyV6~;SHozOH8!*}MFMXXT5*WxF3a2G zN$5KYXNxLtZ%s5w(1XA5V*5NwP<8hd-YYi_`#kx6)hi`XwYXGNEGVH*e#RfXSOfUY zcJ40e;bQ#_9+4NRfSSo$t6_ky)QY52CCC#S;G+%W6-m6jfT^D`8rq_z7>_zWO?PLY z5TjA>i4Ai{k$cTvy4N~6t!yN_xqp(d^9d8ahv(^L;hX0D?i=eVaJq22vQum;m)LAQ z?&r1vc1Fy`dYu=7(iRNWujVmd4%X0STS(H?F|j1>BXgyIhIM0IdbjR-G*1 zm@=@Na!p8^3Xz*ME|@N5M|KsYk5b8HE#UUbfNQTc6?T>q_ca7#YC(w|KGr_GfJH-)HME%HQ3F=@gXpy$@GS#px8bdY>dSUw0uq=-iTU0!fqg^rON=A{)SyA!GwH zj}o&Aax=(589{K!#7!Y+K7FFP4oLbpOEh+V`9f@rXozj_W9$Uk7V4Mm(S;k)JzqET zYmQcS0{#fi$b52mrz&PrtL5JLGUD>KIjv=LDR&+A`dnvA`+Ubsdbe@-4>M?xsknrZ$*v!7HMv%(7tU^)ytPNDtNi=KHQt{?WbD=fd+}^Q7X?plxMmeDhh%H zS0Ox)gcE8A{UDDJp`~KEioBAh&vvcSc)_%15-TOy!8nWeH+k+@UGg5}k10 z^4Es>?g$BsAuCc|foW$(xJ7)ujAu$rRXMw(XE2%hUBoEwW=wV4J2a1YLD<{-SZ5HG z%KU~^Z`{=?-#u_=7#sP~JFMk!Er6c$rk+jBU0o}KhUQz-%YM+c7?*R74!z-hr8bzZ z!hn}@*`8%5;;y2ESV8>{O^W@Pwsv_gk(IWPn{&rmxo6b=M>}G%XJoU}{Xr%#fAzBW z@W-~Cm0USgEhitlD)=y7E}@NTi17CZ!dqW_n(P^&0T}mES0x0L>yzC*FW$b?!j?Q7 zFtM_g%|L-po^dQvEzYTxAxv$YA{9}gFz<^(FG2t7O_3FU)|FjNuEnt2vEtGHNt`RkP^KT_cDPKUa+I1(-`aiQ zTEy!=DUlOM*Pc#z0cS5(SX|sj(skrQ#+etZJpmsGMoudHss@8%kaTz2wyC< z$E39subfiFkp1DRU^yi&y^$J5t1?H|=lY&bDys zRx6tW{L?in(EG}`6S16$)T-q`O|}7D&4|nh9(uL?`pQk|OHk%3N$It4=j^DV-jULQ z>OP?o?!>jy3D9xGd&;lR(G5y-XU#5L-ZA!qpPI2?6w8Ttb;nCa^!mp~FujbiBkD!O zb{5qtrsv15;Fhr^&39nlp{5ssa4PDlZ8LoQ2zMalyp!`_9as1qy8oa%D|U?n>ePT) zX@gGk=*+0PO+|j%J^*;ry(2=1V16LU|HDsJ{;uBPiwt69lri> zzvr@W{rpCITk0*wQ?-p!bN)Q2_6B+z^(FpM$&b{1B1d*IT_op2*?v}Y(&b4Tv+R=$ z`h%1Dn=iMpJ&yGT!70@;`iefrL{&jUwydeC3s|*pKTPnT>GoU*Pnt%)B&&$<9G8sM zQ+UnllKL{{98&B21@9@*Ri1Mzz?_>RVfafn7#ROjC3Gk3Lg5C;l1W0kk^_PqdwUN9 z$DsC>wk{tCx|ZLAb`|Yy7wEp0IOsz=^fSs8?~I{8@&y{&E*I+-E;A@#MQHccu!*~7 zq&I_c-ZgvK*ar8a%O-{2ql-$zd&jHGVEoz^Qd>5gQP(?62&$ncj$oIeHFmr7-e;l} zKYSydEv(m^Q&*PbNsUYaho8O*scjR=tjNq7f18kz*YBJ5&o~rZ{$#^fglJ)z&QXOc z89hVJO}n!9IiS34Q|5Qds|+6Jva&35B|c%Lvb-wxfCev7*ciU5&52PK&}UT_!^#;% zeE(5ZZ!G66?l=)`(6*2?mTgPbZ{$7)d08TH$S+E;;&D zA>4D(mAfp7`(3%zs8s!M=I9RTS0W|F0(1m-q$&UM-#fEZuxhoeQ6bdlu?23S21;&<6BEFYDX@x$ zW0ec6SY2s{#e!<0zF4T*2|E*D(vNI`PSawa8-M1cN>|x*)aSPJAzPEY?17zr?$s%P zz4v`)-y~4heQ-~PUC@>FDJ_X@M9#SeCBVLH>*Cp+A^q($pCK3t^?gN%(r6O=sv;B9 zDD926zp@b${w*K*-NKRHUWc(KjfJ)BYX!g`OpLoVHpV{Se~Cy)%bcH-?*1AXWO|eT zHSPcED2E=fO+{Ft09mHWs1b=gQk(pzSOuCw!-Qc~6MVkPKGjS`uuBCjq7uzf%sh9k zoNQbH0d9$^bwCpir;@dHkqg3E-NGQJ3I3{aNhrdJZ^K9j56CL4b<1IlhMC1G$PDQol!Gc_Iy#oySNbOoM}}^nhCWwT6k@1J zcwTyqS7p;{<|P)gTQf8NhX1DN6CltWTx;dTU(1LPa~T4n03WdCtyyvdU9s7sKU9;UWr92!>2Kvf;4};KiRF_@}C!_^VZx} z)=e~`>&>ixDmw~ZeW6=@coEAl1mrEu`pi8T zGA$7N9-rh}NATfOR!Mg4xnaBO#QIe|XtXWleA_Q2Y)7(T5!N(pSNOoPn@jqnp2}{@ zdEvGi%z7xEq+d3s{A?~)Z#uoWKK>r(H{Q?G9~1rQ=6^Nu_P3w*Tr(Yu$K$BiWAMvRYwV(#iGK(TTn{ z!Oa3^*1LJ+r2&iD!%H5SC=cS2#%>lq?d%a77-fs2E&ZMpn3AFYr-!g|Fzl#K5>jn% z^r(+~FNtH+V~a2CF}>6so%cs1CcpKe7}Q^^1#VsB_&&M=r>z1+veG$+8Bmo96~r8 z!9Dvmb9e-q;js5ha4)8CPj@*S*0F~A`&Z|2jqT89GOx$X_P#POeii=%=A~%Ex=-pVQOb3i(>k zIbqZ&OpOpV5Q{0p(SK2LJ3&eJNBf6~Up`yDWHza#}HGRq`8{HBKop8MaC zx;}5OSbxxv%6K#QArS?-Lp7bn&O?hsMdP!r4lXp-vg+?JUC~`{I9=^-MBw}jOP#?v zlIKFR4ITQpZG(qbLWx#C3I>kYR;;YC3wC0Lp=AV}s8UeKEdqJSDZMww4qBz*{$;02 z$;PVnOE`xqFu9dMJsmi);Wx!r{BrKd+X!|peS1S0v>{j8+WeQ74thrS-87{Uxs{Xv zmYCp6OpWco0Z8LU+e5WTqtUK?-4DOPb7Zl?fYCPRW^L3@?07Er_k#H-I$aFr(*q*v z==PO?mK@u@C{)=p@j_eFR0oY*BoDVsp)%Kzw5Dm@ksPRm`WW~r_Rype9IhkMen#uP z#mD{{eSmXLNFAZ^fntZFw<5!o>bp;jO+=Ky3nTGgHagvi$f2b2*|=7=;seePG`_#T zt+lai;UO&O`J-GU>A!qq3Su0G<1#45ZcnG~PC2;p@+oAW*Bp>2aMWM}79TIj4wiJ} z1jjy_5`zsm4*sA zUG2X|e#6q9-_zp9VDVw%eUhZ)ZJy@RwVM62!^#qS87As8>k)$F=R9%YQCF}>AP$MD z2I`Rg)w}x=hq2S~vRCjo+4YrtgIDz<2>sCmyvNL7Q0hkRH^KnDLD=NYd(lhFjhKlw z^w$*S3+%BVNOaz=r!qNR<#W~G^y(AcOXd6(w&z^!(m;wuarOWPmel>NuKwol3vM+Z za3|`TwLSTBSYWcbENIWt3wvh=k*;RLh4|7>L zl9_#9s4O3lGTW4yu(m6C>It?>GJp5J_Ke%?&Han0vUQup_xVV!GX(v*Q07Bl#-ZBk zzsOq7VzB93?Mz)e*GD&H$u1wZXma2mte+DBsAK9h;Y8S|w(U()J=3mm3{B!&^b2+M zovRVoD`@dDVQ@!Kc==r-_50B-zbSL4UgAysnYWdtm%c{gBW0zfm}jw!e@_cmQkC`A zG?$e&Xal6$TWznWo6&}|!8u;V|HW=*e8sw3Jo>Eq@y(5Jm}i2qp*Q{hcv#3BSP-nx z-R=TtC0gNGU}wD_W0(dNjgMU{?9~~7ai;ADE%ZHDT1c20sILiI2)L?C3rZIPT2HN) z7I4p3r2iRU(`lrM)GhIF#_En@9f()k|Cl9FJ{F&^e781UZpa~+=cI5}pNesyVHg*p zZ>F1COh$|@8JQfRrv@8cKV+`+Pr2E8+ZnitTy$j9(Uw7oDmXnb zU(0|mMtb=E#GJQX#xme6bJH+LZd6D+6%qCAaK3=;uVu`1O!j1QtliO1ZA)8FsV0VV zd&yV2f$xW{X0&WRA)c36lio55jx$-oUJWiVV9gj!IC5We@v`;uzBib zTZjAb2yfV6kJRp;8fmxi|IC77;kA)F@%Hc+vTXv+sF!gOU18s(>#+FOpLIxkMT5}( zDRtra>O+t3vTWGS9nmR$y&h3uVv|uk|Na#-FPA)@!X|Um^;qRYK2nl=CvQ@|dNx%_ z>}L3O;Qv5)RYm@mEb>arn8_pEPfteGdRn~yQWadKw_N|dGQK|Jv%<34Af5dQTM(pR z?Z{%vc8Ozav6tl)Ae~d}l?BJ&(BxUqh%2-0^M&y=e(=k^)qb^Mi4&@pbaiej-dM~- zDxMdQMgrckk(6_8H2%O^&a4bnr!d+viECEoY{FC#gDs_PPUlP%0l=)dmYJ>S(j4nP zBPHoB#k;Dw=3iB)`w-{e(9}rgRaA9C@tD{BQ!K^3R#nf2fy(&TCDv;@8)-p{fG-HG zhNI`6VB^8-6Bp~iF zJS5xibpaeCg}kmgjTF}@TjLOgNEc+CF>!P6t6FbB1%;iMv{45Eb6XcAQHFW|7J_)b z5ljF9AI;^sSRn$VDt14|X}_oP8|1r$(Q7J8^zEG3s@_@*Xkm<9E=x8#zz04aerJEq zPdZkUL!B#Bs4&K%l*KP>uGdqLD^N}{gh?WO#9)phmBuSxP9lLrn=6u}aMV-t4OOYI zKaC2nm*sR`I;EIFD1A&CfGs9DpGG#R-^`MrdMX|rZ)(@blEJA+?NC(kBk!H`1i-@- z{=+4iG|FSiF)9M1iH|m@Ym6nEtHY(B-E##nQiw}&C~!q56z+3saQPL@g=G?F{WQS| zoGO}QfH_K<1it>$WKskpDzo47FO`Zz_9k3rRLmSwZpjTv_EQR`_SH-g)07RIa%ugq zW7>Q*Ji}mPJYBgH#}Q-q+NCr*Qe!Zl8g6kBi9y0*)YSh(-Lfo_R6K<=CY{ExtJRk51Ma}tsm@y^ zG^Qm@K-sBrUW@C)R3yn-erNnsaZ6ZFq*A5UYSmdC!#2Tj`MtPNW_he73Fkt|-Kw=Z zs`--?3eI*l^%*wQO&cW_yWS@B+X`Dp?PGjhB^SrQhj{qPTZivs9v^==dxXXW@Kv{t zkq$w{AIS#a`;}h|ZI^@KyNs7!Q8{@(cH^_K7)E!>)p_fjN}JZi=soIn)#{ zL3dbkloW27ubF0v^e;vB;d+!MZmOL9HA(btvajLWzs+8&?pV8(rs@Pybo0lp=&6+ zZxIe%zRI)@^~PA)sC;g04&`*!zV_gX;@FeAd1Zt;uK?+1aB}maou`1l`pMcw_Dr|s zb`JUKkMu3~um8OB=rgHFAPWfu)Qb4OFeo+#*wYIG>`jauZS39t10bdLZiKps_GMk4 zv1u8+?EgpESimn9BG1GJ(TuRD5P7%|lbMO_!AcY{1!gB2M`RcD z!+t1iPV^45ARl%wD5G`^M9_2I?`Wv6egz(4pcv6xjXZu;zu{X>4X>`ueiXya1SB4` zK@7te;%xN(F4TTY9+cjOKIcEd^y4>~u+!r=f~b07yA_y-PQym7Nc1AN_NaO&Q8gns zPK+lw3ZBgVY9t(a^36+)(k@wofW^H{=sY;*G5ORvV@*-1>XQDE<}*Bi;+~ANqTKaT zL-7Tu;m9Q$UJ#m$b8`is#Hcmz@q*c$C;y@lSAMS z^6|+hB_`vxeDmO#bcabtFA_>FnfsgEO&|w zHs8dA6mo~KFiT}W9`@7N4Q*zmzI=bnZF*n4g&i$7GFH&POJ};-1c!}Z7UX&DQ0bFV zR#;G!!DRWT+}K?aO3)EQH*K4ug7*5FZGXrV!K5hfc{{3i-(9odBcE@owarT67HzT3 zF#Q8hNog{|heLCQG~oDqyy0vhhZ;eacPmfF;E2W%;$rm0`#E97Zi<8N^KXBC0DTL$ z*sL8vFwhY-oafly{z};1;W?BvR-Ks{VTIOV3dKp%$BLqTj(8-S67$~CdbK-jwL7Ie zL|Y&68jpRaq}myY5i10}>)768d0t{4o){Udjl1|krzqOsL96QxY0_=oYK9@z_yuG`n+Es#(CXaUqzZis4f#19GfRKf*Bo zEj`@#kObU!FJ8xU*{oLQ#lFj*pf+l=wtl+?_xe%+Q8(rQKIST0iU{sWOpq$)36kLD z6`a+Ma&l`Vw1JJk90KgAn!b2eaweh#>lypI7ew8ssH_c4ya|jn&bw=dFIIREBeh3! z)w|netoti4OWN7IXKQ>S*oD?jx9+nm^#P*avi*1ju<=9S{rh3*0vX3D1pT@TU;8PF ztAy=NC4(mBo_Bozr3;IOW(ih%=OP``ozPlhak-fK(qR3zsFni*7VSRC78{`3i~=pZQ;gx?#yha1~OCe*w)OrrajZ>7rxQBeae| zyj=iTUgai{KDIFE7LQM&P={%OEumwkYIhBcAsy{lfc4@^1cNh$sRVdN=knYg^_CIB zzg8;)|eO=KEy>5}6pZ>8;p1iN>3_pPAvC)CP&D1+BNGsYN%v2~(u z$VAU%&aF`$Ub8_?ZQfr_!4b%n$LdE&$NO~A>C?V&D0 z=7PTMQ1Zk;WYh5!f^+@9ep{9QgRC;eBnsM3b;RF&a$Q9v#&AWqs`lb0OoAz6i&+6e zw=L(0&It6z*L+7Lk7MHGBa10>lg1gx%<;8*`(1#^5Qzod-zu9|WR1y;23{K;p%G57 zwhBjNPzDQEP#^eyj?>qaw98{XvOnb4)5rWajSa z$nK$dMPHL$N34EUMN2n7ToGm}nPbu%WZo;)P$H_so`m5$)%g?%1@nleQHpu4$ z``#JO*_Y1g7bLts0qq9LJS#5z1(v^5H9$+I8Q>#1Va_s68E2E%HThfV@I|?2IRe`9 z{^e=+hZxkUd`4S3Sj!cTw<589Oo>;uBC_q`ai}L~rP%9v@zPX|ze6|C@XhqWN>Acg z9K34w*J9lwM1C1D-nU_?c(fx>LHBMW!r0LD-$X%I)fDwom3>EI=CA@D4Zj_(Lj)Cb z7mfJgK`zTVmC$i*2a~WDbz$Sw?vlU;MyVDRvt33wlIojVHm)8kyyTLa61#hhi$1tm z2KxhIzAYmZ=fs}RhUQTTyjUGH0@L?!YK9nA`*2(@N@Y65Eo63|k!$+5R!%RBYj(^Q za2K0iAB5}R_!TsNv;e&E;?xJFO;gA}s=VT7JNgC%Nw4c2zG}h!yLy*GsHQmbdWUkU zd-X}6O}0pIv<+&FnU=)@*~y2*?y=in8W>(*{&=nfd-nW8ctsL14ktBQ}K)i-sm|3DP@ z|EIm3u#Mw?wI~2*lmD+p5d~NqSOVPtFK0bVbyW?;4E5WK$e6reoFO#54Qxa3kD`?o zOewA4UrK{AVHWd2A}sxjSP2Rgk@i)uZMDl{xvt03D#F8sr?Qd~daqN09Zud7n@BQBV8w6pav};t zKRt01ZGj-DWBc-;afguT@G)$adt!Z!kduYt zRm|IzldSy;ut`Z?tmK6qC%IQShrsH%6csgrByFr*)50WBoh)Rktk~#`Q+*H^TzFaA ze9$z~%+6yqNG+&i(TJuD@}w!LKwMqTlmtF_oZ~rn|KDm0aP#<3X!?D+18 zw6iy?5YV5xDd{EJTO=%iTD?gX*(BSfak!uxAI#eBP~pK+u!z30Ib9N zd&w<=`YY}sL`>ohkOvG5<(dKM05sIiBE-lAdUB#G$#ZMDL=o5ILf``ZVigLoCaJ}m zuz=B0F=bH{XZu;&0^lg7tj^#4V?nDd?+PGcx5OBU+3*qL>frM0&WHwgx>wwo-0^`3mvnnXnAe zv#p|Tt{5m@;(TLFJpJXsJjwTI42|(oY-NXzU;J(4TlMlYfFu`U@=l{ARgG)Ot$t1`P))=?C#1S#4})s_7wu}BQ6f@Py4 z@5x?B7OtlQ5_FfePo34)U93#6z{a*c%b2g_FKahzR%=d#d6?wR=JTgv$a+6=OeK3M zs>9qzDOu9keu72zPA+${*0dUF4Nm8{WU|Yv$W_jVi8b*ATRcDci-Q>GGhY0ozA!Ch zJN~J4Qa2^wc0BxGv(cR7XNU9kw;!#R(v@z#d|g8FDMB;!;k!1#lp0TDBftaLW5_QJ zu4O(*Doz$F%I^eqEFVs7H;PSHYVe)@LE zJAjluTQa;4p|)xEdMC?|o)yfm_%H!6z#BOsc7;{>fkjrx^kkDQ$|Uk?7Kf$G_yx)j zy}n#>Qs0g0AWP5|dXe^!h)FNb{Pr_aib${a2wSxol4!T>nJ3*0QQS_AD9>^jRkbNp zt#-``2R5!7(XAsQQ`S&MNIY{$6M@d~fnPo7*LCzxn?xml1R>GQAq!g~k|Zsy4oTNI ziT1JZ$?uJeqmF(Io9gz^Khv;hioH=$N-GchCfU5?4M0gVqn`|_2^-OHiHDd;l|grD zf2cphu7((S#QBr09#U3h2`V_I@)Ei@bzZQp`TskPX9goaYxSp+;KBg` zG5t@K#Kgd!Uc|uuzt6dysvc^nCYaxywM^p-Aau~0k_G5}_Nz=2sPl*n%ZR@b`?cV? z>Bn~%n5QP}shc8>ir#rIKwn&r5A4U3KGlvNG~QsdvRzD9budt0OZs;^zqXE_H_X1j zo|m^3qMbi}8zF!fV3rTyxHcfmU?wyADWTM@3Vxe&m41!_V z?B~1Yi7?U;ktMfr956v;h7!|4lAA2_BDyFs(etO37>Uk<6Gy4$k5*P3?%t6P@06KIdA-TEPkq z7Ya6c3Bel6&=SQW=53yWTDMX6BxL5D+C;M2C`?fA&YGK0m}DK`bHTi&fQ!j1*mj-| zL+#95VAAble8rVX&q!x6ZOzz8&p4UixZ228E_-O*zT|M2C+{yl3PD5Dw1iYPiG4p( z+_;5XCq~zpf6RmpKKW$;(Fo8~MVo?Z>K5KuwY4x;O4^Gm(6pyuDfJ-SE;l9t? zC^aaWh@=Z#s=5mV@}xsRl;ttv2*BDNeF@xIW9jcY8s;|bwM8b20g)kwaU7_1`K%$M zVGwsDu{66`k|#WF<{Ni8ZeN;io}(Nkbk`m+`l|!M*_nWR$6tW1c2s{$)l7O+>N%dN75J8ZN%a@@;^P&6m^_D>Mp#)nk`>!do=3EUk z^QpnfIlUgjlC@UvKNrpqM0g+I0~_7du^E(QJcH`z)7E7gG6!fg*8 zbFC#47uXDH-rhB=EI#+snTwWZQ#e~QYOv5_js|IO#HW2pRG}cNsNBr<`x-%P{I~O5 zOg1mj*h$QrV{N{(aKkV1bj~QeMvtH=tVxwyvRc>53%)TQ=pHESiqjGtNL->;>6>Ff zNuX_qZzl_LN2shIjDi}Jn&^G6>$#Wk9zRL^U~v0ici-?jh}fZI#3&V0q7Zf!#-Jq) zOKrhNg4-o^8T2NwBX`T(TQcnD0&s}XbA~7}5V$j;a zeLtJf7SlRP^oWn(wmN%F8+=m@OG^1M;0sn{pN`OCBDs0r6tx*#!n;`0MCB+*N@K~& zDlfEAAw+(!paa*?38~~+G;#C_ApzlmGlr_Mh!x^Jr39n)KkOijzdc_u*oGTQyCb6d z=IerI@}yQYX9&?5vWtDA4XCFKAf_-@S5lV?kv2Kf8|wV8+(EW<9}Zo=^Rgf(1lvQG zn?+Iu{rH7=>s`Y)-dJQbEcIabI*gEX3bpp_Uvi-O^<XXl~7($QuAjEJDhFfyk|-nq$nI}>wqxS7-B5^va<4)+_*7p zBZ(*dlWJRO)bYfa#9zQNd(Mqd`*lyImnZVHCr57W=c1sG|INk!lkjX2Z&(*0BRQ5j zGWNxPLHO^5Vj|23JpHFYwEa8`|5Kq51z0+o*o#;j7+RVb|Cd~V`_X2Z58M=72VB+} z+}Rl%UKG4{ZvlBY{~&UrUb$r=Gkzi8P!!w%E~j#!Uifn^egfAkXJQZ8Vv<1=yn5$j zF5ft|Tv-&HDAaJdW1ui|0hKq_UKG6QBj54!;3IJ%a$wHz(?4?onlK5Hu|u3d1cD?0 zXeB&zpu^GYyRdTM0GUk`Tojxf98urc;8$Bb*npuvSiCf>CD4D5Q(GM0BLM^msQecY z(4YS)PSgK4P6v8P1A8SCBPV-+quWpDCjS-wf5n}pq$7tSfXdtdt()%nBs8BQ@0Pwgdvv)c&UMJ8vFCN9&L6p)*YKHURIkbwS6!8iZDJl<+6k9tQ-j7su0v^)cUBS0TkpW~gD%pJlsC z09f%6{cz0Bqa%|&m6}hH_4<2U;?h61pX{x)~_`5X9Ji=5Tw?I)# zqUo5IbMzM_au<5?Ruu@GK|Fbvs#-xg^&{9a@S?Rb^ToG%-vyH>Ayp?f%B)v!|+w-_jx?$NCiwGk7Em{b#unDoQY>eR#1>U0y4m^2fW<%yUR zE_3vk5@3Vvq4d7t|I`3^^1*{P{v34lA8$kE|LMU0|BHkFmfK!2o$&sD5ChGS1nL+S zwt-23AUOS;;{A%hd7}!UW|D2tFA&o84sra#h zzkJ>yp6r)n>=fzq;X&px&on2+^JcftXB3Czig*D58C(HiK>n-`4AT;8--IUsO4__N zxsM%C$T0Y9!~6oj%(@{?5^>66z31_iwL4D>{%>;J5}N;S>O2E|Z1aZIbc(>v8wiTY zat(HJJDG(kF9VO()tu>@s?4SMb}64yww;-fo5N))!0$lju+&zRFq^&-iuCBW_Kvm& z=bf&XhtgZcQL#+&R=q{qQ~D`&m)MZ7x{_bd3MI<4D7s|Ds19IJsE>mrYi1h-lMjnD zTu0w5T#o)ia}Fly{1-NQXf`yJ)3n2sO~j2^Z#K>X%LN!bEs*sE@4 zzC9bn##ob+xx-`Y%;((QXYNrSlW|0iRvl&*-AgU^t4|fA8pL3QdF7{#9Tby)(H(5( zfP5*Dx=6QAg{DLkPW@}9r6m{W@gk_7zX`gkyw31|)pcC}?(TRE^nA%dL_$B|`$G|A znMWWdTPdG-c>^{A&cwsi@LJ$YLoW1sWP*4&@hhukq1VBm`a$y%6!D=5P{b->mhPg- zU$hR}Y5Sq&Vn>kw0$%s%HSjIGhqh|iDoxF=(qkr0C`O&z@^Q=Am77%sdeEy*4;kTg zje)~)k7F>C?Fkpvc8|NtE?)KQd`a>tH=c>)3YVqHc8k7he~UmGjKi_s!^syfm>Dz!1h5&lFAO?xl7zB>b*rOq`$4sMnh!{8eF!WQh9B zx(N=|pc0O>rlCo5Tc1V0+9>S=8PgPm&=kRei>BVeh0d{w^n1Y0{jZZ( z$i~Xn-o(Md#{Rzwb&|4%9Et+!S1~OtY`?0rGR^N9bYpd8Wpoog+~i+^{x(8bYm8PU zX|i!Q0S9Tq>%z!h_q_xrA6L@7_2PT|oo4*U+{f8zdfnY#Vu;hVWw~&SSaw)K{&=c^ zngT#1O@D*P9Siob6By}?1O@O6SzYN)V8G}ZDO=T;bgBOi;eaWnCNq*4sS2JrR_sWI zo)APC2~oGIYH~N(uZ@K?Sz+6QxePl=lQ5Izxv!0B(h2#`uHb`WTnH%%7Fe51P6{6N zI66lKu&^3z%3_}K_SXe!s|If*CZ#Y`ugfY*F)*2+-f7ZVWyfO55}V*p;+;UcLC09sR=Sq+ZhsIxNjFT}BG&4zffYxL?Z+s;mUs`HTmPIz5YPz7Q8cXV- zQ3-3zDrp!fxL5(BFrd={F&TecBOy)+mvxjl`RBuj%ta3qp`1jHW^*fRoQAU85$^0* zs*czuLQ{8w7fRN+ZE4qK>uAiyV#&=WmL5i$x=}<#T#T+z7m0>dLA6v{y~n#m7P-NF z@sG(tMY(6*#Ip1R125+5T1f)4i+un`x5z_h&Jkm>;~b%z5__K7Y(&i>T6a0L^Zc!% zy*al}bviKVx=hzPnjU^j{P|jVQIyWi6k%22;i-Diy6mGRt<6(vx<14HLhkF1I)DfUTcdtBuHw^eJg(khbsYr87Ji z83~dk@rpe%@nd5U*Piw@rKcStn?;u%k}=|0BXEe0o#_Xd`062g#Fg$pw*0!nrGe$h z<=ukOO66fbe%iv9SZ|Lo3zsRm!RHZwF{$$73PX#dU|6mZ5RwqT?5(tiz{^`b$m)H73 zNn6`mH0Uj^C0w$8>TJv1Ff}D8prGe93n3#N$;gw+!t+hu0Sj02eqM_{qyXZ`PCJJ4~ zM?^ay{0h;XjF+tCUGOBO?^MMV6qE{_Rk=WHFg6%lB80WFKSR+?)Sg6(!&Oi-*=z zc;s|arxCsxy6j$Tdn%Sv=r_Wl4)6Yj7KlOk6wvlCu)E9uCfo zu>kY=1@HB`T<5bhEX75;hpDtbDwt7sRjRXX`Xzz}j8&PjjX;bbP0PHb+*w<(eMMy{ z=E6caoAB#>R0b!l>a-i&XJjL|#3Jj>J0zz5LBDjpuNtBCS@Vd2Z`UNoFcQa zS^a6_zWb4|-kKvEKqXlJI(L^`#v0lG7#pfAY9$(j(oKYho45uu&2aL#;NbCP zLjWbL)-~>043xWJ#G03cF}^lbT*56wpF&w28M%Bet)7s~sgR0F0jA0*-I8|enP8%n zZXYjE+#N`KMe1S6$%$DQewCPjJWEHcKDymPQY}f6#b)K+LN`w%Bc<$pIaiY&f)tpr z_i#ebGV?Z6bi@Md7CjAP`E4U?zp;`4KRjt~yHfQiXR7UXJYKaUvK(I^ZH0RtJ_ubk z*%=m3On$66Hkt}!q8rM~ama=7xms~6+i6N}L`uoR@8C+~yg$1VeED%Pk^@2%0n{k7E8h<=Vn4o0bKCrw;^dT*W6_$uPcoXz~yfKiG z$pK_ld)KMq1*A-|esK;=)w>n@hJt#YLQQ-{6Y)(12_kK`d#>`IRo;MF>9C4tgvQ*p zEgpaD&<)m6_yc@`JI1qZ&YciXpV7iS04+~3yZ<`K>l@H@oB-q@AK}Fj{&~_1{B`RZ zrohDzD2vGvde1SS;e&}Ey#w8L1J&jxN*|X=o@|hh)w9eYBy1KoN?7jD8vHAcER0sf z5#9cyZDJSm$PT0h>l6O-dhQ$l^LqXp_>*An8|jl^{#%Yz-9#dfP-G#wbgxC?$Hk5> z#}Mw;QXsJvEq^VtQ<#7hT%(^}(WPqOP;$cx{mOfbP8^ooO{mO6enZ7gH*Q}7rVali zJmnS|=AOgbfR8J!0n^)56#kX~PpUz^CnO?kLH_rSTEwKSKO3;d$NdVIBF?DM`lR9# zH4NgZE^9t2*cIfu|KWJ1)O5jrO4}?;*&P1QH4o08=YJga%zu{s#wMl) zPL_@`2G#&m69-2+E7NK@Y8*8f;EDIk`zZJK?M-Kc(XVd!K1?7 zxgdHs6>7o>fr*eG5O24z)(iKI$sNgi^==6|TorBz-5(1E&SY(Se{9Gq+*Kai+RC^2 zv-NuFq7G^1Qk@wSf&w%!9O#a8Xc%De%EigVU_Grq+4!{|xYM%MA#a0D`XWs}REq>l>DuIvo>X~*<>FWwr$(hW!tvxF59-drr-0;OvHTW$D9+95t+X-GIHIKvG3e_U8{+o31!`U zT zU_E&fvU7ry!#!=QNom(J=n1xaHMGLp_p^w{_WlJ?)E!E;)B2&OZ~WW78YJpP1_8x{ z^GQ}Kl&TW)e7>qaGgJQm+&NEZ0I&W>*1CVPO8nmnh5s(=e}0xZoBr?hC2VhJW@-Lk z<#>srtTf3#sdF=@NtwDXGRiOg8vd06Tom$AzZD0_yfVoUUzR1gl2;|=&(0P7)AGOs z{R8-=s^d5#Xkn*b3iQ^h)ayFW%1%GUIsOc{!T2ou(x%m`3_3yQ`}n-vhYoC}N@ejv znAa?rIb>VvGfuY_Bb&dM(>yWk$VNbGS;kY?)|Ska6n_^DsmFA+RP~!cp8i0^NVv-@wXuA{4U9r*)iOMCnCxQoXD3W8M z6a(CL_x9aa%J#r$WDH}QLDQ%_)(6E?{`a7S2lj77SX>~WiGSaZ|7)-Cze)XHqSk16 z8mO$S@SpZ(PMbU+4-NwjaS>%XMraE|VM_!_{n5=JWtbQ@A)l7{Go0JGIkKvy zaG^zlUe%fu(XJM{A$qy9TC*{tRaGOc-R1M}J(~-V7D7CK{bstodCl{ly|n?nPnaX{ z2|<9btl)bkVVo|Zbc^swA2&_UOg(yn*SS1m;is5)zR@BamzCzy<*PnGds6n(DOo?y zyV*H693QwLczQNua~EHw$p4u+mFUe9h|p2v*qXx|h*^oaF2z>gs{h1W^UWxH~A%QrOP|%8<354 zW&`@gnJ$m|rdPu2ZzL7ISNrmB_TXRcL^Pv64v%F@f0g-ulIHqCO@AEkf1t2{cHI6> zk9_Jx@wl`Z7=$Zjl>VyVyi5GNQjmK;>PVTY*}~tT^7+TY33ZItojfdn^lZ~c`>j&y zqDKR!L-UDRSQ=#_xmXg`q0%4?XHK1q5vKu7vyK@Rwpk<6$c}D{;Le!&yikr-7aM{M zO*5eKM`KOL+0A#UyD8fW`!b^&?lfdItdh9ELVTsrga`MU13tN)Bk`ALvb0ble)NR$ zE^C`zW=~;#LurMd-ge>16MW4_abEjM8eeurHxc@6xm9e7W^O^Ah^qUrRy;AP{q?W9 zmIKw(kOS582@ZP`;^tMWDmBstvQu> z>^33Es@f{<4&WLO+Avu{=)^R-+&mKwrIukU+0g@yf2o~8PBN4;nF=WJ;q0s-Y~qh` z2;xH%D48*hRMHu^Ee0U%>xgk$vb?%U`6SCD3qcCAGdd1sNje9?6a*i}dRO5Lw z=|?cCU!kv(rtk;mB+#)J4fCvNCBtL_QhL_>b}Vy+CPa(XM7q)YlRRA?YdI%eBg%R1-6h zI21bUz8^1$0>ZG8;Q}VoQS`8_ppLL}b|7X#-f0(&S=Y;CCr#V-SQ8sp zG5%+R$qTkIHEqQlGUs-*J}<-#baWrC7HeS^?28~IMcwQApPGZ|F5wBe^oK&tQ;6|5PUbOB(wEk8Tk}E6kKgfbJ;c2a7#=5OUz{y?B z={Y>(s|X#olU*e|-f^Ii@51dU!!T0ag-CIRy;W>Rp@q>*3s@LK;4I~a*1}dTsX;5% zjkx&MZG0}?h@+v5pnC&t+N@O`chvK_i-{lx-EgIKlET(6h&vuoq%v4AxU*myn^cT2 zqML)ZM1h6c8Oa+PD`--!Zd$ht4daOdTJ)HA|^WUh4<;%IAvL&RmoA3d&?ZIC+g9(4KlF=L-L2 z0wzMm@})1c(qV=F3g^h^a`xKT1VLSPsCvn^N_m(tXB~fN8>tTA$Cm!6dEWCV zsTeJ9aO!xK`5^m-F?$3Wh@5^$9GC(oL6K27JYv}?jz8Ni%@VK&rWX#8kxA~A=m!I2 zvRt)YIsSCYDV&TAbf&^{ResZlR^iv$7m*JN(#A>AUdfL>ZB2`0(*#8H{USGkSxRBB zaWuUoK?K9~0y?iAa9AV%{Eou{;2t;qG9~Ag zXAp>V%{o;2*Tn`RQ0b@yqDHA2+Af8GvDp0$SR%&Cu+OMOhV^K!WK=~nbK>)sVegn% zQC2KU4^)(8E6GKAG;QKpems#;8*>o zX*wQ#Pnw5FoL9@N)DlD+^R*)#VEyPv0?PoR`!$O!iI)%Bhx6sW(VYQ5_sTBR2P}qViu+}E$RLNOZwd^Dl_ed%k?~2tEm7B=o58^dqkaV>N2xj?< zd{vHBWpaV_TeoSYvPw_INmaug;Pc%`nN9(Ye#N4ayhUM_e?_HCkf&RrQy#EFymF-! zE!zSHqA0ym-8?hV09C40nidR=)%Z*zU@H7wXr^3~Fe7KeXjsC9aw6Zy04Be}G@)6_ zrClRs{i)yx&pO7S5-PJ&s3p5XuA*U8E!~pMlYS|q*AG{Ek^mwc6(Pu@*{#)b8#djTvwwQI5vlY}1c?6qyM37oLW? z0GrELu?m?LMA6VSu0oB57Kfc-6=h}tPuUgv>npgkz*s9@KtZa9Ft2*n>;ne!j6s35 zi~@IooC+?^fEFgp0N%voqF_{3rpQUw@g{+h&#E%x%%hFbFE%QhM@c|k59czn*%CBA z%JQo~Lj6~WHuC1%=~~WB8$#&H-XVA>w9gxu*Hj5mCw|Ln$!exmj}S*S^*~?jg^seV z(y8RN50E;C<%yD6CG2u2D51?5IHa>xa8tjf45@n8xC#a+^96Ftx{5wJi(^G+OvP0+ zm-C;1JQHr4fKDAeXU4}o94W#hN#Qvabtq#1v`4LqI+H5yq$)i7HXkdu@9Yn+t{K-y z-#BhY94BQ78(pLc&vF*7fMXzUiKlQ|s#nYeAMEk@AL4@iT11Z1(9W(J%7f>qg1qRL zOQ{j2F}SSW`eR(on7Qm5xltuv#${7sh>oH#IZM)uU$}&uSP!04>)4TG)y?h;MKihg ze>#^pv&Hjrt3`;H4NYIS`C;(eWp1?_f2QEQg7XQmHU=l8$O%pX!(3d&eD6RAa7Z!1 zDV57S^=1bH=8{>s@nZ_JZ#q#BJV+Y0oC?mt%%8kmb6QI%QKS&OM5Up>=22Tly!tT$ zKPnt#>UT6^rbdbXP^ZG7OPG-G=}v7$-*>2ams2D?o~fhCEtAM6`;;o0hpC1?fOHUl zM_F{yd3H;aSVx2>ED}Kqc$!l#U`A`ZB2~d=N(u2>*UE3q3|O>y2K37YkvYInbEqc` zkOe1i{DjNsle4&dl+p}>bM${NyDBl+^@Fx5!-?CLy@kYFV%?#K-PIA9fSl7FU`ktk_= zFKBIj!jZVy>>AdUtcd~@I+6j9{&U3rPM+Ea6-e;nxIaGmXlaND0f4}Eq;#>N%Z3d; zSm|;Yoynjw~@$j3pvC89^PZsmmEEkWrg;fLX=$jvX(uCR)enN8S;w+Q=~?RJ=K+t% zk|4Ftl?n%G>^2}zh%|@m?>Emb4D@Yp#QP0fZ*3j^H1-~ezn}kIR{TM9iaMUG@0;Z< zdy&p|3W-{{+S>DKf&Eg9<^uYDCYB|zNhz>fu$xGV`~mgB z`wdLC#Qh}x`G(SvER>0X8LZsI?d@`lcT}v`GZe8*>kV1a6Fmj2{6yhp-`6wgp2X=< z=UuH0V))Cu?pgA?Ag)?>YTO^$f0?-C z45SJNyw&ki3%rBe$f!%Vgxz$QzS>rbC58~l0 zo97$TynZ<5)pBGgcH~)^*D+X@98==OE0~Jd-U+kbmfN(1+<10Lwky+cM=usrzyvpS z41yCqqXQoz4=_au?5ybDY?RnKtf4c<2$P5A@c8+rO#*lM|WjmIG zm+|Q9w&GcAe`e2N3>-5`@#MZ-sABr+yNmA%{mF9hQ9ws8`fB+^sqm`% z0qF}vmd5rooEaxL_|+C$-d89ufV3+MoM`N6%;3rj{y~{>;!4(zJuP93p-MH0Hlp$* zJXk~o_X{%gS+?VFsc~uvWHFf#7Fd_Bxlkw_wto!wb6|)ve=K2Qs3JkSJP4r(oF@tU zkN7r^+T$hWRxRSkH}p3o!1lLf79ebkd?=ga8=)PJU(7HYpvlL0ZQNKRf_oW~C-o0< z0DQX;u*T%eDonfk&FYH~n*!pylXZ9s>4}|s{|n}!f%8H& zv!Egg3kGUx5GE^^>&NEv3!1}hRZk;nn-%A)YDcoE7;+hRO?-?2uXu_lUuP=-G~0rQ zVVcuM=%gMRC@WxyXfCgHes0)suoT(GcTf#?Ri1(!Vv^?Lym$bTb`)5eDAbh0B$Tf| zzJ&Z3xM}XJNQzlJwLW^gb$xv3kH|n4kMic2pOJRmBf)P5w!O2g9#)~>P2pkS!%lHG zWt`j<5PMbILg2?|nXuW^rn$Q48>Vo6Rx}+3#<*exGcO($=`p}g6qM|-fyh?P(WpI0i$2 zh6gUIeS1Yn|LmmhRQi2e7tXS+kMs5{6uu)A`bEkvV$cK{n*fR3DQrGh#+0FU%tyH* zO`aTZ7xRE~G6i=EvWgUGPq6+JSgLTIqK$;gHasUHAVZr#wFBy^M)d`-yX*cty#Bjf zP8g*OqDlve;bf?^>Lr$kJx7*5=J5phkvd7Y`nur$V_d-AvQcx?0gRTn1MP{mULBjEG zH~6&FbH@(QU+1g0oBcW%>f+fw053}&D|Y!^@$9^`BA6_XC5}7joL#K`&V163U!pyq zJIT7AXCRrj$^K!>HV==!?|f^ZE`}{*r|ZHL>nGKngt|;jdV4GczoUJ?eO(&nhRs*p zEkx!|fgeGb)5!bWcV`4~2GQ6U+a%<9f*Dsqu+V?f_6`-{|1=f>%W2hO*p+5 z?@r)9G5vyWd)(z5{Mp0*n*zA&^F;9<#dzTB6=T{h{{=TUW}wg|*nlul1}kTa6)z@n zS&YV-Kh}SLOf=7tGwI3GDgV>53cfse+-!djHSfUA} za?g6}s+|#8Z%YdKAb76*sMg0sov>W}Qf?0z$YDmod|U8++t#4=cdnW$7@r;y>vG_@ zypdxa;N0%8sFqqT$a5=1IVRJGZVuIh(V3l8#8WbDi(iN?SLhEB7#l)N4N~9D9qF{U zS<4}rR5i7eEm8V%BRHPO@;cP{Q;TYP)g-c#bX0I&47Wuz%QIZ;7^3aSf9W^|_orxF z;rgY?(0*Gf_5K@GsLU9x+IMNEF0iajQ7cz;Da966WQ$v^gm#JK(wRC#we19$%Z!^z z_*Ax9XS3C%)XIX6!RcntieD01vk-vl=agBq5CYZ&ib(ter0=D4!{3n=LX`gAD^cw& z)NTl!o-iL;al@~^_K7Ku;4?~(?GKSYg$WbvE@wwg&|EQgQy~g`9f#*%ld%xKIK|ce zG+8?Q%7goG=}&_R&LhBt;7ydCQHPh1b8c(Vfm9dbC?-!<2QOCw zx9rT4YFcs0DvB%RVoR1&Z?Y)Kk~Ob5tPoyVFg z!S=yH@|^)*L0-XeXnl9HWeeh)!1zV#5r+5J2NzLdbz3NZpby&cGp+*H5YYp&Fuvf1 zO6RDcbuS#DPv(-61;hhzbL;P)X+`tq{!RUR2V9f0HEF3K7{^)k-c?ca8Y5mBb{`vQ zum$l1kTxa3@7t7LYh5kyt?lc=8)a`#)KrLBYbMRmL4$Z`3*G->pE?KEp9*^%3-vea zDO!XfmlX(S6F$LNg}YHY_l~G>_0(gz0TkoxH)c{mWIY6)ORersjP$mY`@*(Ge)Pr+ zRuxiNL-`F^dXTRwe-X$tE%=J_6WKFJZlPXr=!L0PwO)bg#acaKono{X-kt|Wzel{$ zMIEX-fr5~)#N~>(ORZNjdqo>in){jBbO)&O&0tO!(<%OR2Z8g)%9z$0MbH9teYX|` zSN0x7+)|786<=8dk#V}4U_Eg^NO2}rR|-x4Axj%|d^dW;ppHtX4pxNn$4&V)54>!QOv*pOs$3{RF(yJcl!{^JP?-S-KJ|8i@j zhA9dYzQ`7B_}O7;bVACq*d<2!Rpj9a6b=+-Eb=4(zKFOeMJfh~brMtZFh-HHEVfOa zTjp;%u`6~yL}?^aU%?k}X9-B(gRTpW5!2oPyqQ*s86*o-R@5A2?M2aM@kNhrxG6Xv zg;2%qMc$OFeB#{sJa5k@Uq8%rpRt*qW!}FIps!pJDqmIG2387Cb&30KTGRjqJi>hc9hDcK~Y{E2lmXXD6kbf7E7NUi|IRkuOx90? zz>e_tBGojDb_Jw<#1I_1t@Wk2ql{u6INliIuiUZpfr(q%WC@ zojRkge(!Wt6|=@5>dS0^cod0Xz6Y9LVMyD=*5kw=BcI zioU3fmFh961}!RoXX(QglF8nPk|<7}gyYCEXxoqo?-iBzn-^+=f<%TNCa7Ec_C)Lf zNx@v<{{`Lg!?CQqh6V!qjq+d93HDCr494~*rWS^-&I}GVrXK%JhEB#7|19iI4F72@ z{;!b)Qb89NCrcw&7t{Y~w@|b7&^E>D-6gkNymGm2Y$Fc0pzeBKl5PQ!nvYmD54V#mP?w>`n`@>fQsW?(;q@ z2w)kf1yfMVd&1X5XGk8t*}8u2;pEXG^v=hU*us3XS&b*(d|eN5rIKYI8)(C2OLjeb z^xIWH(Dk7|%Y)gjPWi5xc2jT@M>)7zcLhyei+6p&k7nEYg`&A_IUw_oVd>$+6;#iQ zL{2aD>gLmKehU>dSF$8c50jx8GxF$&ZpD+sCQxi##=6X=#voTeKMOA-@~(Nw=1azT zs~rm#K_l}E@)`_Djpe(G8&@wFs4|ot7o$P!`n^gLUzYS)8sGKO86}w5^t1$@aw#39 z2Ec4a#4K&M=G!}B>%z3FJPm(hI%LapBIdmkD&S#Q;soZB@L!tVAr8wDR`31DWBn&f z+IErj83FwjdNVDJrW~~e4shQ3J{bR%9hyIEG)xawCSJ>8>E7TFn((?vp~E;Xu1hOg z=%Y+|?OyBfJvIJ%hSbKriCT2&`61@Rwfq>_p)>CEK}9PKR$GtquqB*FhnghHS`u~8 zh@5!Q>dLtJZ6)USdI1rQ?tB%t1eqk>Cia!AZCkh+Rf=v?V9b18&Ny)i3AJn#jAa=J zyPH*AYRoQa+(mT4MAa+0o|Nh6;;KTHh(PW?hZM*T#;>mMrvfiyiE0AnP<`@M1K%TH0yuczQR zcLR!sODG%KZ6fm)}`yS*uGV6wJMm~%- zW`mC0JQ`uJz8pj8|-UDkl zp)#PIq#I;}JQM`_{+YY^v(we#ni|Nz7f<|myg$D_70+EwsR469O0j37Kc8&0PXZTU z-1q0LecbSLwGf8YPJWUWezT&U+{nWP;*M1dD<{#?&+d3E0)MHQ$N0^H2&?ys1tmyl zt;qIrUK65CM#I@=S_+Q-;da@IOlWKdWOSw|oaj`MI z&K@Pxl3I{9YoF7w{XII}G5#r(8aMke)?8_t6P;xz@^gKKhO}tA4)bXp`r4IH%wia= zI!*hu?xz`dIgeA4;*V+viL6hcMYaV1mG7vcKrp)6{{N`9cr-Bn(hhCid zUKJDYBOQs*vFX%caA-1dNG9{mbCrA%lnAEP?nCi z;Of7_e+~?3YJV~ z1j|=-Zs;A6SNy*W?*uoZm{UZIc)}!KIs}<$Lq#e4VUPFiaU?lym!l0LptVnS|DJT~ zvDe`MbFV3Gvx)qHda_hOli`O`pXlZuab1~Kng{Nd4}AC`=evZy<~ zDb6n-37)u@-7F;e{SfM6F;^aDF4;ti4JocRqciGbrRnG(h}^VyG(J3 zi!7T8v&MA?_XIzcg-OgqiyhfYCS02h?^0@&zyn&9L(s2h@J;Rjw|lf*PaI`O0QPn| zmSY5SR}5pva9NovKKcQv6Y*v+eSYi>r#|fyU(0@wT1S|Xx48j%&544nch+5G;`BC!-ydVqLD%022qJZ|)VWPkeT_Lwjq!jf3_n8GMapp%KfcI}rGEs&RH-Fwbr2 zZ;;jp0OUbZF>*@x^BBGh)osYdrsdo`Va#L^dQGJR{clk@gRh-5T+~tsEe#;DaHkyO@meAV{S5=F? zk~747p!O@Hidvy6h(mv7K#2{5M%5LG_L`pdx^smzSrE{KQE`}>#DO0#q^A{Z}>W++*eU}Bj^s(Wb8S6uCh9ZwF1se>0(i63SqlFEeuXT_AI zibAh^Y8U)P=aDCp|xg70HZ*K1J$ z+cBONlxS4~wQ^kx^);j1PW`1Qg3yl@6#9C^Zc4=X0Zl8Z|IxF`?Z@EfQi9NKuGm*;d&D6#?d(tR;#;MVEKpcOs=OpSUs!fXIm3O}x%AHLYnlR1e1Ri!6tN4CB7Y?O*Z8RTL*$*C2^tsygl-zs}tYRj=%K8kR7;1gg0e-wweyg zANmfx92)iCr(1a?`geK$VJsG~fq(%2UnUX%cMbW^yX#_UZ}&edNDXU)|8N^`wzsd$ zScnjjB?QJ15r@c`zyhrVXhl*eagb0epBD^SCg^RDhor^ zgi@oLSN1?_Hndt+SG6`bHa0$LSJU#G&E4Fft*gGqbGhAbJbh2MZntKPe>(grd@RsS z4QcyF8RN!E3GHB(HcFMW-q8^NkdD%rg679+_`P_e?he|R&+WP4frPy{qfj;n`|x@l z$>#3h4V)oeLzuDNgP75`;0>wyuk|&zk5`a9UFqSrv}~AzZhr5EST{r8JXcT$;zT_C z-hli1=|2u1?d-&6TsIJd&-fyZY zJ@_qGz#`UA8@h^uPNBmib-}*bgeB5s%84aSa@`s1D{aBrYd0xuWvP+YI2p(n76&V< zcG^rPsg^!L&!qSe%h+_WSeB$)7Edj`L+!VT-Jq1o3G^FwDIEpqbp<`MLIa0kX72h< zYN;=>bmN4|v;;li3aqay`mYR+;Aqg)c%R55@;n#qRP$!C7}ty*ZYziBYxA&#>DG9u z_D9l*mKUZQZQdE+I!!ff8=0+Iq%Ct+#?dt)exNz?T*Xlha794rjde9~U2c`3_6xSp z7F!oYw$_JurIB!R+jhfjP3gm6!#PSSm8G-W&`&4wGdToA(1ZpnFe`qET;XD0>hb;k zy;?pnfMRq)r=8vGg^BQ-P!9>}Da#GvJbT*#D1q4|(2pdO47^w4pV13;(zqa%?D!ub zs{i!qMt8My8ukOtrZ>w7R+hrCTK#(hoW?TXSHl)roYNu!;4(aYIM^ zjv8yTYTb}oMJ44L#2IfS>Hx?PU$gwf!x?YI#BqE8Y;{K#=Z^^Y1^#{u{xscnl|BCTxMNHvR6CKe&!PySL7N zS1Ry0fi7HVuGCqmxP9E*e5jxRGWTH#A_UP>k+*x7Q@-Os|UmlQb#t<(0g$A(wkeF~d zg6rv3mVE8xxB&mQZVb27x}8~UYhSSETKxxYbjOjbt0MBhoL{Xn~s)JsHWXHvS7U$2Y~nY}6!kgV&7d_G;4xK&mA z+RQ2Nf^4kxhN1$atTsI@n0-?1LD%`Lyp%~UC8B^rq*JobTnMR1J&0Xv(k2Ffx`?}= z5PZW?u-6?=! zBMagw_=`?<9x69drkY*!ZJO4>en_w6VWOzZ*iMpkdt*vs;-zG$_1ubK8@=odPj#Sk zPxE|6?9Om;?)xP+YpN8jY<*@{C-jo&JVejOnLUE-K#39EDfNgK!IjH$4+2${oTZnz zhfQ?|A()e>mht(~h~-MQA^%L#lCON)UMR-{-aW@AN;f+|`jP9#1H@1Is-7ij*Ki^E zt-_mL`78x>GtHVOV^98FiSlF$5{R%|a!NZeWwvJ?D-zY(_hRd%OVV#670 zj0iL=_BKLSjtE+goUKUFY6R}Pgxm6l%O@{C5If4o8DC7sD@`10LQ+RJU3K6GHVj{4 z7}GSh($4}PQJ#WRTva976a3YKL8i^4O4dz@Pwhau$N2z`*&H1*q9POx(w|Da!4c6o zdqNbF4Ow7Ih|$XW38BcR)Q3gEemyFr#vd}l%@`z59+4we7mT@nMKDb11z(s%jMd-3 z&G>=pE^mrv@4#m#{v0gJO2868#m)GVa&lcBDV7DHxOs9q)-D(mzxolbpme#*To1S$ zal|!+J0%V(Z?;xEVBE;$kl~Jj)<@kiw#+I|FxGYDDx-4Nvza~7*x>ORdHe6g`k|FS{y@` z9QsPgH@mMP4G3=+z5H2Sj=bSHW33yf2(#fjV{v^t8gdN+f~lpZxOF(SZa=e%@Q)4- z?l2Lkw?5wQs2Vt%aLhkld5hRlh)0F@dI=7~*?p_GFzSiPz}2`KY)6vR}n#mA&MBov26oZ#x?!Hz9C zQI{rQfJyQ#QiPG3Ml?_-^w#n9c76Of@gpP;oz{x2oG>LF8ID&au^@>ecyy(w-UvDC z{K++BuKgUO+I3#N-j}^-)}kpI_I`3`NzLBCqr;S3Iu0l-t;Z_d56d-+kD|+*WI>+& zya0F#b7RblNvJ*>apUGlr4`hDm*XV10ckb!;!I^xg@@9>9tMEg;$VU28@wo%ECw-U zyl9I~h~opt^2Ff+VG)=qMO*^K9%Tm@>`^4xsS@}A4@_GYu2#{c9mHgVTIwlM^K9Vf zx+=pReD#nfsvI7%-ChS_hs-(owUbEK6aWoXoyv2QIpVyF(G633oCQXrY>-8%px!*` zU-WF1LzpxdkrHNU5Oyt@u;`kuOdp0>i-;_dFfEaR$JcDN34e{zEF{n1*n$ZiNj zPrS;b4-n&(yap>Yh+@QS0gKWXBhoPH)W zl0BHN#%g83D@@)B#CF3fA8l(;SA8)f@soLNI5 zjEggo=J(^jlloER57InXc9Z81Ts~lU2=hfF961{$`AEv7GI*bUqNN{zi0HUpY<)DK z+0q-@4wJP@9A`RZR)J)3sw!lB)}d%}k@W_&kvAs*^O~ zx#wu|G$S8Y_}#l0WouezMK|NCOoLpFKTq~p<`KPuA=3M6GhK+9D*{hNjAjSy=62jl7qT|vbs2mBvB|nMYaP~G+j)A|Na_E~X#uX75 z)%r}6ZFBAFl(nVAyEi&rVVpcvyC6new0iD#72D$$-x8*LkQ+7IBa^>fz)Ez?vXL+a z{?aYLE#CF69gx;7%wFIKK?>1;H0?WN7czD>K5_&5%Eoaw6l{*9y*&{HuXZ|Y??!m` z$-Ng<*tZ^})Q25?(^5Rlmh_t*Mcv)cxUi-Pa0-Jw{-qOZJsuC8^2gdzHYxA&PBtBR z^WjyOy1wQUM6&I4u}JGUM#1wU3t;eA6Bm509SerKjkmR|7i_# zN;6Xu_(#z{Ap!zo`2VvZ`(GO|SRd5q+@HTJKQnghpn-68zxzQHlWg>$U?3EPp%5qN zGr$ll4-#aOMoieJZyxSe!k1T9FDz|58oA^3(j*hqxC*?1K>=%O?8L>e*F_ZyTZyi1aHeA;?eJb~1<86VXPGuk;@Qjm!=rsNIIP*hYxM)9`d0%^aY{FiZ4 zM(JDMY@oJF4=uBF*3|nLJZ`w}=Yw3C%n>QG?seB=m`VDCI;jPnc-D` zwqSz{Fr9k1^zy_e%$<^`aYa(QsIB&L8iI7Sf;r8~x|C}xGo{)>-nN-Nd1fQn6Z{nO zbt}<7hx8JNX-#HK?pEeZ21t{(w^t{Zn*ELCE|R^hOSSFo&3Z#gPgR$(u@K>6$J8HV zRyeFx0cC(MV`I*^NfJ#r68uiXI_TheNhSY+JrteXF%G z4=FuLIc-jhYpa{Pz16iQ0dhL*wANB@tE;oQJkmP#L5=$D*_A}|?U{{y^`#~QAr~u< zj>xjAySFw1@V2&VlbV3_?jOlz!y&1c?DJ{#B{^;gY6AA8H1k@rTq^J16@V3Ucr&mYZB%zEl`e^9Y06yf#r`E{w<)tEVcE;rCxg*HoF>R3?t)y^ ze9rmidXP4-_DbxASzf8xl~jVRdO;UCU@M-`|Ial@Uyh zbT!jw?3F@kz_Nn!=ie4m!F4f#tXdY!%*d-dxuqLLDJn9hp3!;qA-T#PZ;b^&qW)EN zd+PH>X(H37+AT)=8*TSKIJ+g(q@&?1>x9aZ8BH!8mgG9=hFv12afh#d9p?d8T@DCF z2%V%>9!lhWz!BE8EE5-EV&!`jq@0WhTwA_4p?o2NfDSMQ*IjaO!qdf&0YHqvwTQp z!^}_SZ9l$L7#cn%|0Bd9A%m=iwXuu&eBAM*sC4=CYVE zY03oXU)e7}yRqhivqZ=eOdS@TrA>lcwTwd*)w<(4HMF5DTZEY@#4SB; z%*LZ|XxT>GrVcMI`b1pp4I<{Pm4`YJDW$KJ#~ls^w*IIehFApWM**fL7G`s01v1p? zkLT*>(ZspGNqf@y9w<*{d6SN5xwYXo53r2espShJ+{jKuP1@FiUDIGfrUcXGbj}T> zToh28-B&S{*jh&^7DsctEQZlqSfkAlO66~LZpg?EREZ{3HF-!9D7eFW^&IZkmnHQ9 zP{|46Cb~13C)|L>MW@F4LIK^9l1ki;Rw4&MMLl!3h$P==aCDh&iDG7JWzDKN{Q{{M zHsyRf2)nut_KL~R;%<{z7+%WSc~KfYw1{2|w!jYX1d&N#BkM`vb+<|QsFhBOAxFG? z3~LSR?42bElz$l(4t;UlchG@ah3qGaIL_sbQfD=cT?jUv71$qu5)?S(+HTQjG zi%}8l(NUq-W6s2VeF+9aXy5@Dt?z~{ z6~@Ny?tMaX7xG*e$T}la&6oGknRK5b;aFSv!r^7pH_;18*C zgLV6~@D}d@Z*B^|&WsdDT^ppIPGirc#dWs`!nSnbJ!otSE&W>)UKKWrX7 zzaL^)%xHQ8&0P%lH@W;G($}%0UHSDR-Z!eFdQ;-;skZu*_^^<=T)P8qbI4t5wHMT_ zub1nk1XW3J*s(GN0pPyRsmgl(lWvergSvCSb2qYahE;K*vd^0fMsvaMr+eW(7A8kJURchi~1 zeu^lvC8oTdTMXYYo46;07uJYGqFqaw-_qeS)&k&`2^k#;IZ4?oToBbMwyjv_?l6LC zMTm(y^cN(9#tT-@EpS;q04SH7!*P8XPCuLuVk_3_M^4Alb`6tGT6X0yFJ-kbP-CqT zDSiFV1Wp^ROm|HA6$v>}K*q0Cfm?;ice6?=DR-|0!%V(C0o*c9U9o?*^HSicmGrDJ zU6OR@_d7c&Ffoy!}qr<^!xRQ9Y?I?&vBE;6$DP|;t_0wQ&Gzu1RHm}8lA%iqH$i%nLp@{ z`f5nD_R3}7;*W{J<^4=QK=4={8W-FOn&rlOVgYet-J?+fM_h0{IJ3bBZ-H*NCU(a( zGwQ2_{%Y-gU*Ad)Zvoh+f9?Z-CH6aQ#mXli%s?Hov_oRc@_^@)l_A&O68RrTaJpQ4 zb4Vob#yjos^*4#Xf)%DzCy3k9n!`$A;5k zcUpg9&FavZJ{FZXo=A>MPIYTK7qe&+w5mc{T{Y}njVyOVGui+a_u>`DK~VDI@aa2) z=$}d<8*XZw4Z7t>qlVPQt^4G{KI@i7wnEZm4?Cu7l*$t*uKgdJyx zTA3GEd4ordPCJ_2rMII6xLxFv+k*vM-yCkA^(Dea2~U`2qx?p$7sj)B^ghNVB=+*J zea$s=orS0!luL|vHLT(DHMZNJCu;9Xo@4d{Oygag3LH2FQ$N>O+LyTcHUtW=OQ1uU zj>9&|O5EOj$907$(`fyKy6U}{7bCFrp&n0U-Cc>iWc5#WRUonf3CPBnUAl#xGzV6H zW&c-~+r1U^rNMJqgSa{y!_GRw%tfu~`>0ASn%vGR&mV_Z_JX~74iv-<#|Sezzf+&I zmCWfFv%8`(FG-j!=(xs&9i+H#(YPpUQJH}8^8S$M{GvXH?ysiW0@_Qw>C7;2%=(>D z-P93bN0QH}3gq;cU#d#68KzENbPVhY5vkAStb2g*QZ*`p z$-aY|B6%OO?RN(0x<2>mm~$(YW(}>#vNd%LR5{?XnS9avmiGh+SNO~9n@ENHfTbSYCjH2sAR#N4z=uoziX!-*7Qs@Y8_r2E< z1#k#gs;Yv9p#X*u zXOu$FUlJEDM^lVXN~A_u3~0^pRpEfntbigx!yhy`FLOXA$|iZ3f+XbP?%Xlon6H7;I}6D_Ad9w~$K_g7 zcf70CWo@av8AhsTw11|xir&v!%x+~e8n&GMI}-dI2zUW4xMLx*-Xes4{nU2-T=`95 z*b$B@M(Lac(6Zz(&fTquxZ_RoaSk+s75ChbTe19-lk~ltt zPbVC#bT!SMtp5^O~OG&99ugj&2Wi& zmCxmIs{Klb-9-*T^|fI)y;AZDN03ewqMcoe#xoA7E5tngyv2mfc^ntIE*FFJFTJ9R ze(KfeRr?t#(t3#UwBoS}x2hO|xfh3b&{N3A&C{@3k3RBivQ6tn_2YsljA|DgMiP~4 z*8pLwhXqYa#i5z&)^d*PsuXj>0mUu*>!P6r#^~3hlhSMXTnjjl(LE{jxgtUgsaSQ= zF&*lJH{09}$jCcm>iA}Z#&`UWzXXos(KE@-y)oc3WHv6yoe_T3Mebu*h&W2GbfXe~ zNlr^GcR)lry}k9YWbT>*PV4&~!{v0hsxX}IMKH=$G}VuhBgKyo8TEEv6ORw27*jOm zKZsR>W$;K2iscBe1ybLcDGzy4i1@;V?|5~+%AJHMdkO102XBG-p0%I&?1u>S$ja9Y zHO$aBuH6%O_T?(B7(fnkSL}oq9^_mQ-8+eP94}+mmbnzRZvOZ=6+w$G5tvLn-HSix zwQeDJwctM+mE>%|gHZV*X!UIbiPu~pNdz+$m*kLxAWr)YenUY z@`lsgrBvHpKFsNnb%kHc7ju}JM638`_dIvT*w{CK0ZZHnU?-Fb{_U{2f^v0OhPzQf zI0ymU4Th))!gAK#ps#P1LL|DR!muq(jG_W!va zPL$)3?Wc$LN)7@M$dwa%X1pb+30To^;-?2q%Dbv!2rXYI%_unAHV`n_0e=uBpatrk zfz)jCc)r@=89$$XhHJ15wH_!%+QT0pAV9~o7(>{7Va^&YL{4o8MNghuF|=hRcxnDy zPwHp@cm%Lyn?Dm5V=!&9t1_mGnVh`_Ka4LR2c)yRgvwP&87YSd7pZ0xD3+?5lNry2 zf}2f-(~h+#&V_#`rT;da3@^~>xP=#Bo}wy#=q%NC$J#5`m3jU@gcSA3>ZX3Z zd8s}V^mOAG{!@-{k9)lHz6bj-HX=B}V7|gTovD{Df9(OqwZZT2JZtTI$&&U#_uof6 z5#r`i6W>o%`WwH={XacbD}8HylW+g#zo|~&_wWDv_rKvznF`t#|C^LuFYdDL)M)j( z>k{f@5s#`3dfOXVd=@(Eq#Hu|#y5&=P>IdEuOMFHQhLuA0ewA}LV>%{< z!OW+K;YXe`U;SFDL(STb8nH+f9o_fl0;%RZ>DNTVZdi`Z)L+@yofK*gMpy;0~c+&rp62idXSY+^b zD3cxuX1*9ZxH8pyc$-sXLtXV1Q=}C1Zdj}5uGbYKsZWNnsOLRr=%4?>fRbLZje%p8 zweZb@R{D$LT4S477xSqTZU8ujUKze(TiCkv7WiN~@`gt$0YqKVXyw;y<4aS|b;+bi zQ%b7Q&VW^-gc(I*s+cv`s2oo21&Iu5b54GN{dbiV=mbFSf2&0Jo2kzEf2opx%>?5w zE#~ErhqC9L#gl~F7ymM5aNn@0a;HjsTh@fm z^1xJwXua}X`tr(M-*3=UMS;du_x|BR?v6~nNK@@)iHBHY<)mtLDP*L?F`F(Une%TlQ4j3FY zzIuErOh&|gha2sZU3nz~ke&VN^w$4cBnueUSt?`|yZ|4sJG7|KXAUxUd!eJQsRl7|)>Mx0ceqUk-wzyE= zRqGW_!IoBm{RBtn1N!gMxpmX)`1>uJ%I~Bz{{K`uLjQ%W`$wJmF9lVqShyewqkFST zw~snYO6Caj*V>y2LPgpm)PVZV`Nb6l{;)?{Er>VNZ^vTAGQ9=f^6~e6!tQpb!9UK) z{*cGbUbUQKwIsp*h;bvkp5VUczV5i6`h0x8mYwzGc@gQy-wNNAVq;8EiH+Q6nHWIm zw`9v>FW<`u%Lu#2WY!AF2d}53HFw2JX4V=)f&Jc`2!bo<#O)7e*qG77#}niq%m|W3 z)DqK7_(sfnssH_9-w__o=|su{W8dG})qDOt4#1XxknMt(GXyqexQEOuQQB zF<43QFSnSbZ^?t=jB2By2$8i2@Y@9SudaFOv>Zov2+I=gBg35M?WW!N>_oU5)tBvv zo#+Hd16BH6C?yE~2S#h%zb`k&vQsi};SASVF&~$Y?~xNQT_ePPdX+9_<8` z>-W#*QQSLjniIcL1*sa-f*6t-0poZYcRLfgy$q^UAyyq`q-nw{@=nw2sv0Wgov(xv zKvm_JmYlS};;uijUbRMDuH@#2`EznFxT>$k741xXrHn%jty3bYlc`cAU}2|?7k+Y0 zT(b(6?^Q*CQkS(9?-O}e>>=S~8_4q)2u*u&>y3_Yua8S|mF+R%WbZ?}bNiQpYcQP( zRjMWIhS<9*4JW@y3@@uK*dbq^tb}`UZh^r$T<|UMZ}}ctncT4n`*O5))AX3c$OO`q zLo}bQP}go5^c$rL%d1hV5o%LlDbJR~dE->6zHC~3`_#y=(;{f*F^qJaK?SMKrL}L$ zxNuw0A03!d#f`fTkK_FW2?8lA90Pwp1~0Pn61|SSjUUT)LH;cREOIlPtA<66&fL}0 zNZCv>(cql`b5Tok&c3&)JOY@JHB1D1-ZZ>CE4az_H&CuXWWx~&cknLb&-v zetZZYu$klRX?$I9oh#P>*o9+owK}#lMOXh1^2_x1+b8fBxDdQT9I216sq9&nJ9KmK z=Md?yKUo(@rpcnXd2i91e6KLe0HVF#uAc|c5%Vq?Tlpu$43>id(*(j3-cuXVKL^O% z<0tXA`uGhh$+iXAr7FPaBKc4YY<1lIRb|sV7#}hV*(7o64-!3St8Y;{qAKQC zkLVu6by^n?bx&eNPqYQL9SuINNQk@qvsUoAw)c9(4EBj0OrE(f-*HC=dT^bOp6tu` z+D;)^wZCV0h;(%NOlX!meM#SC6Z=%f7~VEipz3D-4b$O*v;Gv!?2w{tC4o`sZW!I0 zf+QFTrb{Z1TIN;3ojy?fiSW}`7SuO!&d_f_k@#y2QAc~LDJym^MAL)5FF=?K& z5$t41MXuRuX8v=`Zn zJn>7cLoLeZ8Z1kNjkIp62ucs74~2v;gb{X9qH6^Op)cxCv^hKAFYL;#uBWY{aJ*cBy|PO-7_1hNv1HrT8&(A0*?R_PZCO3i2* z2#X{+QkMCX^i_}1^6S`9>2iJ?jago4IdgBa=w=FI$=f3uPwoxb5zYOi8DT;Z8vRFO zK+(pWR6a*)v0Y4^qB&8dLDvI}^Bn|Dyz6iK#7`+WSU52rLT!!CU~epkU{h@TUwQ<= z+^2MUDRs3?P>kq6d#PnZCs@KwisMlZImM3PA4h_;DE@(JLzXrtBQt`7?L*uDkboas z@uk^!-;M<~B!TaYDmtbA7m)S)`@aGD-_BWSBS%x4e+B(iDy`dN3B&U+X_&F4 zKazx94gd*2kj~QRtm+Bu4d_7+%g2!T`;}jCM=mMO6&+|B(GA_8ao>SdtRzux{5f^w-bGC&L`rQKEhnN87Ju<8(g3_w)oS;{^?W9N4 zX`pGVCB7K4b_yrx6fuY;xbJz~FbyO~9Jh&Y-n&LH%{y|h!@X`cyisasQ?PrBIdDE{mN^!#?_L|B5pD}3cc z{+!Wz-(RPJS|T}#*I7bDw4B?J=8esM7h6us!-4FeGpm-;Plj5xLm4@L&ts;K6J26= z+zvC~=?p)x{5g6l->pH6N@KZG8%UW&uO(Y!ci?Pgzj{Urmz+2ES44EOkMs;i@>+_7 zpqa{|oj6F`kr`d(>mKHl##3RS4efgTw~)OJOWvBMols?$Cu5;GphQ}PTvq4C@hUr6 zwNpFa3o3Q&P*nRS!V@9f+BGO|)}1!fl%so`{;kPE_CYb9o4F7VShcY7unbC>Q}(## zclS2QpRPWOkv&FoC^PQa;$X+jhg5>iKO!D&o()rRhZw8uqoIA0Hv+6qFqf*PjoTxY zy#wfT2VEk6FxGsxgNC5#TO%2C`q=6AI|qhO6+yR#!5yPUY;o{n4O>E^!F^TYdU}+O z;0&D=R+St?$Im7+9hXdTNlHt}F#>m=5mm~g@oeoLElriR_!Ltq;#{DITWV4lC5P#K zd>^6ET*Bz|af~9n4$bZCFVO*mquLs}`dV&eQDHWHn+4u~Z15-X6d7b~1DEamZFW(= zP)R;)SxVA2Sjxye(|Amu=k;?z^nv1C90(!sK-hzcqphOYftBXEfeMt3W35_`*o+sG}rOQ@!#EQ zn=WB&*xAegAQ8%WoL` zo|ErF)?z~Pdb`4JB~ZrlI>30_?wB@^({kOLXlWJEB`hGjPvJ7jPERRKWW2(%wP}%Y z8md6Lee?1GX-_-ce4jM>+d7;GUPl_KEwO2iDI>_~xGW7cXr(rF5!Yi-X_cPHxw$~! zCQ~?{U^8#H@)+cVe;H=6l4#Yh^R(=_xx_`&OrTvZLw;P5beM(4uFQ)$vEk%95Jpxl zSFd58-`-7hX$2_$9{(*z9y#?lxnA0krqH_yk*DJU;0Dr?f1Rmacl|}pCpuL1$kAAuz)Y#-eJ4M&8UEXjHmbtC&^U7zNNDG zmxGTv$bTre1Ynh=c*o>rI$3iD9?>6kJo0CuNy*z94G`hyJ-`%Y%wmMzNhhVOn!8-K zY1Owt1Au;_rIrUFwUq4=a9898*uf6d)Bb=(a+T{RhGSx{GLY; z#~vZ4g|2Xroh|PkaN?Z>4>|4tiQI{CEG0*v*XGZ8AAyIUJ2)CIg1Z$1mfB`A-HO;jv(vtgyLE z5Q~pD-lS~&(dRtpH6Kl2b|NOJ6S%k?+iwYsIE4~A6Fb^Gb{yJIrn(mr1H4>990dePLJUQb zlAY_koK0w*Nn!3&zY-UjA+)nG7}~obaO4bF8O0zhuDV;jlXK)iU9G z$1h{~QI_J`tZ<6zkxjx&CfKCx#?7<02aV`O0lEIBg0UOBS2fS|m+s=O1=uHR7$|#r z|F-bW^Xoe}PS*0NPs9%BpsW1zt2@ZH+#ef}n>ZQoa;WX0aj?(P9zLv>Wb&k4E_vpC zl*RXUdFEY|#TVVg*DT!2H;Iqmr9Sh!+bDm7m0#dGGy?H<`J7&AeZR_xpL|4bk=~=B z-WPhl&aS>x1G9G*$=7ZiHs1x1*&xM2g@|+LP&h%%en3*7M1>#><_NVUDv1zd#!_ZU zPJ~G1?kV8JmLjAYk35h+l^SKmV=6ETmZnN9o*8E^t`?&>CEXcQv51zYC^#gh6)$)e zqTc+en~5oJsa?wx-z)1QEUa20Fc@J$P`4au45CJuxM*U$Jk8yW$eiRnUHHYtmU4xZ zf>WB1X(p?&T9J83K+)*HE(+8oC0V5S^Q}T^OdQtI?$N|-oD^OaTt5?A`%lL4Tv@MCgaK+N`|7aoR2#EwfE=2_{@M5k+zbT zNY#kr>{RmJjVaG7ds*SxT~BKlT7agY7M9L&LB@tVzp(a)jzD8OSlZfY!9~@(Ty^GY zlY9KZf@2YqihXsW-NU8{n1lZ>CtYXZHi!9>KbcgmmR8yy)wWNjO)%!#n{<%{!PNvy zBJJB_WDbB@#ENrUSf+z6@nF5DlogTh@tFPTguHB17!xMTN0i3#>-fB}R?4Z$qL3L~ zbmOF|cf~STIw95*0$1#`d~-G}3iGD{ z=zAtxX$`Hjy>rm%Inc3#OkJTrc6iX9Wg`per75s1P5in(tcAvnP`Wmjiid+toACDH zc6t=?MPB!$5NBe2hSCy}js}}f8%#4#rqrCGR#Q{fV~#@fcBb_?fCC{I(*qZpG?N<1 zZ0P_RG*yz_AOok08%y^b!YPe7wXpN=r+1^-P895e1YxGE{PZ99JH)EnXNopb#}^eU zwh_zgYdyWeq1AFCWgT?$jEk%H8(Yr!e8Tkk)PT)nR7j0!F=8vKMiVs_@uK=P)c0~4 zU#IVVXz`Cp!)MreFUJ%=rqrAG04+xs&S`CKRT--AV3fl@oMHusf}96XRV)Jsb{r)35j(QHHI0M)-zGhtLm>C z3MK5*do&COoQhSdiz@pJMc)`7Yuld-2`u(MwQ*hQN((nux1%<&q|FA+6qnA-GozWN zUeo4F59Ft+g1<8xx-*$SRa5GsC$`g&4O@hBLL6WS$h=J2xiEY6-51-&*Ra zwlUcbQ8QQzCKF)m_80*L+;1TF;kW0RgI8F5JjL9qW5o+;mz96|f^9IXW@DB1=>+XktCbVhtNl6Irb>!WW4waaY=xpv>Gr`J6eZmk zP=-vxzah@ulOrx{2uUDnTbx1Z2e=-&PB|qYQRR z>z0^GyWWHrRz>HaT7$y9v-O`91GfV?iM5E-_v-E^Ic+%}$(e^Z>W=cWg?5i_9m`R0 zCUcOa$(v}?M@SNn$MKvF%w2^RvRdslL-=nnE-bpi6-v4)Z#A`w0H`bG!&!;rC7GNZpCOX?Zg<y*)~QS#BiVcLo? zKV3n$(R$8xkRO*G7#vTgL&JV`YRE)ewXkQEK6_f~{0n5&@!Y;y6aS6SP=us9W;;;) zAoZvaj%Ea*CR2Bxg*xgC_-6OGtha_DNG!cTI2jQ}Z5Q0RW0C1Bbu4uxjXPpA)M-D( zW;9J+0X&2EgYnrW*7}p$i!wzINsWt<_A*Cwk!_$RB!EOjKa(tYaBI5|meNHQxv!FC3FI@-ho zBu=qAlKozP0$~x4aeYK>A6wst;kj*2#k}FPOwuGCTsl*ws#NeS%)W)q$#&PWRYqzu zo^qdOr9O(=kXDpu@bZK-=j2ZVtmTax$SbtsLv!^TN8i9So!w4PoL0W z-lweK2lNcs*bP0@+^)ai@Pc-SH^00!-IO}y1`W$U-XiL)7;Pyuu`6l3|JXXC+mbx} zkzJ38St=t405S$rd^dSaac5D2SrLiQPVuu|Fo+K49@o4iqADa+2wYiv^RT>sF0oEw z3o9)<>;Nu`)K|^-+t(iGN?&#PSy{URMR)Wv8(-r_hH6RF(h1C4}FXZH`o-7z~36(1P((v zG1fzO)Gf;WgE5T2J$gJbHFQspHJzhki>)|ipdveYAwR(}+`1A~RP42+WyFF)e~n&s z2>7(4R{B(@){~zK zpTO*6Nc}0oZKJYBofOhpnr9A6lBed2M9EikgDPilrc~>3@(hA%`9$Zruv3Z7=>=5n z>hqj|`Ly+ARw=}7ELsCAbYg*;%ut?~^Zra~2dGIKWbP=ol(L{h^9DW6Ysl;$Ey)3> zUBQ|`*k_k8twRD)$VCcZiO{le@7L22j$f=_cX>ie25-HKuE1;1;qr0u_?d9^=c4qG zc*n#(p$l%3CmQ2l0PiT>*HG-DfX)E28>p#0Wlu!D!T1-9sZmEy4TG16iD5VOh-q=2 ztk}mFV7{C#a*rEoKJ_j_3hrU&k8)2#i071H_V%`1gdX(nxX z#(8)X+q5q`20Ymv#OLhjNB4dQcFD>_vqaX(+Z^V>QaYXiW{sK^wca?xK)OW}>Wm$B z{l`iE0HKlDiBoI*dep9YB{HZbUld1J4W|+oly?CAWUoeBd%a}p{44H|DMc6N*iU!x z-L&yM4pi=Fv54MPr#a17#hhY~_qM<=L-j~!{vR&w*D7EgHsE@p zVSy~SE83kbLMxOR%>pFQ2NbjRKcA$NvA%O)<JPb$B+3Xc$P>aVC!x zbYpBAE_7>M1JFn>1c%-ODX$D=H%Qcm)|H0VR(+tB$B!=QN_xowHM)6XA)y4Nq(>^; zx?IWq<2Ir_HUq*F@w;FXg3;CVn z9NHVivZ;^J9--X)D-ysDINjt_#yt+f+=Mg^11b_ljXE=u(hn)j;-|+&vH<0t(oLiH zb(zJhlyvdlfg#)RIMzWMqwL#Jr7uidvIHEx#yj~h4o8pqDbsCttVdsjo-kx;x&mo% zgX#VWN8K$6O%y=Muju81pp*yguE=;MzYH58;U{jv;^Eb9ow#N;hI3krl&mD%8$T7BJda7qZIzh zkB(*My;E}la7%RGpC!Kv7_87p`1k)f-sS^Kvy{I7xpBJf4jLwE+$KZsNp z3dkH~eLYi$PW8ZMnw;SO{Kwgon3$8p{vc*i9GN<=j z9`zpgh0aj%4pUy!9$V4JUQ-^|U60wSQ+?s(H#$G4?4n_w!Q_J9BwAiOV4lM(bc5(d zZiHiT;&vq&x$*mxja=n|f(>87PP`gH;Pw&taA9+RpUqye1(m zGIeGA`#3>jt|$d*he! zSrv3`_Rp+pyYW2D|m_@w)^AAwg*nZU+erR`;Lf5f%E z#N5DUWuYV|4aKxn5SMDnoVtl9eIP}*<15+N<nTjyrtDBD1q zRc0pfbXeEaqLNF@@{~hQR$Wh!>_nC5OsY_;{n&bC%~ZK_TA~UuV1Mf9WuU6K%zK3$c%FydCf4-vTE99?7(bgG9*NozUCGGlFc@m)p*Lu{;M4leE3owyu4_=!TBe! zBzIcP4HeX?KGC474 zN&qz0OSfj0XzIZ*E+;F0B01CS@}p2OG>p`ONpYG-%sXM^FK+f(a7^r?R3|8%3DYi0 z^>g<}vuY)kSF=RD0%M!1;^a+ET)%@AcVWRS9W|CG5x?O1?)HZ{r}lyE#_sI}yX2q< zC_s78b9rt{2!tzH+vZC*MVQSBsLL=ilN`hk{i2Xx(M2@7TB_)gkD@Wshx*cALi;Y7 zYWJ$i2hN5yIlaTOW6!ECiO`8B znKO_uw(ubXG|X$Gey)f|WOm+)jF}Nn6-t}ODz#612a5$cW2`O=QQ3^gJ7VkcE#Lm~ z&fV9x>&W>%2^=Z72&SpihwONSicD?3elGW@fRl}I^@(`wh@G%l-Qyzmvd<LdftXoWsCgob(gU7QIbK4%^DMD%89dyC;50ure=+U<-1lyA*6Dg$})KF zn}CWqU;R)_db*&TtI11Ty{gy=yV6Jvbv!wv89NB(H=RC$iYseCz(;=eBVmuRqA$|( zYa8S*x7y^f`|>^JXKk*!#S^oI@pPSW6ODz=^~B`V#@q}&IqHc2AfZgoxvBj=NHdGzSk04 zmVQzKYm_im#AS!x1bcv^a)hJ8`OAo;#EoWoy{LDDkD<77z;vA%UA)#Zg0rY!EZx+G zYkHFdR-~!(7JZX}L_~rFH1imR0&VyFaDs8+mW13$dkqic6L|MI6mgXT^R!#JRM;x{zkRmRHVArY*j*GP3EB3waTU<#l5<3iP)u<9 zhgIgMC^L8j3~)!@AxxCEEa)WL@%Xh8wMaqO0WnSKZ7qeB$%9OX7QyeU+nXZaNB6KH zZ%L%u46{3HiG%&5W9-vU+BKr?$8esgzX+_pf9mc{nTjt&(_&e<8t4x9;gvYLrRyyR z41WPJAY{PFMEUd%M}FPi-kv+Z3!fFt>?>EM&cm3rH?Zv`o|2#kUJ#PqpVAzL1HBjB z+;ioCT{CsUrEJ-xZe6Et;g#N-JSBGDNW3RLe5HqzgJ&{x*@DtVCzQt2h<0IJ1}OhD z67ZjQ?n`b*)Onc|A5(s;O5jpN^Tg!I!(UYf6}1)i`RH3!dssn0hRZ7~^U;5p8Pod` zxR=`$n7#J7ps#B7(mA~Q3;9~GO+|&eKK0YjImCj?uQyy4O2)`fF*SUwl9>DkZtp>s zy02So+h^Zh>)Wv`SI*rc{&yxPY_{qsM{sh`Svimv<)C>D*f7!e=NS}C$sl`fnVp32 zooY@d`SzeO(E#5izDD@R2z&Jr_18G4T|5PwkuG`q4B7&$;!_~c-~MGa9H<*;WlwFS z=}gEs|d`h)J; z5qw!TQp1@;2UTM_Dw85d3WP+D*sngZkP?_&geKAYtyt-4+^nh&C<%iscyI+fUtkJR z_?IMN;1F~CevWWUqi?n(x5>2*ATPCW^bKV7W8J~@AE~QUhh1I3Q#SBf z%aB%zvK;KX0Sa8tBeLXVF9r9U8V2CHV>?vVDWo%Z#g~l8dFnmsB)S9MkA!0=^-2}N zoc@DnEJ6z$s>qT>uBF%$q6`;Whrd*j$1}*Mh@^_M6Amdn&3}wvE=~X~tmx4+cR7HI zgPf<2n)emg81xu~+JH1J1?v!;7^U>)Y#YwlFq|}FJaDBHZw)Fu;#$jf4?#Who-Kd} zJg}K6clTGG!38|X;z5<}u_dm2ZTS4dMo~`$Dyr~(@!ALWAE0ah-Lz_$*)sk!EIm`% zLKR6Bc@qs7DVU#Gsl=+Z*90P<6utsfGO;+C;YG}@^kYWf9;b+E!f-QHZH@21r2BVr zRpItqzSbri5t`up3_Ak{-&fCs5ePD%18bx|F8YD$pR4){;B z`V<7l`erWgByyR?_nLJ-z7%h~OZo~loI`SFKlojL= zYEc#n`U8;M3TBt4g0ePEClPy@gVslBRnRpXaHdgbc<2d^*gLD}#C27c@k!+^ z=NlzTF1ti+r^UJa9EN)f*Ge26cy=AzPuuJ^XZTeMer;M)U}J2SM6yOY+lLPaAi*n% z>eL&t8;8A}m!YAvDl#l__`nIwcP`TokC@-BT-`K9(<{NJu*CMo{CgD1S_Qy-5SyhMZdwS)YbaxdTvDB5mT<#de_MukrR?P z=_BGgiVM<5I;=?)s$QwS0v_&U2@`D^Gi`!&8s_B~qtuJsD%I2m(|nzvm+b`gj=n5R zc8UTuZK*dz2K&H4^6!%36g^kl zh0l$KQjGTeRpImJROr*Z#B32H3O>H8`gR(rTGK17_&U)tk;_bLM_||CtO4w2t(1yk zMgi;%YBK}^!<8lM{!3W5^y?yYE*;cz_35NN+QwVh8~n7{!w#`(JeMsPM#dmpLj^PB z_8!+2rd|bX&4^Uyx^BjX=yWgy=#o?eyvSSyt6x*sFol8P!@^yJnn8dL-n4n^mevv8 z1IIMI;~PmtaO=eaZ&XLthX3E3mS7;T%HXw?VZB13{S(|E32t7Mwf@l9$MfUoOx{!xd3J$jqgeEsPRgKrE&j-CB-M@M;`tO+>L0cOLHv<4OHDk z28YWOkH_(p=hy8a)>un$yK+m*-ky2XGPahBUH_moIMy##jEc{4@8sU|&VA91=+?0J z9@El1Q5dRBp~4_4rX4#{vA4a+@nx7q6A(D`i(v)v`e8ZiM(~Dp@gZW3b8(W_RY&3n z0=z-OXBh!pxRxZ2Y;YQ;Sc-mYy4hGfg`)tIQois(2B76#Aza8ytf~*eDy~t-BH^?# zAsh%M@gXIxMi1<;)Lgl<9n^jWVwp4IWs&lar;4A-{>1aSuC(`1wAn@-nI?-hVJwvL zBoYg@ST5*GJ}&u}C!HDcY$6~Fk(pndBi(n5M1bz{y3(1AklU`@>}W>8Lz^!a8=o$A zD@6bFFkQ4&(~s56rytL|Ggv@8>7+?=p#6-sh+fhQsIGx8W5CU3H611a=g4jfwt8;o zOe;yMuK{<%0IC^-ckt>3BggTY#Jk=X3D8;aa zIDN6ydHKPcu>fpeMfv1dYl({u#-m!**z=c@s)}K5v*|L0QE@P3Ce^y= zx#%sd4a{(xE>wv^VWREVHrQJhrxWz>0&G=Imq$Nei?WF`&Re9I?> zA(~pOeB(6O2yb^>U7`5eTLALc0MXbhT7Nk^(;Yd}0;veq7u=~&d&C<@ej#KWhBak2 zY{y^saZ?Ok*EE%ez>G?~@AN z!nc$iDtGRsU#Oc|Z@)ZMYg?v+_TFZG4#MqCx`)^ZO_t6w?$MC%+Y1w@J{O^Lv4f(M1|29i3A(ypPJEvZ^@y`xeYsUg*CYtou) z)=uYu&4#ux1v9IPml0wK;nEc6^+wvpu3LGlN-xvqYv;`~@9j<((&XJDzJup|u4Are z&+Fm8qaeO^XbKyD4(LmdR3YT?X*oPfDjp;HxPVA(=D zlOW5#?P?TkcQzYUb_C$hO0o&1|L&EOkZgL4Yv?jGFpY7UQhK2LT$2fQtmPWp;EwgC zu{T?u`C$c^eJMOQ_znqCx5&eCjI9D{q{GZ5GB(FXIkSxHELLsr5ZufZOItV1Xr9uZ zMfaj+ScoJQIENr33Fk~}x>}i8n8mc-#FyL12q~U3=k8RGgf&BUU4VGe&{$@%f^xYw zHETB&6*ZBh%4F-Ll1t*zT}HKDm(Ewb6)|H+T3`i%xi=U#uk}N{_J@XGu2+!eN2CW&Ir=b@z{8NmdF4XLKa~rX z&gem(rwP-yZ918OMQ*KF44`++mhR<1_JBCBS?zA&DZdv`D4y6$t8kE_+PK}Hd4iCs( z;>9@;+DsKqlVe^NN)KNb98N(KE39=@p@v#eqev4{in%vd()6Ly*L}~Ts^Wj6i0>?Uuy|NYid{#_4#}G zyby(5hj2#Wms=9y3HV})6~9TSCPul`s$gHRy59lF^0bu5LN5S1e`%Oc$ZWY9SmfF` zq=#U4JheB8h0fs?U%J6Fj zKi-~(dvqFc-d_VCep zZ<}HiiK3TGFWM>r?8E`;M#+u}7}3RCHG`O5wx8s0VWkatbBM}akfW{K9esqn*CrL< zO;i(xQ5Nf3Aq2_6)i8EZYQ+J2u;Vb4uov`el`!QncG-#|tudQFz~QpOUl&LzoW8=# ziKPv!dP-MAh6ZwyMWtCP85+8^R0z7C7$nwG;m?I{t;)Y13nu!Zu8f^wxEC4~HS;{T zpE%lAPS8cr_BKTluW1|FxjOyaanEcR?PAm0?CHV}f3h_=5@xLAlcX;uu#)t<532+v zms4A5$itti#!H*+QvjUZo9PvHAni3{ph8`%83IrLrUGD_}*GB1C4c zZCH-C|Hi>4?pE06Bw;%=<{>F6YLOOo5oXDIvh^v>NAAW{Vf={kPnI#v*O}T}7D@c; z1_=7_aFQTt4c&`j+>-UiU(!iEYSMM63oYVVUv9$qMeH{vrV*KnoVE6JQOxLlT&h!< zElCvW+nd|4l!0aNSQ?yFc6Z?+TC5T#(CLD8?c!89<>8L!@i@-OF*w(<8Rf=2p$p*~ zPVXP&eKyD3AaPat+BT@woJQrO=Cx^Em7H?C;QiEY@y{PAax-+qUhT*j2G@=ft*c+qP|^)BWxn-S_tBac_^Y&;9}X%r)0s-}+!IeTn;b zl-B{a7X9%l5#fZ>5;g&K7G{txjjVJC%YmVY2aXxkFxj+z#!&d?Y!W)lzK4SWhfPGr z6;;?3o`);SzU|BOf*^5=*uH0U&tG*2dT=^Km0VOO7ri60^cvz}Ms}TcS9&eD(Xnuh zd5k%urmZyPCXD)p5Ooss+B5N#E|}v71$GzDGgcZ z{go)$IZg&BDwhRLH$XzGC*@^d%Dzli%TFDRij^n^jns#3(b0aF+^UTP{;J(?s8kO~ zQT_J36sKO4jAm*VR4yZ&*>g#p8Jy2D?|x9v0vPG@@{`Ma3Mi<8eRv-id%qU2n)x+o zF}i2I482$k0E1OW516kpC;(;}?Bp&`j22As?O*zuwvhD+y%Kmzle zjg{zF_wT9M;grKJqsd8mF0EFl4k0T88!PRt5NG-h2y$pu{z`lE*zHaheVHmJoHxlN zGl?v5bT^DaGl5@J#6c6PU1lgXs*OZsn(yT7#8$)NUc>U93PyU~%%mPMK2m+$3ybM1c>u&$5!#bDNEy52tfwF@u^_y(;SlO<^q*SgJSN?k+=kFKi%K!`4gy{R z;mj0~nDPRGPn%QutO!xvy8ELcUMY0l4hdU@o;GIbo+6VT&v})62CM{c!_t|>51@qc zGsSy~(#t3l#eFixdf=+8yRoV1)is|ogyoHUM&7WpgloQGs_Mef_YLd$*VwK6gj&O^PV2daoeAA=~@YX{ekbVJ|c ze$T2{x6{#icHlwW8{1iS-!i*2=aNa_!)nv!SD2|%UMh0&UBG4D^?<9`TlpPgRM$Dz zw?e|rwslmvQU^@jF+fC$7U9}*0IF6bnnSWq&lfx1o@8MG=5d;6LAz0I zvIJHAf;NbR8$~s;O2KmM1~K?OBHq7{(!-GE5V^+?`hxb=u$XlOrfu(wm?KA%EXFMQlveMLG(8!M=we-ak!LTxm8JU&$%I_gUo#IzyIkbV9EhtE3`x#5aQA-FP|nL6=DId?hTi#Br-|Fv!nuVT zZB|rE2}yyalu_!xp(GLS+{MoVs$mOOztMZ%s4ER;WsC3xWqabn-GGCsoS$T)bjOrjQYqHiWCz%*1cLMxz~@=+&;HI8;?Z5qolC;)WfQ|25yUzlmA+8 zrTg5vY0>HHDYO>ysBQFsLic0otJBm`(ay1$>wFzhPt5eJ*B> zO89JOO2mD>lS1t)I2cNol(ec87H$b;YU(;EXP-APCY3=}cf})-Z$2b9U$7Xq$|t31 zY3-Lo(&p75sV*z4QuDxJM)hi1Uxs&m#NMuXZLjbfZ9<>ei)7gj$Sb-jtb%xSuA$NG z72KslH-cq>a;`q&(pb6I#DK{U6@C1vg@o2RlA1JaY7f)WC1Axg%3vTDqPX&#Dz7v; zO5qHufi!V8HB)UyN-YV%$DT7tK9^y^{BjaXGu%oHSWQMke-q&cLBcuy!+{@1$9@>7 zACJsUye@?5L>yy3&)aWmr0R)UoKw-f1lw+w3pB!Jl$=d%toq9dfl9sB&+X&DyUGgs zNc{#e*aJ$X?i#HBW3**&vtFf-zau;gFX7TDJ0o7Ys>ZLEUxHKKm{4I*$>Z+C=4h4j ze}dR1jiz^}&y+4Qr4^+|`5hSL@)za9EpxRaY4=K97jLMGJ3`GmvD7)6N#f2W4++i) zFD8a3F_Y@|E_4|~x=_sJsa?1RGY`xk7&}fQvb%QyvE`1W_dn99-^DU7_;sn`+%QPZ zzqfTz3kZeR=IeuXUZv&zS^xDCD~FrIJgjVYPHrpMRxlIL8&9ITg>26jK{!{&1SJXx zFNHw20Ucvd7<@<^Y?!`h76@U_rS=Chl|*FM@3QfSr{ii|AV|VapKR-tPiYUm2jL!~ zK;X9dT<1mOZ4P9*7;4gelGy^IWKKg=8m2pyfHf{ZKv8TiORe<(q)7PO!xmic*69H0 zGG484C)z#6MZUS+#SBBC%I7QhTUbg{s`dQdcN@?$m?QGAi;=2~{$ye_d9DP+WvB=ad>t`Of#L_c1W~qTTuFT7MaL8iSv}QAPb$QT4$Asm4EW=4gvqmnhxF zlg}9ro!lRrXr$X+Aa7su={7uX;+D)$=jY+pUeSp|qbA9~R^ukoKo4V=M%c$;yUr^f z+FsC{U4Hd1Nfg>u6=c+tyf3%TS;DhC??gXZJ37h^JuU9zj--yKdXbm6C%Ej;^?S~Z zIBf^T?RVOagYL!swPdu-tDUr(x5RW;2^GlwzFAz))hJ9Z!oJ#?$8^{rBUha~_}AmH zCP)lgk~Y`wsIY4sNIS|mR|HWmwv%ob6s>j>mlj=qYxyfU|2S0<1?lqAW|rLIJ~0oY z!r}IMnCDcR^Ha%Ga&Q+a3zocBCCe^r$3rF3o6uBbnNaB}McZ2o=KDLaq zu%9WMYyn8zpfOnELfRDRMPI-WX5F2_7fMfxC~d$GJP41p(9d+F4HF_PMuDjvXVOHhXR&)oGg>&B3U7Lf(%>G#L{hF{$ zhCZ)m1Xk{CB^=4jFF=F@n2G zA{h`=<^+(X;>q!{2^UtR%HKogsw+@bL^uu3FD`d<|4!1tohWmcTuK<*kfNyHBsYQH zgm}(y1p{QP6ap=sGRj7PgHRc%LLP;sO40{q!CdkmhiK3%^+9P`>q24Zi(#n3wB$-= zxZ0rvxGWn+%Bhiny9Fq!GHbnW*ugwPqpf~e?sf{5G=f)Tcsrc?#jWMN{3TusH) zTvfq%Lhv55$$ma_V$lS?g!_=Hx+&^!h*r$ZAy}8o&9Tm+|a zQ}KG0pU2F7+f~%-Cryro*%1E3!fmtNQgzh?ULZZN>jPU4zlwj7x%dntv3>|3$n{aH&3RZmZsJ75!e z2LJ=n=eist)xFr(EbA4`ZRc-b4@6_bU&RY9$TZK~a`zn?ZYz+`7T@vEBngI@`^whW z&JN5Pi76Z&Vf~RP6;({FjnK}SgT~^Q%^bLg^QGIQ)% z6`5Szy{PnvP73Kx#g3iauD%$}53KH)kDoUjcx)Hg{6;QG;nO*S!p>lJpd{JC4x-E( z*oJ41av$7=W*^v2=yn;oS-!H-#a%|+~vAR7v(K6*KLDVU#Z>jui5aovNf9T zPVm!uFkP*5T8nA#k!wchfmL;b_)u*4aZk-U^FV^E=O9D$qqYIYNrgDp>Uj;R{XR7? zpTX~Kc6X_tGoYTOH@3Fk>BNfC+nd6T(~9;>&tif-X5nD@vBi{%%rkzQ$eMIyC8qN; z_ity<#w>IAp4pY`?vE@e%|-f~w)910NWk1GgKc%~+_8rd9u2hS(SXbwiuna@e$Vp14R9RCT=xMsDH28JV=ylmD-Y#U` z-~iWPG*|Sn>Y(FQ$tUiT3~m15Te-;7VJF3sWd3$7L1SqaW=r%vo0dxwI}g_x{&7mz z6dN6aNB4HRbGgM8;DkduZq7S9{>Ugq^UwE(VM%7ZW@bYiPYOt8iqq7dZ|f+A2sr}^ z^108mMQrhgn#R^&_N=k7jdAugH5bPAUb%L~rp;vTa4}XrNr1b^oe@DY9^cpr=rO94 z1b)6g2D1HK-pcHc=r9h9c~Kb#}zV^!Tc`2{dbA!=)|=fDI{UzZ((tb(lRi@1K%g zG^62X3?+43i67*!%WJKJPQTEjzK1Dthn`v)pN1uLvDN+dlQV6<1;j7l@=KEfPSg3Q znQbvSuldRRz|+L2)`D&{QZm{x=C}iUr~um}(^{nwxBeB9Bty%q(cFBy3TdT5M3F zbgoo8Potb!p3829s_&Dl(U-{WufJD38eFTaz<2_~BOrgl0j|&TVj~Y>u%@hdLY8UG zp7F4&L?V90mTmyQ8?ToP(l@uNxqjXCa?MGgh3;u&T%NdIr~GP=G15 z1d+4~;RVDL9VZ&kQ0Y9m!Orin!gz^JKR_jKtys9FO3Ns5nB&aH&Et9KO>n6aD5Amt zX=bG^+~Ax0$_zVF;c@frn(7uk9p#=zox|b)LW@>Uo=-9EmAb2za$?c3YhLpbzA4H* z$<-geX@tuvEB0L)Us{dR>CdW{l0{0Tj{^*Ff}V6r7?bOkou^iG_SrJPrZD*-O^ z+D{oRka#8QPf;yDN#{VR0)o_jMHQ)A{0uXwkBF77vL?&i)J&a z2E$S-fTQv`-)p`ivKfG%p-Hp~I%s~L%uA@u_cl{n7e@yecZ;cTmS4hE*vxEV!5h4o zX!A6GNe08#1um@jh8HD`hj(%}?tvPj zdNrf;yH5eJfDcAC$R0Zqo{^Rp<5n2-DHD&tZoNNJA`urUo817_v!$*`ce`l5mbX+pmqOBM(x7sF^nCyhj zD!~HHF&3v@mjLSt@gs8fhC{~HO+A$^a+m5Rt;B4V#RbZI11Ej~&*B=HkNJfC68}5= z+P;g>+EH$3&{g@+VK@CBpBMPu~iXP0)3BhFN~4ZCwG_1#(sJBf?~ zM~uqOT8foOwo%}j-g?)B3}fY&A%Yht{R{frMH4?gx0jTZ9v;D*n7lYunD1M4fNq;n_dmqwO-~!f}_N>fou6aF4p6 zd;DlAojGxIE~4xf51!H+X1sT*bmlnQ48&*%~t5T6axIYka; zp}}(n@z+(*qvV2J-!Ag5SjEv1a&j$Xt}!spA}SyMV#umq zaydi%WdYNH@Sm>*StrN;>wsu!r#Oi6u@IY2`HUGJp&eYV1kIFKi5(V;3=4(^3jy0B z5#h7szeRaGf;to%Q(+~AC%!T@MPiy{D z$M|+GRVY2{@SrnVV_*_&>iKYXv3!}%T{-{0^~ZLs%SZFN1I?0tTbMJ_BlxuhOZT=X z1Ul0*W0*C0ZFG-^d9;4 z`MX0DgIoCUuFcz21fJV=FA_}V-ZeS6?Cp~wIPdm#p$^kFh6sDVM5Zy4%^A>wJU*NLWuy=J{$%uXa$2y9Z%A zNRDQ(G77rg`;v?+VImOI#-7Uhn5-^{w>(uN+tn;QLIY1aDf4r#g=zD2r%Tuoi7~T(lH%kM)lR9{t-m z#YPv?yk0GD%57Roc$Q)}-j&Of+o3c}2=7RHzHon~ozHg@B`tkL?{Oo_)ivOM z3h%JTCxuQVwR?4s2`i?fiTKz8`G(_yoO66z#S#dOo_!z?ri5HK*Cd)@Mv#QrFR-gn zc1XfrF+)wd3uB4g1FpDw^Sfzw0N%GG9uAAVVjT^%Z_jna{SO;r zX1sjAmYHy5x2YFBfwo_>iQ+uFxABk}7mCzx?ntI9rbLLCvZ5?kt>V_O6aOYjK?e@d zv1p4cQoT4AK*@NA0l+0vxmO4M;r+GvWg^rU{A$%lhkx@Eq7v0g1N~CQ6)NKTEzt;J z(sGx+F{`XRddOvYsBoLWDqH(28%@ALD^M^ku$FgeFHKRTxiysh*9@dX6eX7;80*rD2tYVNo{SPX+R* z&e$6A{3=t@l1OmWD?9GOEJRjY*fS{{={0`kO+f9!z6@DELJRa1cLZaAL#c1Y%FwM& z(vBH5JFz!{zuOf$y%6d!hJ48G?qUkJcb(*rFP|mg#J=ct$mLOzY#y-&n8ScqOg;6d z3~F9quvp`J*is7!>Lfl*Z1c^p43FfS>lj2Or|(Mc@aL};4e}^Ist@)FawIEw<$d#( z#C)^3M=7cYCJr6CK@ySWG?94y=zHvyG6!1B=k6D2%AsX}-Y%uoTi9Ike0~cWU58AT z=IY-^nMJ>|PW5AwlK(lbyH)>E(kXs2dA=()RX^N?~LycSKaF>itDycI1BhiDNs$WNeaPf+(ygkHg3LO5HK zcl%GOC0(8JpYNQ{dw9uR^9JliLW(s!$M8S)aNc=pY%!~CHAGpI*fH_WXNh*Hw!-$s z-)$w@KC@9jsf$}$as*GK6JZWZhnFl^RxP+RrV!FoAZaY+$mIMFG55J7Xoc9X4m)BjR#Tx4=n8 zET0srLQJ`eU1sW-=FefTChTCC<~bo*UrsWv;ZtDa)bM59^C&o$_ORB5NX2NaUp=qk zH_3%OZ{F0`*mPZG>=3n#D)bb;Tjo)v47rPAkte+59SqCTOt`s)>%a$#DE+`&fQCyG zqI4I+g6N~bMkobntwkcu3FD$!UdNjaG8*7agx^QVIz+o&Xm6ZY&OeD;ei^!xPvG)~l_#oRdQkG$ZU`+=c@at?z zKERM>`v&@we<4X<8H)*>#tjrz)02>VAnVTAW?>v5NB1oS)h=#WRfxr?qjX`pFsX6Iv(ApQ>T{A6 z+2?Z#FD<@XVExg)Q_8(e>Ga?q9ZLi*ar+<<8ijC*V=brb`s1g~vC$o)ZtZnNnt@u2 z2|O8s1}#=7yKb49^V*y`m!wzSUsUpi=@TlZAEM%%SKY)zu4#~jx@=UHpHW+ zD3VJojVAuJ8Z>0VdD4n%!?8B2zRrq+gj1rPI*q7f+(jF??}$ygmvq7m=Tq)D&BbIE zLd!F34W7uk8vJ{w9Vp>*+?e}MdGd(4ucdYB0Gv#Omlv}$v2u|9tt1orh5MWs(yUSO z*jfWI8_kQyQa)y@OKi|rG?(rOjgWe;3TqTet(8dhh9gO07CL92IIw%F!3nABQGCV2~&iP;%=yk9eD=hL}`R>1_Ky~Pfa8WGfp-2 z7s?GLiadHzdgN{_S4Q8)s|H`j%<@z8e744&8wh41qFgsoaKTX@3`bl?uI-94D9P^O zx?vEEfXuaVAg;R6f&5>&YD9i{gN%d_SiH1gGz~8HYN6?0zM;zC#gGcB;7L*UyVcPQ z>rVQ|k!0bVWAuj{Wedgc29wNJ*bV&~vq&@-va7EKqT1!ru8Z@M4?bZWNt#G*rc47W z7bl!8)2LY6m)2DU$l#YwyWBsH6GG{lvDr>=*z!tHBK3taH8b4U_S+NLJI>(&kzsFG zj^E#yx%_RsVQ>#d4$JY()k@Q|%+-RP&nRn7*&pO;r81&w>ie_RD zgBxdh+{T9EUkHcP8ce-l7)~MotHX7jWOf38?>> z%NmBru^_<;4`f`$#XzLpTUO%!j7jxcFO}{1g`Ho?drT>G{Gd9`gr!WY1Y8#|LL;pK zhf4 zD-rAIn%F`oFH#&ApGRiQKmTzHtH?fd6!9K94W@d^N0C_yS_~@%!rby_qxO0m+!lLK zF&?vAc9)qe4UYPW@9LeepOkFuDPnTWjL=!+ZHq1v z{v`Y}>ZMg&V}_KjH|UJ}aLvK{(CM=I`F%6XTLeSHPF?U90*V(VSFjTPUvKi|QhmG! z)g3-&cmuxv>_7@33V>Jztr=T*QC=VgK!`z<_%>&byI`j&G)V~^^MrVe0#@=UIgmqq z9>0QLPskhbCQeCz#7U{Q*H!&RM%h40KwV)~B}N61gBTeIs|6P^RKiwlpvB*ty^kr= z$erjcL}Iw2l4Td?tmU&|sorxegOL(GL{=2Jt|DJWX}}pGHx?O|7c=fZLr&k_Z)YHW zn`b8=1Pg~gkv*>*Z>6;)8RQ#!USQmk0W`$Jt7a4RpXRGUkg#L%*J(Co-LpO?WRok^eoXT`igDCn--_^b>GDOR=0^MMB(W7|1t zL9g+X2ZjHo0-Z9kJ=LZMm0y|?nB9SHGE#*I^s5lm*J)Q6E1H{Fl*m}sv zZVhF!YMvm+q^v8-67O`ebtNE~q1oNnNilb597{0X^i(ZsSK&BipwkbZ)=B$L_}95A zZ>zr6VxD6C)U4M8eEU_w1g9KIysuD6>WD317N!A?D8M$cn${*PynguJxaPR-yoo0X zbGH8hgXRaqxWV(3QCD#u35U!Vt7iLcXaIYkrdwR&r*tU~uth4j}(fZsS9km+dtC zR`4okF!jqBd-Xbk6r)pC3T?h{CpOa7sLT54L8j^!KE$_N5;L7;7Fe+zeu_@-G9;CR zNpnPQOo|w8F+gHK+LMT_&^DtCjsNV=WOK(#?P^(Y{=>bE4C|t-|C!Z>txPT;M&?IY zW-1yc+O1H4;S8WKmnB2O{9-g&;yAzjnsq!QuGV0QlZ(ROLVcD z&f(lQ)>rxCxq#^=bs@N1Z~Pozhr{@$b}hKy^_8`uzMh=Tqm$(RObgAqBRhVQ{PqkD z$;Nw#!c2V+n~Eha?Ls4^SGR>>U!xN(L=-oJICf^{`2@F3)kh~MsSKLYGIpYUY2 zHIRn*p{2T!#(`&$u9fl!-KgG4ilA4$k~ZL}S77YzdVZwU%u(Ymg~5xW);|{$eDvV= zCBHS$MN|8mjf1ivhll=+T?s6NF3!fm5k8VR5i1YnvqQ~HOmar5ECeexfG7o7O=;?L z4@3tq%Ops|O%@U^cgIP<9TQ&jvk;Q_b&ny0Gr7Y~;5OYa;7*itgHt}z{Md*XldM=| zu%lspZ?rL3BTiMREuU>ECTpO5`Rri^^Ha2$C)Upv@wD>eQI@9=Zt=PZvODc4=Xs#i?6Nhq z+)L3cTqdZ&oP>#&T;wYxcQ(R1^$0xf#@Ti>!gA~cB&#>fH9RGAaDT_$ulXZ%^9u5L z^oe*9t;FT;=aJ9*9>mf<|BWDLLdMfkV6!bN^k*9 zpxM;ldH1J#+yxky!8L|^rdP>b7pn~$*WwGelu~GeVyv?qWYEafq zXV>T(ARK3Zl_YFyf0d}{?&NN-;?imF@61QNAwPZa0ljK1#~|dQ>&#r3x)_NKl`4xe zwT7SbriE6fJ*gDaweDrHwGyJ#g=7oTg$Jmi%;0H*6cbVmgK^-cI+7}q59~6Dag@lD zOENR{>3jbBZ6~Ob_3bd8%A>{0K@Jtl3R@vrVx|n-kSJurAEr=6dYW#l@>9+Pf{TEgs!=y^9re9vX36+%k%(%=1q@2{ zni0lfz@olq3lFz7r%>I;u;vHGDvJ7yLxprf%u}3zF?7%3NKFBUa+XS!Zz1vY!S%ya zHzeQ$gJ1Vh4Q;#sjU7A#7OynkG!buF%cG&BYi~iUdm;n3a*}3KC!usq<+S2mFN%Cv z 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 MjKeuALTQKl56?3=F8}}l diff --git a/plexus-container-default/src/test/test-components/plugin0-1.0-SNAPSHOT.jar b/plexus-container-default/src/test/test-components/plugin0-1.0-SNAPSHOT.jar deleted file mode 100644 index 6498abe93e43d55c4ebdeea07be18b808f72c7f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5100 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 diff --git a/pom.xml b/pom.xml index fb0fbd9d6..0d7b7fb0f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ plexus-component-annotations plexus-component-metadata - plexus-container-default