This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-plexus.
commit e48ed7ef9154c1d635496b98f790be1a18bd965d Merge: 2a21d09 263c914 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 6 11:48:32 2015 +0200 Merge tag 'upstream/0.3.1' Upstream version 0.3.1 doclava/api/nullable.zip | Bin 0 -> 1551 bytes doclava/assets/customizations.css | 59 +++++ doclava/components/left_nav.cs | 70 ++++++ doclava/head_tag.cs | 41 ++++ doclava/package.cs | 55 +++++ doclava/packages.cs | 38 +++ .../META-INF/MANIFEST.MF | 12 + .../services/org.eclipse.sisu.launch.BundlePlan | 1 + .../about.html | 6 +- .../build.properties | 3 +- org.eclipse.sisu.plexus.extender/overview.html | 8 + .../pom.xml | 24 +- org.eclipse.sisu.plexus.site/category.xml | 12 +- org.eclipse.sisu.plexus.site/epl-v10.html | 261 +++++++++++++++++++++ org.eclipse.sisu.plexus.site/notice.html | 108 +++++++++ org.eclipse.sisu.plexus.site/pom.xml | 24 +- org.eclipse.sisu.plexus.tests/pom.xml | 16 +- .../resources/component-jar/pom.xml | 21 ++ .../eclipse/sisu/plexus/tests/SomeComponent.java | 13 +- .../main/resources/META-INF/plexus/components.xml | 22 ++ .../org/eclipse/sisu/plexus/ArrayConstantTest.java | 2 +- .../src/org/eclipse/sisu/plexus/BadBean.java | 2 +- .../org/eclipse/sisu/plexus/BeanConstantTest.java | 2 +- .../sisu/plexus/ClassRealmConverterTest.java | 59 +++++ .../sisu/plexus/CollectionConstantTest.java | 2 +- .../sisu/plexus/ComponentAnnotationTest.java | 2 +- .../sisu/plexus/ConfigurationAnnotationTest.java | 2 +- .../sisu/plexus/ConfigurationConverter.java | 2 +- .../org/eclipse/sisu/plexus/DateConstantTest.java | 2 +- .../sisu/plexus/DefaultPlexusContainerTest.java | 102 ++++++++ .../src/org/eclipse/sisu/plexus/HintsTest.java | 2 +- .../org/eclipse/sisu/plexus/MapConstantTest.java | 2 +- .../plexus/PlexusAnnotatedBeanMetadataTest.java | 2 +- .../eclipse/sisu/plexus/PlexusBeanLocatorTest.java | 12 +- .../sisu/plexus/PlexusBeanMetadataTest.java | 7 +- .../sisu/plexus/PlexusConfigurationTest.java | 20 +- .../eclipse/sisu/plexus/PlexusLifecycleTest.java | 124 ++++++++++ .../org/eclipse/sisu/plexus/PlexusLoggingTest.java | 5 +- .../eclipse/sisu/plexus/PlexusRequirementTest.java | 2 +- .../eclipse/sisu/plexus/PlexusXmlScannerTest.java | 4 +- .../sisu/plexus/RequirementAnnotationTest.java | 2 +- .../src/org/eclipse/sisu/plexus/RolesTest.java | 2 +- .../sisu/plexus/SimpleRequirementExample.java | 2 +- .../eclipse/sisu/plexus/SimpleScanningExample.java | 2 +- .../src/org/eclipse/sisu/plexus/TestBean.java | 2 +- org.eclipse.sisu.plexus/META-INF/MANIFEST.MF | 11 +- org.eclipse.sisu.plexus/about.html | 6 +- org.eclipse.sisu.plexus/build.extra/artifacts.xml | 25 +- org.eclipse.sisu.plexus/build.extra/content.xml | 52 +--- org.eclipse.sisu.plexus/build.properties | 3 +- org.eclipse.sisu.plexus/build.target | 35 +-- org.eclipse.sisu.plexus/pom.xml | 51 ++-- .../codehaus/plexus/ContainerConfiguration.java | 6 +- .../plexus/DefaultContainerConfiguration.java | 15 +- .../codehaus/plexus/DefaultPlexusContainer.java | 44 ++-- .../codehaus/plexus/MutablePlexusContainer.java | 2 +- .../src/org/codehaus/plexus/PlexusConstants.java | 2 +- .../src/org/codehaus/plexus/PlexusContainer.java | 2 +- .../codehaus/plexus/PlexusContainerException.java | 2 +- .../src/org/codehaus/plexus/PlexusTestCase.java | 2 +- .../plexus/component/MapOrientedComponent.java | 2 +- .../CycleDetectedInComponentGraphException.java | 2 +- .../AbstractComponentConfigurator.java | 3 +- .../configurator/BasicComponentConfigurator.java | 15 +- .../ComponentConfigurationException.java | 2 +- .../configurator/ComponentConfigurator.java | 2 +- .../configurator/ConfigurationListener.java | 2 +- .../MapOrientedComponentConfigurator.java | 2 +- .../converters/AbstractConfigurationConverter.java | 2 +- .../converters/ConfigurationConverter.java | 2 +- .../ParameterizedConfigurationConverter.java | 2 +- .../converters/basic/AbstractBasicConverter.java | 2 +- .../converters/basic/BooleanConverter.java | 2 +- .../converters/basic/ByteConverter.java | 2 +- .../converters/basic/CharConverter.java | 2 +- .../converters/basic/ClassConverter.java | 2 +- .../converters/basic/DateConverter.java | 2 +- .../converters/basic/DoubleConverter.java | 2 +- .../converters/basic/EnumConverter.java | 2 +- .../converters/basic/FileConverter.java | 2 +- .../converters/basic/FloatConverter.java | 2 +- .../converters/basic/IntConverter.java | 2 +- .../converters/basic/LongConverter.java | 2 +- .../converters/basic/ShortConverter.java | 2 +- .../converters/basic/StringBufferConverter.java | 2 +- .../converters/basic/StringBuilderConverter.java | 2 +- .../converters/basic/StringConverter.java | 2 +- .../converters/basic/UriConverter.java | 2 +- .../converters/basic/UrlConverter.java | 2 +- .../composite/AbstractCollectionConverter.java | 2 +- .../converters/composite/ArrayConverter.java | 2 +- .../converters/composite/CollectionConverter.java | 2 +- .../converters/composite/MapConverter.java | 54 ++++- .../composite/ObjectWithFieldsConverter.java | 2 +- .../composite/PlexusConfigurationConverter.java | 2 +- .../converters/composite/PropertiesConverter.java | 2 +- .../converters/lookup/ConverterLookup.java | 2 +- .../converters/lookup/DefaultConverterLookup.java | 4 +- .../converters/special/ClassRealmConverter.java | 72 +++++- .../expression/DefaultExpressionEvaluator.java | 2 +- .../expression/ExpressionEvaluationException.java | 2 +- .../expression/ExpressionEvaluator.java | 2 +- .../expression/TypeAwareExpressionEvaluator.java | 2 +- .../factory/AbstractComponentFactory.java | 4 +- .../plexus/component/factory/ComponentFactory.java | 2 +- .../factory/ComponentInstantiationException.java | 2 +- .../component/repository/ComponentDependency.java | 2 +- .../component/repository/ComponentDescriptor.java | 4 +- .../component/repository/ComponentRequirement.java | 2 +- .../repository/ComponentRequirementList.java | 2 +- .../repository/ComponentSetDescriptor.java | 2 +- .../exception/ComponentLifecycleException.java | 2 +- .../exception/ComponentLookupException.java | 2 +- .../exception/ComponentRepositoryException.java | 2 +- .../configuration/DefaultPlexusConfiguration.java | 2 +- .../plexus/configuration/PlexusConfiguration.java | 2 +- .../PlexusConfigurationException.java | 2 +- .../configuration/xml/XmlPlexusConfiguration.java | 2 +- .../src/org/codehaus/plexus/context/Context.java | 2 +- .../codehaus/plexus/context/ContextException.java | 2 +- .../codehaus/plexus/context/ContextMapAdapter.java | 2 +- .../codehaus/plexus/context/DefaultContext.java | 2 +- .../plexus/logging/AbstractLogEnabled.java | 2 +- .../codehaus/plexus/logging/AbstractLogger.java | 2 +- .../plexus/logging/AbstractLoggerManager.java | 2 +- .../codehaus/plexus/logging/BaseLoggerManager.java | 2 +- .../org/codehaus/plexus/logging/LogEnabled.java | 2 +- .../src/org/codehaus/plexus/logging/Logger.java | 2 +- .../org/codehaus/plexus/logging/LoggerManager.java | 2 +- .../plexus/logging/console/ConsoleLogger.java | 2 +- .../logging/console/ConsoleLoggerManager.java | 2 +- .../plexus/lifecycle/phase/Configurable.java | 2 +- .../plexus/lifecycle/phase/Contextualizable.java | 2 +- .../plexus/lifecycle/phase/Disposable.java | 2 +- .../plexus/lifecycle/phase/Initializable.java | 2 +- .../lifecycle/phase/InitializationException.java | 2 +- .../lifecycle/phase/PlexusContainerLocator.java | 2 +- .../plexus/lifecycle/phase/ServiceLocator.java | 2 +- .../plexus/lifecycle/phase/Serviceable.java | 2 +- .../plexus/lifecycle/phase/Startable.java | 2 +- .../plexus/lifecycle/phase/StartingException.java | 2 +- .../plexus/lifecycle/phase/StoppingException.java | 2 +- .../plexus/lifecycle/phase/Suspendable.java | 2 +- ...ClassRealmUtils.java => ClassRealmManager.java} | 77 ++++-- .../sisu/plexus/ComponentDescriptorBeanModule.java | 7 +- .../src/org/eclipse/sisu/plexus/ComponentImpl.java | 6 +- .../eclipse/sisu/plexus/CompositeBeanHelper.java | 2 +- .../org/eclipse/sisu/plexus/ConfigurationImpl.java | 6 +- .../sisu/plexus/DefaultPlexusBeanLocator.java | 17 +- .../eclipse/sisu/plexus/DefaultPlexusBeans.java | 2 +- .../org/eclipse/sisu/plexus/HintedPlexusBeans.java | 2 +- .../src/org/eclipse/sisu/plexus/Hints.java | 2 +- .../org/eclipse/sisu/plexus/LazyPlexusBean.java | 2 +- .../org/eclipse/sisu/plexus/MissingPlexusBean.java | 2 +- .../sisu/plexus/OptionalPropertyBinding.java | 2 +- .../sisu/plexus/PlexusAnnotatedBeanModule.java | 13 +- .../sisu/plexus/PlexusAnnotatedMetadata.java | 5 +- .../src/org/eclipse/sisu/plexus/PlexusBean.java | 2 +- .../org/eclipse/sisu/plexus/PlexusBeanBinder.java | 7 +- .../eclipse/sisu/plexus/PlexusBeanConverter.java | 2 +- .../org/eclipse/sisu/plexus/PlexusBeanLocator.java | 2 +- .../org/eclipse/sisu/plexus/PlexusBeanManager.java | 59 ----- .../eclipse/sisu/plexus/PlexusBeanMetadata.java | 2 +- .../org/eclipse/sisu/plexus/PlexusBeanModule.java | 2 +- .../org/eclipse/sisu/plexus/PlexusBeanSource.java | 2 +- .../eclipse/sisu/plexus/PlexusBindingModule.java | 14 +- .../org/eclipse/sisu/plexus/PlexusBundlePlan.java | 91 +++++++ .../eclipse/sisu/plexus/PlexusConfigurations.java | 2 +- .../sisu/plexus/PlexusDateTypeConverter.java | 2 +- .../sisu/plexus/PlexusLifecycleManager.java | 173 ++++++-------- .../eclipse/sisu/plexus/PlexusPropertyBinder.java | 8 +- .../eclipse/sisu/plexus/PlexusRequirements.java | 6 +- .../org/eclipse/sisu/plexus/PlexusSpaceModule.java | 49 +++- .../org/eclipse/sisu/plexus/PlexusTypeBinder.java | 50 +--- .../eclipse/sisu/plexus/PlexusTypeListener.java | 2 +- .../eclipse/sisu/plexus/PlexusTypeRegistry.java | 2 +- .../org/eclipse/sisu/plexus/PlexusTypeVisitor.java | 4 +- .../sisu/plexus/PlexusXmlBeanConverter.java | 45 ++-- .../eclipse/sisu/plexus/PlexusXmlBeanModule.java | 2 +- .../org/eclipse/sisu/plexus/PlexusXmlMetadata.java | 2 +- .../org/eclipse/sisu/plexus/PlexusXmlScanner.java | 4 +- .../sisu/plexus/ProvidedPropertyBinding.java | 2 +- .../eclipse/sisu/plexus/PseudoPlexusContainer.java | 13 +- .../{RealmFilter.java => RealmFilteredBeans.java} | 10 +- .../org/eclipse/sisu/plexus/RequirementImpl.java | 6 +- .../src/org/eclipse/sisu/plexus/Roles.java | 2 +- .../src/org/eclipse/sisu/plexus/Strategies.java | 2 +- .../src/org/eclipse/sisu/plexus/package-info.java | 2 +- pom.xml | 75 +++--- 189 files changed, 1864 insertions(+), 654 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-plexus.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
